diff --git a/actions/ql/examples/snippets/uses_pinned_sha.ql b/actions/ql/examples/snippets/uses_pinned_sha.ql
index 84b2cdae0fdb..db055a69fc4f 100644
--- a/actions/ql/examples/snippets/uses_pinned_sha.ql
+++ b/actions/ql/examples/snippets/uses_pinned_sha.ql
@@ -8,5 +8,5 @@
 import actions
 
 from UsesStep uses
-where uses.getVersion().regexpMatch("^[A-Fa-f0-9]{40}$")
+where uses.getVersion().regexpMatch("^[A-Fa-f0-9]{40}([A-Fa-f0-9]{24})?$")
 select uses, "This 'uses' step has a pinned SHA version."
diff --git a/actions/ql/lib/CHANGELOG.md b/actions/ql/lib/CHANGELOG.md
index ddd0b0f1aec8..7a61a60c3797 100644
--- a/actions/ql/lib/CHANGELOG.md
+++ b/actions/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.4.37
+
+### Minor Analysis Improvements
+
+* The GitHub Actions analysis now recognizes more Bash regex checks that restrict a value to alphanumeric characters, include regexes like `^[0-9a-zA-Z]{40}([0-9a-zA-Z]{24})?$` which check for a sha1 or sha256 hash. This may reduce false positive results where command output is validated with grouped or optional alphanumeric patterns before being used.
+
 ## 0.4.36
 
 ### Minor Analysis Improvements
diff --git a/actions/ql/lib/change-notes/released/0.4.37.md b/actions/ql/lib/change-notes/released/0.4.37.md
new file mode 100644
index 000000000000..4809796b3ab3
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.37.md
@@ -0,0 +1,5 @@
+## 0.4.37
+
+### Minor Analysis Improvements
+
+* The GitHub Actions analysis now recognizes more Bash regex checks that restrict a value to alphanumeric characters, include regexes like `^[0-9a-zA-Z]{40}([0-9a-zA-Z]{24})?$` which check for a sha1 or sha256 hash. This may reduce false positive results where command output is validated with grouped or optional alphanumeric patterns before being used.
diff --git a/actions/ql/lib/codeql-pack.release.yml b/actions/ql/lib/codeql-pack.release.yml
index 45433e3ec031..df2745147806 100644
--- a/actions/ql/lib/codeql-pack.release.yml
+++ b/actions/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.4.36
+lastReleaseVersion: 0.4.37
diff --git a/actions/ql/lib/codeql/actions/Bash.qll b/actions/ql/lib/codeql/actions/Bash.qll
index 4975ce6f4cc5..14ba8f0acf4a 100644
--- a/actions/ql/lib/codeql/actions/Bash.qll
+++ b/actions/ql/lib/codeql/actions/Bash.qll
@@ -785,7 +785,22 @@ module Bash {
 
   /**
    * Holds if the given regex is used to match an alphanumeric string
-   * eg: `^[0-9a-zA-Z]{40}$`, `^[0-9]+$` or `^[a-zA-Z0-9_]+$`
+   * eg: `^[0-9a-zA-Z]{40}([0-9a-zA-Z]{24})?$`, `^[0-9]+$` or `^[a-zA-Z0-9_]+$`
    */
-  string alphaNumericRegex() { result = "^\\^\\[([09azAZ_-]+)\\](\\+|\\{\\d+\\})\\$$" }
+  string alphaNumericRegex() {
+    exists(string r1, string r2, string r3, string r4 |
+      // An alphanumeric character class
+      r1 = "\\[([09azAZ_-]+)\\]" and
+      // The same as above, followed by a quantifier like `+` or `{20}`
+      r2 = r1 + "(\\+|\\{\\d+\\})" and
+      // The same as above, possibly with parentheses around it
+      r3 = "\\(?" + r2 + "\\)?" and
+      // The same as above, possibly with a `?` after it
+      r4 = r3 + "\\??"
+    |
+      // The same as above, repeated one or more times, and with `^` at the
+      // beginning and `$` at the end
+      result = "^\\^(" + r4 + ")+\\$$"
+    )
+  }
 }
diff --git a/actions/ql/lib/qlpack.yml b/actions/ql/lib/qlpack.yml
index 747298d69c6d..5d47e3f3d672 100644
--- a/actions/ql/lib/qlpack.yml
+++ b/actions/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-all
-version: 0.4.36
+version: 0.4.38-dev
 library: true
 warnOnImplicitThis: true
 dependencies:
diff --git a/actions/ql/src/CHANGELOG.md b/actions/ql/src/CHANGELOG.md
index 1670f0af5be8..c37cd20761b2 100644
--- a/actions/ql/src/CHANGELOG.md
+++ b/actions/ql/src/CHANGELOG.md
@@ -1,3 +1,22 @@
+## 0.6.29
+
+### Query Metadata Changes
+
+* Reversed adjustment of the name of `actions/untrusted-checkout/high`, but kept the portion of the previous change for the word "trusted" to "privileged". Added a missing "a" to phrasing in `actions/untrusted-checkout/high` and `actions/untrusted-checkout/medium`.
+
+### Major Analysis Improvements
+
+* Adjusted `actions/untrusted-checkout/critical` to align more with other untrusted resource queries, where the alert location is the location where the artifact is obtained from (the checkout point). This aligns with the other 2 related queries. This will cause the same alerts to re-open for closed alerts of this query.
+
+### Minor Analysis Improvements
+
+* Altered the alert message for clarity for queries: `actions/untrusted-checkout/critical`, `actions/untrusted-checkout/high`.
+* The `actions/unpinned-tag` query now recognizes 64-character SHA-256 commit hashes as properly pinned references, in addition to 40-character SHA-1 hashes.
+
+### Bug Fixes
+
+* Adjusted (minor) help file descriptions for queries: `actions/untrusted-checkout/critical`, `actions/untrusted-checkout/high`, `actions/untrusted-checkout/medium`. Clarified wording on in minor point, added one more listed resource and added one more recommendation for things to check.
+
 ## 0.6.28
 
 ### Query Metadata Changes
diff --git a/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.ql b/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.ql
index 7b5e5a117cbe..530b8e48e0f5 100644
--- a/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.ql
+++ b/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.ql
@@ -15,7 +15,9 @@ import actions
 import codeql.actions.security.UseOfUnversionedImmutableAction
 
 bindingset[version]
-private predicate isPinnedCommit(string version) { version.regexpMatch("^[A-Fa-f0-9]{40}$") }
+private predicate isPinnedCommit(string version) {
+  version.regexpMatch("^[A-Fa-f0-9]{40}([A-Fa-f0-9]{24})?$")
+}
 
 bindingset[nwo]
 private predicate isTrustedOwner(string nwo) {
diff --git a/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.md b/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.md
index a6dd437c1baf..71bb86b442cc 100644
--- a/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.md
+++ b/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.md
@@ -27,7 +27,7 @@ Certain triggers automatically grant a workflow elevated privileges:
   * An attacker forks the repository and adds malicious code (e.g., in the build script)
   * The attacker opens a PR from the fork, and, if needed, comments on the PR
   * The workflow in the base repository checks out the forked code
-  * The workflow runs, (e.g. the build script etc.), which contains the malicious code
+  * The workflow runs the malicious code
 
 Please note that not only build scripts can be malicious code vectors. There is a large number of other possibilities. Some of them are listed in the [LOTP](https://boostsecurityio.github.io/lotp/) catalog.
 
@@ -41,6 +41,8 @@ The best practice is to handle the potentially untrusted pull request via the **
 
 The artifacts downloaded from the first workflow should be considered untrusted and must be verified.
 
+Additionally, ensure that least privilege are used both at the workflow level (through event triggers and workflow permissions) and job level (through job permissions).
+
 ## Example
 
 ### Incorrect Usage
@@ -163,4 +165,5 @@ jobs:
 
 - GitHub Security Lab Research: [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/).
 - Mitigating risks of untrusted checkout: [GitHub Docs](https://docs.github.com/en/enterprise-cloud@latest/actions/reference/security/secure-use#mitigating-the-risks-of-untrusted-code-checkout).
+- Securing with least privilege: [Workflow secure use](https://docs.github.com/en/actions/reference/security/secure-use).
 - Living Off the Pipeline: [LOTP](https://boostsecurityio.github.io/lotp/).
diff --git a/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.ql b/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.ql
index ad79a1ce776f..e0af03ca3d02 100644
--- a/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.ql
+++ b/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.ql
@@ -51,5 +51,6 @@ where
   event.getName() = checkoutTriggers() and
   not exists(ControlCheck check | check.protects(checkout, event, "untrusted-checkout")) and
   not exists(ControlCheck check | check.protects(poisonable, event, "untrusted-checkout"))
-select poisonable, checkout, poisonable,
-  "Potential execution of untrusted code on a privileged workflow ($@)", event, event.getName()
+select checkout, checkout, poisonable,
+  "Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@).",
+  event, event.getName()
diff --git a/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.md b/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.md
index a6dd437c1baf..71bb86b442cc 100644
--- a/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.md
+++ b/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.md
@@ -27,7 +27,7 @@ Certain triggers automatically grant a workflow elevated privileges:
   * An attacker forks the repository and adds malicious code (e.g., in the build script)
   * The attacker opens a PR from the fork, and, if needed, comments on the PR
   * The workflow in the base repository checks out the forked code
-  * The workflow runs, (e.g. the build script etc.), which contains the malicious code
+  * The workflow runs the malicious code
 
 Please note that not only build scripts can be malicious code vectors. There is a large number of other possibilities. Some of them are listed in the [LOTP](https://boostsecurityio.github.io/lotp/) catalog.
 
@@ -41,6 +41,8 @@ The best practice is to handle the potentially untrusted pull request via the **
 
 The artifacts downloaded from the first workflow should be considered untrusted and must be verified.
 
+Additionally, ensure that least privilege are used both at the workflow level (through event triggers and workflow permissions) and job level (through job permissions).
+
 ## Example
 
 ### Incorrect Usage
@@ -163,4 +165,5 @@ jobs:
 
 - GitHub Security Lab Research: [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/).
 - Mitigating risks of untrusted checkout: [GitHub Docs](https://docs.github.com/en/enterprise-cloud@latest/actions/reference/security/secure-use#mitigating-the-risks-of-untrusted-code-checkout).
+- Securing with least privilege: [Workflow secure use](https://docs.github.com/en/actions/reference/security/secure-use).
 - Living Off the Pipeline: [LOTP](https://boostsecurityio.github.io/lotp/).
diff --git a/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.ql b/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.ql
index 5c2d4b3d56c8..9f28706c0d07 100644
--- a/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.ql
+++ b/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.ql
@@ -1,5 +1,5 @@
 /**
- * @name Checkout of untrusted code in privileged context without privileged context use
+ * @name Checkout of untrusted code in a privileged context
  * @description Privileged workflows have read/write access to the base repository and access to secrets.
  *              By explicitly checking out and running the build script from a fork the untrusted code is running in an environment
  *              that is able to push to the base repository and to access secrets.
@@ -42,5 +42,6 @@ where
     not event.getName() = "issue_comment" and
     not exists(ControlCheck check | check.protects(checkout, event, "untrusted-checkout"))
   )
-select checkout, "Potential execution of untrusted code on a privileged workflow ($@)", event,
-  event.getName()
+select checkout,
+  "Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@).",
+  event, event.getName()
diff --git a/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.md b/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.md
index a6dd437c1baf..71bb86b442cc 100644
--- a/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.md
+++ b/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.md
@@ -27,7 +27,7 @@ Certain triggers automatically grant a workflow elevated privileges:
   * An attacker forks the repository and adds malicious code (e.g., in the build script)
   * The attacker opens a PR from the fork, and, if needed, comments on the PR
   * The workflow in the base repository checks out the forked code
-  * The workflow runs, (e.g. the build script etc.), which contains the malicious code
+  * The workflow runs the malicious code
 
 Please note that not only build scripts can be malicious code vectors. There is a large number of other possibilities. Some of them are listed in the [LOTP](https://boostsecurityio.github.io/lotp/) catalog.
 
@@ -41,6 +41,8 @@ The best practice is to handle the potentially untrusted pull request via the **
 
 The artifacts downloaded from the first workflow should be considered untrusted and must be verified.
 
+Additionally, ensure that least privilege are used both at the workflow level (through event triggers and workflow permissions) and job level (through job permissions).
+
 ## Example
 
 ### Incorrect Usage
@@ -163,4 +165,5 @@ jobs:
 
 - GitHub Security Lab Research: [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/).
 - Mitigating risks of untrusted checkout: [GitHub Docs](https://docs.github.com/en/enterprise-cloud@latest/actions/reference/security/secure-use#mitigating-the-risks-of-untrusted-code-checkout).
+- Securing with least privilege: [Workflow secure use](https://docs.github.com/en/actions/reference/security/secure-use).
 - Living Off the Pipeline: [LOTP](https://boostsecurityio.github.io/lotp/).
diff --git a/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.ql b/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.ql
index 66c68e882e22..ca68c7fffd17 100644
--- a/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.ql
+++ b/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.ql
@@ -1,5 +1,5 @@
 /**
- * @name Checkout of untrusted code in trusted context
+ * @name Checkout of untrusted code in a trusted context
  * @description Privileged workflows have read/write access to the base repository and access to secrets.
  *              By explicitly checking out and running the build script from a fork the untrusted code is running in an environment
  *              that is able to push to the base repository and to access secrets.
diff --git a/actions/ql/src/change-notes/released/0.6.29.md b/actions/ql/src/change-notes/released/0.6.29.md
new file mode 100644
index 000000000000..82ca81749544
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.29.md
@@ -0,0 +1,18 @@
+## 0.6.29
+
+### Query Metadata Changes
+
+* Reversed adjustment of the name of `actions/untrusted-checkout/high`, but kept the portion of the previous change for the word "trusted" to "privileged". Added a missing "a" to phrasing in `actions/untrusted-checkout/high` and `actions/untrusted-checkout/medium`.
+
+### Major Analysis Improvements
+
+* Adjusted `actions/untrusted-checkout/critical` to align more with other untrusted resource queries, where the alert location is the location where the artifact is obtained from (the checkout point). This aligns with the other 2 related queries. This will cause the same alerts to re-open for closed alerts of this query.
+
+### Minor Analysis Improvements
+
+* Altered the alert message for clarity for queries: `actions/untrusted-checkout/critical`, `actions/untrusted-checkout/high`.
+* The `actions/unpinned-tag` query now recognizes 64-character SHA-256 commit hashes as properly pinned references, in addition to 40-character SHA-1 hashes.
+
+### Bug Fixes
+
+* Adjusted (minor) help file descriptions for queries: `actions/untrusted-checkout/critical`, `actions/untrusted-checkout/high`, `actions/untrusted-checkout/medium`. Clarified wording on in minor point, added one more listed resource and added one more recommendation for things to check.
diff --git a/actions/ql/src/codeql-pack.release.yml b/actions/ql/src/codeql-pack.release.yml
index 90f3f09295a6..e785984caccb 100644
--- a/actions/ql/src/codeql-pack.release.yml
+++ b/actions/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.6.28
+lastReleaseVersion: 0.6.29
diff --git a/actions/ql/src/qlpack.yml b/actions/ql/src/qlpack.yml
index 894ba6fec690..19187efb0717 100644
--- a/actions/ql/src/qlpack.yml
+++ b/actions/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-queries
-version: 0.6.28
+version: 0.6.30-dev
 library: false
 warnOnImplicitThis: true
 groups: [actions, queries]
diff --git a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/unpinned_tags.yml b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/unpinned_tags.yml
index f204816eed4e..6e7612144bcc 100644
--- a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/unpinned_tags.yml
+++ b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/unpinned_tags.yml
@@ -11,3 +11,9 @@ jobs:
     - uses: foo/bar@25b062c917b0c75f8b47d8469aff6c94ffd89abb
     - uses: docker://foo/bar@latest
     - uses: docker://foo/bar@sha256:887a259a5a534f3c4f36cb02dca341673c6089431057242cdc931e9f133147e9
+    # SHA-256 pinned (64 hex chars) - should NOT be flagged
+    - uses: foo/bar@25b062c917b0c75f8b47d8469aff6c94ffd89abb25b062c917b0c75f8b47d84d
+    # SHA-1 pinned (40 hex chars) regression - should NOT be flagged
+    - uses: foo/bar@a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2
+    # Invalid 50-char hex string - should be flagged
+    - uses: foo/bar@a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2a1b2c3d4e5
diff --git a/actions/ql/test/query-tests/Security/CWE-829/UnpinnedActionsTag.expected b/actions/ql/test/query-tests/Security/CWE-829/UnpinnedActionsTag.expected
index 29568087d0ed..14cff70c3804 100644
--- a/actions/ql/test/query-tests/Security/CWE-829/UnpinnedActionsTag.expected
+++ b/actions/ql/test/query-tests/Security/CWE-829/UnpinnedActionsTag.expected
@@ -34,3 +34,4 @@
 | .github/workflows/test18.yml:37:21:37:63 | sonarsource/sonarcloud-github-action@master | Unpinned 3rd party Action 'Sonar' step $@ uses 'sonarsource/sonarcloud-github-action' with ref 'master', not a pinned commit hash | .github/workflows/test18.yml:36:15:40:58 | Uses Step | Uses Step |
 | .github/workflows/unpinned_tags.yml:10:13:10:22 | foo/bar@v1 | Unpinned 3rd party Action 'unpinned_tags.yml' step $@ uses 'foo/bar' with ref 'v1', not a pinned commit hash | .github/workflows/unpinned_tags.yml:10:7:11:4 | Uses Step | Uses Step |
 | .github/workflows/unpinned_tags.yml:12:13:12:35 | docker://foo/bar@latest | Unpinned 3rd party Action 'unpinned_tags.yml' step $@ uses 'docker://foo/bar' with ref 'latest', not a pinned commit hash | .github/workflows/unpinned_tags.yml:12:7:13:4 | Uses Step | Uses Step |
+| .github/workflows/unpinned_tags.yml:19:13:19:70 | foo/bar@a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2a1b2c3d4e5 | Unpinned 3rd party Action 'unpinned_tags.yml' step $@ uses 'foo/bar' with ref 'a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2a1b2c3d4e5', not a pinned commit hash | .github/workflows/unpinned_tags.yml:19:7:19:71 | Uses Step | Uses Step |
diff --git a/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutCritical.expected b/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutCritical.expected
index 7b63fb560cbe..52fcecfb9ed7 100644
--- a/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutCritical.expected
+++ b/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutCritical.expected
@@ -312,7 +312,10 @@ edges
 | .github/workflows/unpinned_tags.yml:9:7:10:4 | Uses Step | .github/workflows/unpinned_tags.yml:10:7:11:4 | Uses Step |
 | .github/workflows/unpinned_tags.yml:10:7:11:4 | Uses Step | .github/workflows/unpinned_tags.yml:11:7:12:4 | Uses Step |
 | .github/workflows/unpinned_tags.yml:11:7:12:4 | Uses Step | .github/workflows/unpinned_tags.yml:12:7:13:4 | Uses Step |
-| .github/workflows/unpinned_tags.yml:12:7:13:4 | Uses Step | .github/workflows/unpinned_tags.yml:13:7:13:101 | Uses Step |
+| .github/workflows/unpinned_tags.yml:12:7:13:4 | Uses Step | .github/workflows/unpinned_tags.yml:13:7:15:4 | Uses Step |
+| .github/workflows/unpinned_tags.yml:13:7:15:4 | Uses Step | .github/workflows/unpinned_tags.yml:15:7:17:4 | Uses Step |
+| .github/workflows/unpinned_tags.yml:15:7:17:4 | Uses Step | .github/workflows/unpinned_tags.yml:17:7:19:4 | Uses Step |
+| .github/workflows/unpinned_tags.yml:17:7:19:4 | Uses Step | .github/workflows/unpinned_tags.yml:19:7:19:71 | Uses Step |
 | .github/workflows/untrusted_checkout2.yml:7:9:14:6 | Run Step: pr_number | .github/workflows/untrusted_checkout2.yml:14:9:19:72 | Run Step |
 | .github/workflows/untrusted_checkout3.yml:11:9:12:6 | Uses Step | .github/workflows/untrusted_checkout3.yml:12:9:13:6 | Uses Step |
 | .github/workflows/untrusted_checkout3.yml:12:9:13:6 | Uses Step | .github/actions/dangerous-git-checkout/action.yml:6:7:11:4 | Uses Step |
@@ -335,42 +338,42 @@ edges
 | .github/workflows/workflow_run_untrusted_checkout_2.yml:13:9:16:6 | Uses Step | .github/workflows/workflow_run_untrusted_checkout_2.yml:16:9:18:31 | Uses Step |
 | .github/workflows/workflow_run_untrusted_checkout_3.yml:13:9:16:6 | Uses Step | .github/workflows/workflow_run_untrusted_checkout_3.yml:16:9:18:31 | Uses Step |
 #select
-| .github/workflows/auto_ci.yml:32:9:37:6 | Run Step | .github/workflows/auto_ci.yml:20:9:27:6 | Uses Step | .github/workflows/auto_ci.yml:32:9:37:6 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/auto_ci.yml:6:3:6:21 | pull_request_target | pull_request_target |
-| .github/workflows/auto_ci.yml:48:9:52:2 | Run Step | .github/workflows/auto_ci.yml:20:9:27:6 | Uses Step | .github/workflows/auto_ci.yml:48:9:52:2 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/auto_ci.yml:6:3:6:21 | pull_request_target | pull_request_target |
-| .github/workflows/auto_ci.yml:79:9:84:6 | Run Step | .github/workflows/auto_ci.yml:67:9:74:6 | Uses Step | .github/workflows/auto_ci.yml:79:9:84:6 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/auto_ci.yml:6:3:6:21 | pull_request_target | pull_request_target |
-| .github/workflows/auto_ci.yml:84:9:93:6 | Run Step | .github/workflows/auto_ci.yml:67:9:74:6 | Uses Step | .github/workflows/auto_ci.yml:84:9:93:6 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/auto_ci.yml:6:3:6:21 | pull_request_target | pull_request_target |
-| .github/workflows/dependabot3.yml:25:9:48:6 | Run Step: set-milestone | .github/workflows/dependabot3.yml:15:9:20:6 | Uses Step | .github/workflows/dependabot3.yml:25:9:48:6 | Run Step: set-milestone | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/dependabot3.yml:3:5:3:23 | pull_request_target | pull_request_target |
-| .github/workflows/external/TestOrg/TestRepo/.github/workflows/reusable.yml:26:9:29:7 | Run Step | .github/workflows/external/TestOrg/TestRepo/.github/workflows/reusable.yml:23:9:26:6 | Uses Step | .github/workflows/external/TestOrg/TestRepo/.github/workflows/reusable.yml:26:9:29:7 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/reusable_caller1.yaml:4:3:4:21 | pull_request_target | pull_request_target |
-| .github/workflows/gitcheckout.yml:21:11:23:22 | Run Step | .github/workflows/gitcheckout.yml:10:11:18:8 | Run Step | .github/workflows/gitcheckout.yml:21:11:23:22 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/gitcheckout.yml:2:3:2:21 | pull_request_target | pull_request_target |
-| .github/workflows/label_trusted_checkout2.yml:17:7:21:4 | Run Step | .github/workflows/label_trusted_checkout2.yml:12:7:16:4 | Uses Step | .github/workflows/label_trusted_checkout2.yml:17:7:21:4 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/label_trusted_checkout2.yml:2:3:2:21 | pull_request_target | pull_request_target |
-| .github/workflows/level0.yml:107:9:112:2 | Run Step | .github/workflows/level0.yml:99:9:103:6 | Uses Step | .github/workflows/level0.yml:107:9:112:2 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/level0.yml:5:3:5:15 | issue_comment | issue_comment |
-| .github/workflows/level0.yml:107:9:112:2 | Run Step | .github/workflows/level0.yml:99:9:103:6 | Uses Step | .github/workflows/level0.yml:107:9:112:2 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/level0.yml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/level0.yml:133:9:135:23 | Run Step | .github/workflows/level0.yml:125:9:129:6 | Uses Step | .github/workflows/level0.yml:133:9:135:23 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/level0.yml:5:3:5:15 | issue_comment | issue_comment |
-| .github/workflows/level0.yml:133:9:135:23 | Run Step | .github/workflows/level0.yml:125:9:129:6 | Uses Step | .github/workflows/level0.yml:133:9:135:23 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/level0.yml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/poc2.yml:42:9:47:6 | Uses Step | .github/workflows/poc2.yml:37:9:42:6 | Uses Step | .github/workflows/poc2.yml:42:9:47:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/poc2.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/poc2.yml:52:9:58:24 | Run Step | .github/workflows/poc2.yml:37:9:42:6 | Uses Step | .github/workflows/poc2.yml:52:9:58:24 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/poc2.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/pr-workflow.yml:222:9:227:6 | Uses Step | .github/workflows/pr-workflow.yml:216:9:222:6 | Uses Step | .github/workflows/pr-workflow.yml:222:9:227:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/pr-workflow.yml:256:9:261:6 | Uses Step | .github/workflows/pr-workflow.yml:250:9:256:6 | Uses Step | .github/workflows/pr-workflow.yml:256:9:261:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/pr-workflow.yml:290:9:295:6 | Uses Step | .github/workflows/pr-workflow.yml:284:9:290:6 | Uses Step | .github/workflows/pr-workflow.yml:290:9:295:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/pr-workflow.yml:391:9:395:6 | Uses Step | .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:391:9:395:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/pr-workflow.yml:395:9:404:6 | Uses Step | .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:395:9:404:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/pr-workflow.yml:404:9:414:6 | Uses Step | .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:404:9:414:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/pr-workflow.yml:414:9:423:6 | Uses Step | .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:414:9:423:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/pr-workflow.yml:423:9:432:2 | Uses Step | .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:423:9:432:2 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/reusable_local.yml:26:9:29:7 | Run Step | .github/workflows/reusable_local.yml:23:9:26:6 | Uses Step | .github/workflows/reusable_local.yml:26:9:29:7 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/reusable_caller3.yaml:4:3:4:21 | pull_request_target | pull_request_target |
-| .github/workflows/test7.yml:33:9:36:6 | Run Step | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:33:9:36:6 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/test7.yml:36:9:39:6 | Run Step | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:36:9:39:6 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/test7.yml:49:9:59:6 | Run Step: benchmark-pr | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:49:9:59:6 | Run Step: benchmark-pr | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/test7.yml:59:9:60:6 | Run Step | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:59:9:60:6 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/test7.yml:60:9:60:37 | Run Step | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:60:9:60:37 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/test10.yml:25:9:30:2 | Run Step | .github/workflows/test10.yml:20:9:25:6 | Uses Step | .github/workflows/test10.yml:25:9:30:2 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test10.yml:8:3:8:21 | pull_request_target | pull_request_target |
-| .github/workflows/test11.yml:90:7:93:54 | Uses Step | .github/workflows/test11.yml:84:7:90:4 | Uses Step | .github/workflows/test11.yml:90:7:93:54 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test11.yml:5:3:5:15 | issue_comment | issue_comment |
-| .github/workflows/test17.yml:19:15:23:58 | Uses Step | .github/workflows/test17.yml:12:15:19:12 | Uses Step | .github/workflows/test17.yml:19:15:23:58 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test17.yml:3:5:3:16 | workflow_run | workflow_run |
-| .github/workflows/test27.yml:21:9:22:16 | Run Step | .github/workflows/test27.yml:18:9:21:6 | Uses Step | .github/workflows/test27.yml:21:9:22:16 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test26.yml:4:3:4:14 | workflow_run | workflow_run |
-| .github/workflows/test29.yml:14:7:21:11 | Uses Step | .github/workflows/test29.yml:8:7:14:4 | Uses Step | .github/workflows/test29.yml:14:7:21:11 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test29.yml:1:5:1:23 | pull_request_target | pull_request_target |
-| .github/workflows/untrusted_checkout3.yml:13:9:13:23 | Run Step | .github/actions/dangerous-git-checkout/action.yml:6:7:11:4 | Uses Step | .github/workflows/untrusted_checkout3.yml:13:9:13:23 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/untrusted_checkout3.yml:4:3:4:14 | workflow_run | workflow_run |
-| .github/workflows/untrusted_checkout4.yml:35:7:41:4 | Run Step | .github/workflows/untrusted_checkout4.yml:29:7:35:4 | Uses Step | .github/workflows/untrusted_checkout4.yml:35:7:41:4 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/untrusted_checkout4.yml:2:3:2:15 | issue_comment | issue_comment |
-| .github/workflows/untrusted_checkout4.yml:41:7:47:4 | Run Step | .github/workflows/untrusted_checkout4.yml:29:7:35:4 | Uses Step | .github/workflows/untrusted_checkout4.yml:41:7:47:4 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/untrusted_checkout4.yml:2:3:2:15 | issue_comment | issue_comment |
-| .github/workflows/untrusted_checkout4.yml:47:7:51:46 | Run Step | .github/workflows/untrusted_checkout4.yml:29:7:35:4 | Uses Step | .github/workflows/untrusted_checkout4.yml:47:7:51:46 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/untrusted_checkout4.yml:2:3:2:15 | issue_comment | issue_comment |
-| .github/workflows/untrusted_checkout.yml:15:9:18:2 | Run Step | .github/workflows/untrusted_checkout.yml:8:9:11:6 | Uses Step | .github/workflows/untrusted_checkout.yml:15:9:18:2 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/untrusted_checkout.yml:2:3:2:21 | pull_request_target | pull_request_target |
-| .github/workflows/untrusted_checkout.yml:30:9:32:23 | Run Step | .github/workflows/untrusted_checkout.yml:23:9:26:6 | Uses Step | .github/workflows/untrusted_checkout.yml:30:9:32:23 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/untrusted_checkout.yml:2:3:2:21 | pull_request_target | pull_request_target |
+| .github/actions/dangerous-git-checkout/action.yml:6:7:11:4 | Uses Step | .github/actions/dangerous-git-checkout/action.yml:6:7:11:4 | Uses Step | .github/workflows/untrusted_checkout3.yml:13:9:13:23 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/untrusted_checkout3.yml:4:3:4:14 | workflow_run | workflow_run |
+| .github/workflows/auto_ci.yml:20:9:27:6 | Uses Step | .github/workflows/auto_ci.yml:20:9:27:6 | Uses Step | .github/workflows/auto_ci.yml:32:9:37:6 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/auto_ci.yml:6:3:6:21 | pull_request_target | pull_request_target |
+| .github/workflows/auto_ci.yml:20:9:27:6 | Uses Step | .github/workflows/auto_ci.yml:20:9:27:6 | Uses Step | .github/workflows/auto_ci.yml:48:9:52:2 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/auto_ci.yml:6:3:6:21 | pull_request_target | pull_request_target |
+| .github/workflows/auto_ci.yml:67:9:74:6 | Uses Step | .github/workflows/auto_ci.yml:67:9:74:6 | Uses Step | .github/workflows/auto_ci.yml:79:9:84:6 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/auto_ci.yml:6:3:6:21 | pull_request_target | pull_request_target |
+| .github/workflows/auto_ci.yml:67:9:74:6 | Uses Step | .github/workflows/auto_ci.yml:67:9:74:6 | Uses Step | .github/workflows/auto_ci.yml:84:9:93:6 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/auto_ci.yml:6:3:6:21 | pull_request_target | pull_request_target |
+| .github/workflows/dependabot3.yml:15:9:20:6 | Uses Step | .github/workflows/dependabot3.yml:15:9:20:6 | Uses Step | .github/workflows/dependabot3.yml:25:9:48:6 | Run Step: set-milestone | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/dependabot3.yml:3:5:3:23 | pull_request_target | pull_request_target |
+| .github/workflows/external/TestOrg/TestRepo/.github/workflows/reusable.yml:23:9:26:6 | Uses Step | .github/workflows/external/TestOrg/TestRepo/.github/workflows/reusable.yml:23:9:26:6 | Uses Step | .github/workflows/external/TestOrg/TestRepo/.github/workflows/reusable.yml:26:9:29:7 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/reusable_caller1.yaml:4:3:4:21 | pull_request_target | pull_request_target |
+| .github/workflows/gitcheckout.yml:10:11:18:8 | Run Step | .github/workflows/gitcheckout.yml:10:11:18:8 | Run Step | .github/workflows/gitcheckout.yml:21:11:23:22 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/gitcheckout.yml:2:3:2:21 | pull_request_target | pull_request_target |
+| .github/workflows/label_trusted_checkout2.yml:12:7:16:4 | Uses Step | .github/workflows/label_trusted_checkout2.yml:12:7:16:4 | Uses Step | .github/workflows/label_trusted_checkout2.yml:17:7:21:4 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/label_trusted_checkout2.yml:2:3:2:21 | pull_request_target | pull_request_target |
+| .github/workflows/level0.yml:99:9:103:6 | Uses Step | .github/workflows/level0.yml:99:9:103:6 | Uses Step | .github/workflows/level0.yml:107:9:112:2 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/level0.yml:5:3:5:15 | issue_comment | issue_comment |
+| .github/workflows/level0.yml:99:9:103:6 | Uses Step | .github/workflows/level0.yml:99:9:103:6 | Uses Step | .github/workflows/level0.yml:107:9:112:2 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/level0.yml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/level0.yml:125:9:129:6 | Uses Step | .github/workflows/level0.yml:125:9:129:6 | Uses Step | .github/workflows/level0.yml:133:9:135:23 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/level0.yml:5:3:5:15 | issue_comment | issue_comment |
+| .github/workflows/level0.yml:125:9:129:6 | Uses Step | .github/workflows/level0.yml:125:9:129:6 | Uses Step | .github/workflows/level0.yml:133:9:135:23 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/level0.yml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/poc2.yml:37:9:42:6 | Uses Step | .github/workflows/poc2.yml:37:9:42:6 | Uses Step | .github/workflows/poc2.yml:42:9:47:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/poc2.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/poc2.yml:37:9:42:6 | Uses Step | .github/workflows/poc2.yml:37:9:42:6 | Uses Step | .github/workflows/poc2.yml:52:9:58:24 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/poc2.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/pr-workflow.yml:216:9:222:6 | Uses Step | .github/workflows/pr-workflow.yml:216:9:222:6 | Uses Step | .github/workflows/pr-workflow.yml:222:9:227:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/pr-workflow.yml:250:9:256:6 | Uses Step | .github/workflows/pr-workflow.yml:250:9:256:6 | Uses Step | .github/workflows/pr-workflow.yml:256:9:261:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/pr-workflow.yml:284:9:290:6 | Uses Step | .github/workflows/pr-workflow.yml:284:9:290:6 | Uses Step | .github/workflows/pr-workflow.yml:290:9:295:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:391:9:395:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:395:9:404:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:404:9:414:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:414:9:423:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:386:9:391:6 | Uses Step | .github/workflows/pr-workflow.yml:423:9:432:2 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/reusable_local.yml:23:9:26:6 | Uses Step | .github/workflows/reusable_local.yml:23:9:26:6 | Uses Step | .github/workflows/reusable_local.yml:26:9:29:7 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/reusable_caller3.yaml:4:3:4:21 | pull_request_target | pull_request_target |
+| .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:33:9:36:6 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:36:9:39:6 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:49:9:59:6 | Run Step: benchmark-pr | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:59:9:60:6 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:60:9:60:37 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/test10.yml:20:9:25:6 | Uses Step | .github/workflows/test10.yml:20:9:25:6 | Uses Step | .github/workflows/test10.yml:25:9:30:2 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test10.yml:8:3:8:21 | pull_request_target | pull_request_target |
+| .github/workflows/test11.yml:84:7:90:4 | Uses Step | .github/workflows/test11.yml:84:7:90:4 | Uses Step | .github/workflows/test11.yml:90:7:93:54 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test11.yml:5:3:5:15 | issue_comment | issue_comment |
+| .github/workflows/test17.yml:12:15:19:12 | Uses Step | .github/workflows/test17.yml:12:15:19:12 | Uses Step | .github/workflows/test17.yml:19:15:23:58 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test17.yml:3:5:3:16 | workflow_run | workflow_run |
+| .github/workflows/test27.yml:18:9:21:6 | Uses Step | .github/workflows/test27.yml:18:9:21:6 | Uses Step | .github/workflows/test27.yml:21:9:22:16 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test26.yml:4:3:4:14 | workflow_run | workflow_run |
+| .github/workflows/test29.yml:8:7:14:4 | Uses Step | .github/workflows/test29.yml:8:7:14:4 | Uses Step | .github/workflows/test29.yml:14:7:21:11 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test29.yml:1:5:1:23 | pull_request_target | pull_request_target |
+| .github/workflows/untrusted_checkout4.yml:29:7:35:4 | Uses Step | .github/workflows/untrusted_checkout4.yml:29:7:35:4 | Uses Step | .github/workflows/untrusted_checkout4.yml:35:7:41:4 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/untrusted_checkout4.yml:2:3:2:15 | issue_comment | issue_comment |
+| .github/workflows/untrusted_checkout4.yml:29:7:35:4 | Uses Step | .github/workflows/untrusted_checkout4.yml:29:7:35:4 | Uses Step | .github/workflows/untrusted_checkout4.yml:41:7:47:4 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/untrusted_checkout4.yml:2:3:2:15 | issue_comment | issue_comment |
+| .github/workflows/untrusted_checkout4.yml:29:7:35:4 | Uses Step | .github/workflows/untrusted_checkout4.yml:29:7:35:4 | Uses Step | .github/workflows/untrusted_checkout4.yml:47:7:51:46 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/untrusted_checkout4.yml:2:3:2:15 | issue_comment | issue_comment |
+| .github/workflows/untrusted_checkout.yml:8:9:11:6 | Uses Step | .github/workflows/untrusted_checkout.yml:8:9:11:6 | Uses Step | .github/workflows/untrusted_checkout.yml:15:9:18:2 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/untrusted_checkout.yml:2:3:2:21 | pull_request_target | pull_request_target |
+| .github/workflows/untrusted_checkout.yml:23:9:26:6 | Uses Step | .github/workflows/untrusted_checkout.yml:23:9:26:6 | Uses Step | .github/workflows/untrusted_checkout.yml:30:9:32:23 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/untrusted_checkout.yml:2:3:2:21 | pull_request_target | pull_request_target |
diff --git a/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutHigh.expected b/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutHigh.expected
index 6e33259f3922..9b9483f224e6 100644
--- a/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutHigh.expected
+++ b/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutHigh.expected
@@ -1,23 +1,23 @@
-| .github/workflows/issue_comment_direct.yml:12:9:16:2 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_direct.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_direct.yml:20:9:24:2 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_direct.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_direct.yml:28:9:32:2 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_direct.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_direct.yml:35:9:40:2 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_direct.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_direct.yml:43:9:46:126 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_direct.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_heuristic.yml:28:9:33:2 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_heuristic.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_heuristic.yml:48:7:50:46 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_heuristic.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_octokit2.yml:27:9:31:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_octokit2.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_octokit.yml:26:9:30:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_octokit.yml:30:9:35:2 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_octokit.yml:57:9:62:2 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_octokit.yml:79:9:83:2 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_octokit.yml:95:9:100:2 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/issue_comment_octokit.yml:109:9:114:66 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
-| .github/workflows/pr-workflow.yml:103:9:109:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/pr-workflow.yml:139:9:144:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/pr-workflow.yml:444:9:449:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
-| .github/workflows/test13.yml:20:7:25:4 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/test13.yml:2:3:2:15 | issue_comment | issue_comment |
-| .github/workflows/untrusted_checkout2.yml:14:9:19:72 | Run Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/untrusted_checkout2.yml:1:5:1:17 | issue_comment | issue_comment |
-| .github/workflows/workflow_run_untrusted_checkout.yml:13:9:16:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/workflow_run_untrusted_checkout.yml:2:3:2:14 | workflow_run | workflow_run |
-| .github/workflows/workflow_run_untrusted_checkout.yml:16:9:18:31 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/workflow_run_untrusted_checkout.yml:2:3:2:14 | workflow_run | workflow_run |
-| .github/workflows/workflow_run_untrusted_checkout_2.yml:13:9:16:6 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/workflow_run_untrusted_checkout_2.yml:2:3:2:14 | workflow_run | workflow_run |
-| .github/workflows/workflow_run_untrusted_checkout_2.yml:16:9:18:31 | Uses Step | Potential execution of untrusted code on a privileged workflow ($@) | .github/workflows/workflow_run_untrusted_checkout_2.yml:2:3:2:14 | workflow_run | workflow_run |
+| .github/workflows/issue_comment_direct.yml:12:9:16:2 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_direct.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_direct.yml:20:9:24:2 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_direct.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_direct.yml:28:9:32:2 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_direct.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_direct.yml:35:9:40:2 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_direct.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_direct.yml:43:9:46:126 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_direct.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_heuristic.yml:28:9:33:2 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_heuristic.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_heuristic.yml:48:7:50:46 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_heuristic.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_octokit2.yml:27:9:31:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_octokit2.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_octokit.yml:26:9:30:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_octokit.yml:30:9:35:2 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_octokit.yml:57:9:62:2 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_octokit.yml:79:9:83:2 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_octokit.yml:95:9:100:2 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/issue_comment_octokit.yml:109:9:114:66 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/issue_comment_octokit.yml:4:3:4:15 | issue_comment | issue_comment |
+| .github/workflows/pr-workflow.yml:103:9:109:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/pr-workflow.yml:139:9:144:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/pr-workflow.yml:444:9:449:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/pr-workflow-fork.yaml:7:3:7:21 | pull_request_target | pull_request_target |
+| .github/workflows/test13.yml:20:7:25:4 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test13.yml:2:3:2:15 | issue_comment | issue_comment |
+| .github/workflows/untrusted_checkout2.yml:14:9:19:72 | Run Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/untrusted_checkout2.yml:1:5:1:17 | issue_comment | issue_comment |
+| .github/workflows/workflow_run_untrusted_checkout.yml:13:9:16:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/workflow_run_untrusted_checkout.yml:2:3:2:14 | workflow_run | workflow_run |
+| .github/workflows/workflow_run_untrusted_checkout.yml:16:9:18:31 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/workflow_run_untrusted_checkout.yml:2:3:2:14 | workflow_run | workflow_run |
+| .github/workflows/workflow_run_untrusted_checkout_2.yml:13:9:16:6 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/workflow_run_untrusted_checkout_2.yml:2:3:2:14 | workflow_run | workflow_run |
+| .github/workflows/workflow_run_untrusted_checkout_2.yml:16:9:18:31 | Uses Step | Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/workflow_run_untrusted_checkout_2.yml:2:3:2:14 | workflow_run | workflow_run |
diff --git a/cpp/downgrades/837c4e02326aee4582405d069263092e80a15d82/old.dbscheme b/cpp/downgrades/837c4e02326aee4582405d069263092e80a15d82/old.dbscheme
new file mode 100644
index 000000000000..837c4e02326a
--- /dev/null
+++ b/cpp/downgrades/837c4e02326aee4582405d069263092e80a15d82/old.dbscheme
@@ -0,0 +1,2561 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+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
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int variable_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int variable_id: @usertype 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
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/837c4e02326aee4582405d069263092e80a15d82/semmlecode.cpp.dbscheme b/cpp/downgrades/837c4e02326aee4582405d069263092e80a15d82/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..770002bb0232
--- /dev/null
+++ b/cpp/downgrades/837c4e02326aee4582405d069263092e80a15d82/semmlecode.cpp.dbscheme
@@ -0,0 +1,2545 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+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
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/837c4e02326aee4582405d069263092e80a15d82/upgrade.properties b/cpp/downgrades/837c4e02326aee4582405d069263092e80a15d82/upgrade.properties
new file mode 100644
index 000000000000..ecfa5e68def7
--- /dev/null
+++ b/cpp/downgrades/837c4e02326aee4582405d069263092e80a15d82/upgrade.properties
@@ -0,0 +1,6 @@
+description: Support alias templates
+compatibility: full
+is_alias_template.rel: delete
+alias_instantiation.rel: delete
+alias_template_argument.rel: delete
+alias_template_argument_value.rel: delete
diff --git a/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/old.dbscheme b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/old.dbscheme
new file mode 100644
index 000000000000..ef8d209a22e2
--- /dev/null
+++ b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/old.dbscheme
@@ -0,0 +1,2577 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/semmlecode.cpp.dbscheme b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..837c4e02326a
--- /dev/null
+++ b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/semmlecode.cpp.dbscheme
@@ -0,0 +1,2561 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+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
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int variable_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int variable_id: @usertype 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
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/upgrade.properties b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/upgrade.properties
new file mode 100644
index 000000000000..f77cdddbbe10
--- /dev/null
+++ b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/upgrade.properties
@@ -0,0 +1,6 @@
+description: Capture information about one template being generated from another
+compatibility: full
+class_template_generated_from.rel: delete
+function_template_generated_from.rel: delete
+variable_template_generated_from.rel: delete
+alias_template_generated_from.rel: delete
diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index 3b95c10fbb57..0b3413f9d3cb 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 10.2.0
+
+### Deprecated APIs
+
+* The `UsingAliasTypedefType` class has been deprecated. Use `TypeAliasType` instead.
+
+### New Features
+
+* Added a `getOriginalTemplate` predicate to `TemplateClass`, `TemplateFunction`, `TemplateVariable`, and `AliasTemplateType`, which yields the class member template the template was generated from. The predicates only have results for templates that are members of class template instantiations.
+* Added `AliasTemplateType` and `AliasTemplateInstantiationType` classes, representing C++ alias templates and their instantiations.
+
+### Minor Analysis Improvements
+
+* Added flow source models for `scanf_s` and related functions.
+* Added a `Call` column to `LocalFlowSourceFunction::hasLocalFlowSource` and `RemoteFlowSourceFunction::hasRemoteFlowSource`. The old predicates without a `Call` column continue to be supported.
+
 ## 10.1.1
 
 ### Minor Analysis Improvements
diff --git a/cpp/ql/lib/DefaultOptions.qll b/cpp/ql/lib/DefaultOptions.qll
index e4aa8d1f2d74..e6631f1307af 100644
--- a/cpp/ql/lib/DefaultOptions.qll
+++ b/cpp/ql/lib/DefaultOptions.qll
@@ -30,8 +30,6 @@ class Options extends string {
   predicate overrideReturnsNull(Call call) {
     // Used in CVS:
     call.(FunctionCall).getTarget().hasGlobalName("Xstrdup")
-    or
-    CustomOptions::overrideReturnsNull(call) // old Options.qll
   }
 
   /**
@@ -45,8 +43,6 @@ class Options extends string {
     // Used in CVS:
     call.(FunctionCall).getTarget().hasGlobalName("Xstrdup") and
     nullValue(call.getArgument(0))
-    or
-    CustomOptions::returnsNull(call) // old Options.qll
   }
 
   /**
@@ -65,8 +61,6 @@ class Options extends string {
     f.hasGlobalOrStdName([
         "exit", "_exit", "_Exit", "abort", "__assert_fail", "longjmp", "__builtin_unreachable"
       ])
-    or
-    CustomOptions::exits(f) // old Options.qll
   }
 
   /**
@@ -79,8 +73,7 @@ class Options extends string {
    * runtime, the program's behavior is undefined)
    */
   predicate exprExits(Expr e) {
-    e.(AssumeExpr).getChild(0).(CompileTimeConstantInt).getIntValue() = 0 or
-    CustomOptions::exprExits(e) // old Options.qll
+    e.(AssumeExpr).getChild(0).(CompileTimeConstantInt).getIntValue() = 0
   }
 
   /**
@@ -88,10 +81,7 @@ class Options extends string {
    *
    * By default holds only for `fgets`.
    */
-  predicate alwaysCheckReturnValue(Function f) {
-    f.hasGlobalOrStdName("fgets") or
-    CustomOptions::alwaysCheckReturnValue(f) // old Options.qll
-  }
+  predicate alwaysCheckReturnValue(Function f) { f.hasGlobalOrStdName("fgets") }
 
   /**
    * Holds if it is reasonable to ignore the return value of function
@@ -107,8 +97,6 @@ class Options extends string {
     // common way of sleeping using select:
     fc.getTarget().hasGlobalName("select") and
     fc.getArgument(0).getValue() = "0"
-    or
-    CustomOptions::okToIgnoreReturnValue(fc) // old Options.qll
   }
 }
 
diff --git a/cpp/ql/lib/Options.qll b/cpp/ql/lib/Options.qll
index c4652e3f6cae..fb2f24119db3 100644
--- a/cpp/ql/lib/Options.qll
+++ b/cpp/ql/lib/Options.qll
@@ -98,57 +98,3 @@ class CustomMutexType extends MutexType {
    */
   override predicate unlockAccess(FunctionCall fc, Expr arg) { none() }
 }
-
-/**
- * DEPRECATED: customize `CustomOptions.overrideReturnsNull` instead.
- *
- * This predicate is required to support backwards compatibility for
- * older `Options.qll` files.  It should not be removed or modified by
- * end users.
- */
-predicate overrideReturnsNull(Call call) { none() }
-
-/**
- * DEPRECATED: customize `CustomOptions.returnsNull` instead.
- *
- * This predicate is required to support backwards compatibility for
- * older `Options.qll` files.  It should not be removed or modified by
- * end users.
- */
-predicate returnsNull(Call call) { none() }
-
-/**
- * DEPRECATED: customize `CustomOptions.exits` instead.
- *
- * This predicate is required to support backwards compatibility for
- * older `Options.qll` files.  It should not be removed or modified by
- * end users.
- */
-predicate exits(Function f) { none() }
-
-/**
- * DEPRECATED: customize `CustomOptions.exprExits` instead.
- *
- * This predicate is required to support backwards compatibility for
- * older `Options.qll` files.  It should not be removed or modified by
- * end users.
- */
-predicate exprExits(Expr e) { none() }
-
-/**
- * DEPRECATED: customize `CustomOptions.alwaysCheckReturnValue` instead.
- *
- * This predicate is required to support backwards compatibility for
- * older `Options.qll` files.  It should not be removed or modified by
- * end users.
- */
-predicate alwaysCheckReturnValue(Function f) { none() }
-
-/**
- * DEPRECATED: customize `CustomOptions.okToIgnoreReturnValue` instead.
- *
- * This predicate is required to support backwards compatibility for
- * older `Options.qll` files.  It should not be removed or modified by
- * end users.
- */
-predicate okToIgnoreReturnValue(FunctionCall fc) { none() }
diff --git a/cpp/ql/lib/change-notes/2026-05-27-deprecated-removal.md b/cpp/ql/lib/change-notes/2026-05-27-deprecated-removal.md
new file mode 100644
index 000000000000..33ad83230d44
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2026-05-27-deprecated-removal.md
@@ -0,0 +1,15 @@
+---
+category: breaking
+---
+* Removed the deprecated `overrideReturnsNull` predicate from `Options.qll`. Use `CustomOptions.overrideReturnsNull` instead.
+* Removed the deprecated `returnsNull` predicate from `Options.qll`. Use `CustomOptions.returnsNull` instead.
+* Removed the deprecated `exits` predicate from `Options.qll`. Use `CustomOptions.exits` instead.
+* Removed the deprecated `exprExits` predicate from `Options.qll`. Use `CustomOptions.exprExits` instead.
+* Removed the deprecated `alwaysCheckReturnValue` predicate from `Options.qll`. Use `CustomOptions.alwaysCheckReturnValue` instead.
+* Removed the deprecated `okToIgnoreReturnValue` predicate from `Options.qll`. Use `CustomOptions.okToIgnoreReturnValue` instead.
+* Removed the deprecated `semmle.code.cpp.Member`. Import `semmle.code.cpp.Element` and/or `semmle.code.cpp.Type` directly.
+* Removed the deprecated `UnknownDefaultLocation` class. Use `UnknownLocation` instead.
+* Removed the deprecated `UnknownExprLocation` class. Use `UnknownLocation` instead.
+* Removed the deprecated `UnknownStmtLocation` class. Use `UnknownLocation` instead.
+* Removed the deprecated `TemplateParameter` class. Use `TypeTemplateParameter` instead.
+* Support for class resolution across link targets has been removed for databases which were created with CodeQL versions before 1.23.0.
diff --git a/cpp/ql/lib/change-notes/released/10.2.0.md b/cpp/ql/lib/change-notes/released/10.2.0.md
new file mode 100644
index 000000000000..cb514b82cbb3
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/10.2.0.md
@@ -0,0 +1,15 @@
+## 10.2.0
+
+### Deprecated APIs
+
+* The `UsingAliasTypedefType` class has been deprecated. Use `TypeAliasType` instead.
+
+### New Features
+
+* Added a `getOriginalTemplate` predicate to `TemplateClass`, `TemplateFunction`, `TemplateVariable`, and `AliasTemplateType`, which yields the class member template the template was generated from. The predicates only have results for templates that are members of class template instantiations.
+* Added `AliasTemplateType` and `AliasTemplateInstantiationType` classes, representing C++ alias templates and their instantiations.
+
+### Minor Analysis Improvements
+
+* Added flow source models for `scanf_s` and related functions.
+* Added a `Call` column to `LocalFlowSourceFunction::hasLocalFlowSource` and `RemoteFlowSourceFunction::hasRemoteFlowSource`. The old predicates without a `Call` column continue to be supported.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index 940a668bbf36..a230efed2a4c 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 10.1.1
+lastReleaseVersion: 10.2.0
diff --git a/cpp/ql/lib/cpp.qll b/cpp/ql/lib/cpp.qll
index 560a4444bfad..9cc9f7eb1ef6 100644
--- a/cpp/ql/lib/cpp.qll
+++ b/cpp/ql/lib/cpp.qll
@@ -32,7 +32,6 @@ import semmle.code.cpp.Class
 import semmle.code.cpp.Struct
 import semmle.code.cpp.Union
 import semmle.code.cpp.Enum
-import semmle.code.cpp.Member
 import semmle.code.cpp.Field
 import semmle.code.cpp.Function
 import semmle.code.cpp.MemberFunction
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index dd55ebe6c3a4..6f63423d953b 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 10.1.1
+version: 10.2.1-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/lib/semmle/code/cpp/Class.qll b/cpp/ql/lib/semmle/code/cpp/Class.qll
index e67a9e76a7a4..708cbdb4d50b 100644
--- a/cpp/ql/lib/semmle/code/cpp/Class.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Class.qll
@@ -856,8 +856,10 @@ class AbstractClass extends Class {
 
 /**
  * A class template (this class also finds partial specializations
- * of class templates).  For example in the following code there is a
- * `MyTemplateClass<T>` template:
+ * of class templates).
+ *
+ * For example in the following code there is a `MyTemplateClass<T>`
+ * template:
  * ```
  * template<class T>
  * class MyTemplateClass {
@@ -893,6 +895,29 @@ class TemplateClass extends Class {
   }
 
   override string getAPrimaryQlClass() { result = "TemplateClass" }
+
+  /**
+   * Gets the class member template this template was generated from.
+   *
+   * This predicate only has results for templates that are members of class
+   * template instantiations. For example, for `MyTemplateClass<int>::C<S>`
+   * in the following code, the result is `MyTemplateClass<T>::C<S>`.
+   * ```cpp
+   * template<class T>
+   * class MyTemplateClass {
+   *   template<class S>
+   *   class C {
+   *     ...
+   *   };
+   * };
+   *
+   * template
+   * class MyTemplateClass<int>;
+   * ```
+   */
+  TemplateClass getOriginalTemplate() {
+    class_template_generated_from(underlyingElement(this), unresolveElement(result))
+  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/Declaration.qll b/cpp/ql/lib/semmle/code/cpp/Declaration.qll
index 6f791234b638..dfb148a84f8b 100644
--- a/cpp/ql/lib/semmle/code/cpp/Declaration.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Declaration.qll
@@ -278,6 +278,8 @@ class Declaration extends Locatable, @declaration {
     or
     variable_template_argument(underlyingElement(this), index, unresolveElement(result))
     or
+    alias_template_argument(underlyingElement(this), index, unresolveElement(result))
+    or
     template_template_argument(underlyingElement(this), index, unresolveElement(result))
     or
     concept_template_argument(underlyingElement(this), index, unresolveElement(result))
@@ -290,6 +292,8 @@ class Declaration extends Locatable, @declaration {
     or
     variable_template_argument_value(underlyingElement(this), index, unresolveElement(result))
     or
+    alias_template_argument_value(underlyingElement(this), index, unresolveElement(result))
+    or
     template_template_argument_value(underlyingElement(this), index, unresolveElement(result))
     or
     concept_template_argument_value(underlyingElement(this), index, unresolveElement(result))
diff --git a/cpp/ql/lib/semmle/code/cpp/Element.qll b/cpp/ql/lib/semmle/code/cpp/Element.qll
index 17af69eddacd..35a7341fe4b1 100644
--- a/cpp/ql/lib/semmle/code/cpp/Element.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Element.qll
@@ -278,6 +278,15 @@ private predicate isFromTemplateInstantiationRec(Element e, Element instantiatio
   instantiation.(Variable).isConstructedFrom(_) and
   e = instantiation
   or
+  instantiation.(TypeAliasType).isConstructedFrom(_) and
+  e = instantiation
+  or
+  instantiation.(TemplateTemplateParameterInstantiation).isConstructedFrom(_) and
+  e = instantiation
+  or
+  exists(instantiation.(ConceptIdExpr).getConcept()) and
+  e = instantiation
+  or
   isFromTemplateInstantiationRec(e.getEnclosingElement(), instantiation)
 }
 
@@ -291,6 +300,15 @@ private predicate isFromUninstantiatedTemplateRec(Element e, Element template) {
   is_variable_template(unresolveElement(template)) and
   e = template
   or
+  is_alias_template(unresolveElement(template)) and
+  e = template
+  or
+  usertypes(unresolveElement(template), _, 8) and // template template parameter
+  e = template
+  or
+  template instanceof @concept_template and
+  e = template
+  or
   isFromUninstantiatedTemplateRec(e.getEnclosingElement(), template)
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/Function.qll b/cpp/ql/lib/semmle/code/cpp/Function.qll
index 8d93ac0f2a3a..f97addd2a0bd 100644
--- a/cpp/ql/lib/semmle/code/cpp/Function.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Function.qll
@@ -828,6 +828,27 @@ class TemplateFunction extends Function {
    * such things -- see FunctionTemplateSpecialization for further details.
    */
   FunctionTemplateSpecialization getASpecialization() { result.getPrimaryTemplate() = this }
+
+  /**
+   * Gets the class member template this template was generated from.
+   *
+   * This predicate only has results for templates that are members of class
+   * template instantiations. For example, for `MyTemplateClass<int>::f<S>`
+   * in the following code, the result is `MyTemplateClass<T>::f<S>`.
+   * ```cpp
+   * template<class T>
+   * class MyTemplateClass {
+   *   template<class S>
+   *   S f();
+   * };
+   *
+   * template
+   * class MyTemplateClass<int>;
+   * ```
+   */
+  TemplateFunction getOriginalTemplate() {
+    function_template_generated_from(underlyingElement(this), unresolveElement(result))
+  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/Location.qll b/cpp/ql/lib/semmle/code/cpp/Location.qll
index 8b0a78f91aa8..92668206a9f1 100644
--- a/cpp/ql/lib/semmle/code/cpp/Location.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Location.qll
@@ -148,28 +148,3 @@ class UnknownLocation extends Location {
     this.getFile().getAbsolutePath() = "" and locations_default(this, _, 0, 0, 0, 0)
   }
 }
-
-/**
- * A dummy location which is used when something doesn't have a location in
- * the source code but needs to have a `Location` associated with it.
- *
- * DEPRECATED: use `UnknownLocation`
- */
-deprecated class UnknownDefaultLocation extends UnknownLocation { }
-
-/**
- * A dummy location which is used when an expression doesn't have a
- * location in the source code but needs to have a `Location` associated
- * with it.
- *
- * DEPRECATED: use `UnknownLocation`
- */
-deprecated class UnknownExprLocation extends UnknownLocation { }
-
-/**
- * A dummy location which is used when a statement doesn't have a location
- * in the source code but needs to have a `Location` associated with it.
- *
- * DEPRECATED: use `UnknownLocation`
- */
-deprecated class UnknownStmtLocation extends UnknownLocation { }
diff --git a/cpp/ql/lib/semmle/code/cpp/Member.qll b/cpp/ql/lib/semmle/code/cpp/Member.qll
deleted file mode 100644
index f47edbddeba0..000000000000
--- a/cpp/ql/lib/semmle/code/cpp/Member.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * DEPRECATED: import `semmle.code.cpp.Element` and/or `semmle.code.cpp.Type` directly as required.
- */
-
-import semmle.code.cpp.Element
-import semmle.code.cpp.Type
diff --git a/cpp/ql/lib/semmle/code/cpp/TemplateParameter.qll b/cpp/ql/lib/semmle/code/cpp/TemplateParameter.qll
index 6ece9cb82a46..e95b5b070731 100644
--- a/cpp/ql/lib/semmle/code/cpp/TemplateParameter.qll
+++ b/cpp/ql/lib/semmle/code/cpp/TemplateParameter.qll
@@ -35,13 +35,6 @@ class NonTypeTemplateParameter extends Literal, TemplateParameterImpl {
   override string getAPrimaryQlClass() { result = "NonTypeTemplateParameter" }
 }
 
-/**
- * A C++ `typename` (or `class`) template parameter.
- *
- * DEPRECATED: Use `TypeTemplateParameter` instead.
- */
-deprecated class TemplateParameter = TypeTemplateParameter;
-
 /**
  * A C++ `typename` (or `class`) template parameter.
  *
diff --git a/cpp/ql/lib/semmle/code/cpp/TypedefType.qll b/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
index 1e330842d09b..69eb8f881d29 100644
--- a/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
+++ b/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
@@ -64,23 +64,123 @@ class CTypedefType extends TypedefType {
 }
 
 /**
- * A using alias C++ typedef type.  For example the type declared in the following code:
+ * DEPRECATED: Use `TypeAlias` instead.
+ *
+ * A C++ type alias or alias template.
+ *
+ * For example the type declared in the following code:
  * ```
  * using my_int2 = int;
  * ```
  */
-class UsingAliasTypedefType extends TypedefType {
-  UsingAliasTypedefType() { usertype_alias_kind(underlyingElement(this), 1) }
+deprecated class UsingAliasTypedefType = TypeAliasType;
 
-  override string getAPrimaryQlClass() { result = "UsingAliasTypedefType" }
+/**
+ * A C++ type alias or alias template.
+ *
+ * For example the type declared in the following code:
+ * ```
+ * using my_int2 = int;
+ * ```
+ */
+class TypeAliasType extends TypedefType {
+  TypeAliasType() { usertype_alias_kind(underlyingElement(this), 1) }
+
+  override string getAPrimaryQlClass() { result = "TypeAliasType" }
 
   override string explain() {
     result = "using {" + this.getBaseType().explain() + "} as \"" + this.getName() + "\""
   }
+
+  /**
+   * Holds if this alias is constructed from another alias as a result of
+   * template instantiation.
+   */
+  predicate isConstructedFrom(TypeAliasType t) {
+    alias_instantiation(underlyingElement(this), unresolveElement(t))
+  }
+}
+
+/**
+ * A C++ alias template.
+ *
+ * For example the type declared in the following code:
+ * ```
+ * template <typename T>
+ * using my_type = T;
+ * ```
+ */
+class AliasTemplateType extends TypeAliasType {
+  AliasTemplateType() { is_alias_template(underlyingElement(this)) }
+
+  override string getAPrimaryQlClass() { result = "AliasTemplateType" }
+
+  /**
+   * Gets an alias instantiated from this template.
+   *
+   * For example for `MyAliasTemplate<T>` in the following code, the results are
+   * `MyAliasTemplate<int>` and `MyAliasTemplate<long>`:
+   * ```
+   * template<typename T>
+   * using MyAliasTemplate = ...;
+   *
+   * MyAliasTemplate<int> instance1;
+   *
+   * MyAliasTemplate<long> instance2;
+   * ```
+   */
+  TypeAliasType getAnInstantiation() { result.isConstructedFrom(this) }
+
+  /**
+   * Gets the class member template this template was generated from.
+   *
+   * This predicate only has results for templates that are members of class
+   * template instantiations. For example, for `MyTemplateClass<int>::t<S>`
+   * in the following code, the result is `MyTemplateClass<T>::t<S>`.
+   * ```cpp
+   * template<class T>
+   * class MyTemplateClass {
+   *   template<class S>
+   *   using t = S;
+   * };
+   *
+   * template
+   * class MyTemplateClass<int>;
+   * ```
+   */
+  AliasTemplateType getOriginalTemplate() {
+    alias_template_generated_from(underlyingElement(this), unresolveElement(result))
+  }
+}
+
+/**
+ * A C++ alias template instantiation.
+ *
+ * For example the `my_int_type` type declared in the following code:
+ * ```
+ * template <typename T>
+ * using my_type = T;
+ *
+ * using my_int_type = my_type<int>;
+ * ```
+ */
+class AliasTemplateInstantiationType extends TypeAliasType {
+  AliasTemplateType at;
+
+  AliasTemplateInstantiationType() { at.getAnInstantiation() = this }
+
+  override string getAPrimaryQlClass() { result = "AliasTemplateInstantiationType" }
+
+  /**
+   * Gets the alias template from which this instantiation was instantiated.
+   */
+  AliasTemplateType getTemplate() { result = at }
 }
 
 /**
- * A C++ `typedef` type that is directly enclosed by a function.  For example the type declared inside the function `foo` in
+ * A C++ `typedef` type that is directly enclosed by a function.
+ *
+ * For example the type declared inside the function `foo` in
  * the following code:
  * ```
  * int foo(void) { typedef int local; }
diff --git a/cpp/ql/lib/semmle/code/cpp/Variable.qll b/cpp/ql/lib/semmle/code/cpp/Variable.qll
index 8e68cc1927f7..be46d69b41f4 100644
--- a/cpp/ql/lib/semmle/code/cpp/Variable.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Variable.qll
@@ -614,6 +614,27 @@ class TemplateVariable extends Variable {
     result.isConstructedFrom(this) and
     not result.isSpecialization()
   }
+
+  /**
+   * Gets the class member template this template was generated from.
+   *
+   * This predicate only has results for templates that are members of class
+   * template instantiations. For example, for `MyTemplateClass<int>::x<S>`
+   * in the following code, the result is `MyTemplateClass<T>::x<S>`.
+   * ```cpp
+   * template<class T>
+   * class MyTemplateClass {
+   *   template<class S>
+   *   static S x;
+   * };
+   *
+   * template
+   * class MyTemplateClass<int>;
+   * ```
+   */
+  TemplateVariable getOriginalTemplate() {
+    variable_template_generated_from(underlyingElement(this), unresolveElement(result))
+  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/commons/Scanf.qll b/cpp/ql/lib/semmle/code/cpp/commons/Scanf.qll
index 98280a522cfd..5128a94c1730 100644
--- a/cpp/ql/lib/semmle/code/cpp/commons/Scanf.qll
+++ b/cpp/ql/lib/semmle/code/cpp/commons/Scanf.qll
@@ -25,6 +25,15 @@ abstract class ScanfFunction extends Function {
    * (rather than a `char*`).
    */
   predicate isWideCharDefault() { exists(this.getName().indexOf("wscanf")) }
+
+  /** Holds if this is one of the `scanf_s` variants. */
+  predicate isSVariant() {
+    exists(string name | name = this.getName() |
+      name.matches("%\\_s")
+      or
+      name.matches("%\\_s\\_l")
+    )
+  }
 }
 
 /**
@@ -34,8 +43,12 @@ class Scanf extends ScanfFunction instanceof TopLevelFunction {
   Scanf() {
     this.hasGlobalOrStdOrBslName("scanf") or // scanf(format, args...)
     this.hasGlobalOrStdOrBslName("wscanf") or // wscanf(format, args...)
+    this.hasGlobalOrStdOrBslName("scanf_s") or // scanf_s(format, args...)
+    this.hasGlobalOrStdOrBslName("wscanf_s") or // wscanf_s(format, args...)
     this.hasGlobalName("_scanf_l") or // _scanf_l(format, locale, args...)
-    this.hasGlobalName("_wscanf_l")
+    this.hasGlobalName("_wscanf_l") or // _wscanf_l(format, locale, args...)
+    this.hasGlobalName("_scanf_s_l") or // _scanf_s_l(format, locale, args...)
+    this.hasGlobalName("_wscanf_s_l") // _wscanf_s_l(format, locale, args...)
   }
 
   override int getInputParameterIndex() { none() }
@@ -50,8 +63,12 @@ class Fscanf extends ScanfFunction instanceof TopLevelFunction {
   Fscanf() {
     this.hasGlobalOrStdOrBslName("fscanf") or // fscanf(src_stream, format, args...)
     this.hasGlobalOrStdOrBslName("fwscanf") or // fwscanf(src_stream, format, args...)
+    this.hasGlobalOrStdOrBslName("fscanf_s") or // fscanf_s(src_stream, format, args...)
+    this.hasGlobalOrStdOrBslName("fwscanf_s") or // fwscanf_s(src_stream, format, args...)
     this.hasGlobalName("_fscanf_l") or // _fscanf_l(src_stream, format, locale, args...)
-    this.hasGlobalName("_fwscanf_l")
+    this.hasGlobalName("_fwscanf_l") or // _fwscanf_l(src_stream, format, locale, args...)
+    this.hasGlobalName("_fscanf_s_l") or // _fscanf_s_l(src_stream, format, locale, args...)
+    this.hasGlobalName("_fwscanf_s_l") // _fwscanf_s_l(src_stream, format, locale, args...)
   }
 
   override int getInputParameterIndex() { result = 0 }
@@ -66,8 +83,12 @@ class Sscanf extends ScanfFunction instanceof TopLevelFunction {
   Sscanf() {
     this.hasGlobalOrStdOrBslName("sscanf") or // sscanf(src_stream, format, args...)
     this.hasGlobalOrStdOrBslName("swscanf") or // swscanf(src, format, args...)
+    this.hasGlobalOrStdOrBslName("sscanf_s") or // sscanf_s(src, format, args...)
+    this.hasGlobalOrStdOrBslName("swscanf_s") or // swscanf_s(src, format, args...)
     this.hasGlobalName("_sscanf_l") or // _sscanf_l(src, format, locale, args...)
-    this.hasGlobalName("_swscanf_l")
+    this.hasGlobalName("_swscanf_l") or // _swscanf_l(src, format, locale, args...)
+    this.hasGlobalName("_sscanf_s_l") or // _sscanf_s_l(src, format, locale, args...)
+    this.hasGlobalName("_swscanf_s_l") // _swscanf_s_l(src, format, locale, args...)
   }
 
   override int getInputParameterIndex() { result = 0 }
@@ -97,6 +118,14 @@ class Snscanf extends ScanfFunction instanceof TopLevelFunction {
   int getInputLengthParameterIndex() { result = 1 }
 }
 
+private predicate isCharLike(Type t) { t instanceof CharType or t instanceof Wchar_t }
+
+private predicate isStringLike(Type t) {
+  isCharLike(t.(PointerType).getBaseType())
+  or
+  isCharLike(t.(ArrayType).getBaseType())
+}
+
 /**
  * A call to one of the `scanf` functions.
  */
@@ -130,14 +159,40 @@ class ScanfFunctionCall extends FunctionCall {
    */
   predicate isWideCharDefault() { this.getScanfFunction().isWideCharDefault() }
 
+  bindingset[this, k]
+  pragma[inline_late]
+  private predicate isSizeArgument(int k) {
+    // The first vararg is never the size argument since a size argument must
+    // always follow a string buffer argument.
+    k > 0 and
+    isStringLike(this.getArgument(this.getScanfFunction().getNumberOfParameters() + k - 1)
+          .getUnspecifiedType())
+  }
+
   /**
    * Gets the output argument at position `n` in the vararg list of this call.
    *
    * The range of `n` is from `0` to `this.getNumberOfOutputArguments() - 1`.
    */
   Expr getOutputArgument(int n) {
-    result = this.getArgument(this.getTarget().getNumberOfParameters() + n) and
-    n >= 0
+    exists(ScanfFunction target | target = this.getScanfFunction() |
+      // If this is an S variant then every string buffer argument has a
+      // corresponding size argument immediately following it, so we need to
+      // skip over those size arguments when counting the output arguments.
+      if target.isSVariant()
+      then
+        result =
+          rank[n + 1](Expr arg, int k |
+            k >= 0 and
+            arg = this.getArgument(target.getNumberOfParameters() + k) and
+            not this.isSizeArgument(k)
+          |
+            arg order by k
+          )
+      else (
+        n >= 0 and result = this.getArgument(target.getNumberOfParameters() + n)
+      )
+    )
   }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/internal/ResolveClass.qll b/cpp/ql/lib/semmle/code/cpp/internal/ResolveClass.qll
index 9b2acc05e9e2..52c9aba7a868 100644
--- a/cpp/ql/lib/semmle/code/cpp/internal/ResolveClass.qll
+++ b/cpp/ql/lib/semmle/code/cpp/internal/ResolveClass.qll
@@ -1,59 +1,5 @@
 import semmle.code.cpp.Type
 
-/** For upgraded databases without mangled name info. */
-pragma[noinline]
-private string getTopLevelClassName(@usertype c) {
-  not mangled_name(_, _, _) and
-  isClass(c) and
-  usertypes(c, result, _) and
-  not namespacembrs(_, c) and // not in a namespace
-  not member(_, _, c) and // not in some structure
-  not class_instantiation(c, _) // not a template instantiation
-}
-
-/**
- * For upgraded databases without mangled name info.
- * Holds if `d` is a unique complete class named `name`.
- */
-pragma[noinline]
-private predicate existsCompleteWithName(string name, @usertype d) {
-  not mangled_name(_, _, _) and
-  is_complete(d) and
-  name = getTopLevelClassName(d) and
-  onlyOneCompleteClassExistsWithName(name)
-}
-
-/** For upgraded databases without mangled name info. */
-pragma[noinline]
-private predicate onlyOneCompleteClassExistsWithName(string name) {
-  not mangled_name(_, _, _) and
-  strictcount(@usertype c | is_complete(c) and getTopLevelClassName(c) = name) = 1
-}
-
-/**
- * For upgraded databases without mangled name info.
- * Holds if `c` is an incomplete class named `name`.
- */
-pragma[noinline]
-private predicate existsIncompleteWithName(string name, @usertype c) {
-  not mangled_name(_, _, _) and
-  not is_complete(c) and
-  name = getTopLevelClassName(c)
-}
-
-/**
- * For upgraded databases without mangled name info.
- * Holds if `c` is an incomplete class, and there exists a unique complete class `d`
- * with the same name.
- */
-private predicate oldHasCompleteTwin(@usertype c, @usertype d) {
-  not mangled_name(_, _, _) and
-  exists(string name |
-    existsIncompleteWithName(name, c) and
-    existsCompleteWithName(name, d)
-  )
-}
-
 pragma[noinline]
 private @mangledname getClassMangledName(@usertype c) {
   isClass(c) and
@@ -103,10 +49,7 @@ private module Cached {
   @usertype resolveClass(@usertype c) {
     hasCompleteTwin(c, result)
     or
-    oldHasCompleteTwin(c, result)
-    or
     not hasCompleteTwin(c, _) and
-    not oldHasCompleteTwin(c, _) and
     result = c
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
index f1bdd6b8c520..432261dfe278 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
@@ -136,7 +136,9 @@ private module SourceVariables {
     NormalSourceVariable() { this = TNormalSourceVariable(base, ind) }
 
     final override string toString() {
-      result = repeatStars(this.getIndirection()) + base.toString()
+      if this.getIndirection() = 0
+      then result = "&" + base.toString()
+      else result = repeatStars(this.getIndirection() - 1) + base.toString()
     }
   }
 
@@ -157,7 +159,9 @@ private module SourceVariables {
     }
 
     final override string toString() {
-      result = repeatStars(this.getIndirection()) + base.toString() + " [before crement]"
+      if this.getIndirection() = 0
+      then result = "&" + base.toString() + " [before crement]"
+      else result = repeatStars(this.getIndirection() - 1) + base.toString() + " [before crement]"
     }
 
     /**
@@ -1353,6 +1357,52 @@ class PhiNode extends Definition instanceof SsaImpl::PhiNode {
   final predicate hasInputFromBlock(Definition input, IRBlock bb) {
     phiHasInputFromBlock(this, input, bb)
   }
+
+  override int getIndirection() { result = this.getSourceVariable().getIndirection() }
+
+  override predicate isCertain() {
+    // If this phi node is part of a phi cycle of phi nodes the least
+    // fixed-point semantics of datalog means we don't get the right answer.
+    // So we perform an SCC reduction to simulate greatest fixed-point semantics.
+    getCycle(this).isCertain()
+    or
+    // If there is no cycle we get the right semantics through traditional
+    // recursion.
+    not exists(getCycle(this)) and
+    forex(Definition inp | inp = this.getAnInput() | inp.isCertain())
+  }
+
+  final override Declaration getFunction() {
+    result = SsaImpl::PhiNode.super.getBasicBlock().getEnclosingFunction()
+  }
+}
+
+private PhiNode getAnInput(PhiNode phi) { result = phi.getAnInput() }
+
+private predicate sccEdge(PhiNode phi1, PhiNode phi2) {
+  getAnInput(phi1) = phi2 and getAnInput+(phi2) = phi1
+}
+
+private module PhiCycleEquivalence = QlBuiltins::EquivalenceRelation<PhiNode, sccEdge/2>;
+
+private PhiCycle getCycle(PhiNode phi) { result.getAPhiNode() = phi }
+
+private class PhiCycle extends PhiCycleEquivalence::EquivalenceClass {
+  PhiNode getAPhiNode() { PhiCycleEquivalence::getEquivalenceClass(result) = this }
+
+  predicate hasPhiNode(PhiNode phi) { this.getAPhiNode() = phi }
+
+  pragma[nomagic]
+  Definition getAnInput() {
+    result = this.getAPhiNode().getAnInput() and not this.hasPhiNode(result)
+  }
+
+  string toString() { result = strictconcat(this.getAPhiNode().toString(), ", ") }
+
+  predicate isCertain() {
+    // A phi cycle is certain if all of the inputs into the phi cycle is certain.
+    forex(Definition inp | inp = this.getAnInput() | inp.isCertain())
+  }
 }
 
 /** An static single assignment (SSA) definition. */
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
index e4734f285fa7..31931189003c 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
@@ -147,7 +147,7 @@ abstract class Indirection extends Type {
    *
    * `certain` is `true` if this write is guaranteed to write to the address.
    */
-  predicate isAdditionalWrite(Node0Impl value, Operand address, boolean certain) { none() }
+  predicate isAdditionalWrite(Node0Impl value, Operand address, Certainty certain) { none() }
 
   /**
    * Gets the base type of this indirection, after specifiers have been deeply
@@ -198,11 +198,11 @@ private module IteratorIndirections {
       baseType = super.getValueType()
     }
 
-    override predicate isAdditionalWrite(Node0Impl value, Operand address, boolean certain) {
+    override predicate isAdditionalWrite(Node0Impl value, Operand address, Certainty certain) {
       exists(CallInstruction call | call.getArgumentOperand(0) = value.asOperand() |
         this = call.getStaticCallTarget().(Function).getClassAndName("operator=") and
         address = call.getThisArgumentOperand() and
-        certain = false
+        certain instanceof AlwaysUncertain
       )
     }
 
@@ -271,30 +271,62 @@ predicate isDereference(Instruction deref, Operand address, boolean additional)
   additional = false
 }
 
-predicate isWrite(Node0Impl value, Operand address, boolean certain) {
+private newtype TCertainty =
+  TCertainWhenAddressIsCertain() or
+  TAlwaysCertain() or
+  TAlwaysUncertain()
+
+abstract private class Certainty extends TCertainty {
+  abstract predicate isCertain(boolean addressIsCertain);
+
+  abstract string toString();
+}
+
+private class CertainWhenAddressIsCertain extends Certainty, TCertainWhenAddressIsCertain {
+  override predicate isCertain(boolean addressIsCertain) { addressIsCertain = true }
+
+  override string toString() { result = "CertainWhenAddressIsCertain" }
+}
+
+private class AlwaysCertain extends Certainty, TAlwaysCertain {
+  override predicate isCertain(boolean addressIsCertain) {
+    addressIsCertain = true or addressIsCertain = false
+  }
+
+  override string toString() { result = "AlwaysCertain" }
+}
+
+private class AlwaysUncertain extends Certainty, TAlwaysUncertain {
+  override predicate isCertain(boolean addressIsCertain) { none() }
+
+  override string toString() { result = "AlwaysUncertain" }
+}
+
+predicate isWrite(Node0Impl value, Operand address, Certainty certain) {
   any(Indirection ind).isAdditionalWrite(value, address, certain)
   or
-  certain = true and
-  (
-    exists(StoreInstruction store |
-      value.asInstruction() = store and
-      address = store.getDestinationAddressOperand()
-    )
-    or
-    exists(InitializeParameterInstruction init |
-      value.asInstruction() = init and
-      address = init.getAnOperand()
-    )
-    or
-    exists(InitializeDynamicAllocationInstruction init |
-      value.asInstruction() = init and
-      address = init.getAllocationAddressOperand()
-    )
-    or
-    exists(UninitializedInstruction uninitialized |
-      value.asInstruction() = uninitialized and
-      address = uninitialized.getAnOperand()
-    )
+  exists(StoreInstruction store |
+    value.asInstruction() = store and
+    address = store.getDestinationAddressOperand() and
+    certain instanceof CertainWhenAddressIsCertain
+  )
+  or
+  exists(InitializeParameterInstruction init |
+    value.asInstruction() = init and
+    address = init.getAnOperand() and
+    certain instanceof AlwaysCertain
+  )
+  or
+  exists(InitializeDynamicAllocationInstruction init |
+    value.asInstruction() = init and
+    address = init.getAllocationAddressOperand() and
+    certain instanceof AlwaysCertain
+  )
+  or
+  exists(UninitializedInstruction uninitialized |
+    value.asInstruction() = uninitialized and
+    address = uninitialized.getAnOperand() and
+    certain instanceof AlwaysCertain
   )
 }
 
@@ -718,16 +750,18 @@ private module Cached {
     int indirectionIndex
   ) {
     exists(
-      boolean writeIsCertain, boolean addressIsCertain, int ind0, CppType type, int lower, int upper
+      Certainty writeIsCertain, boolean addressIsCertain, int ind0, CppType type, int lower,
+      int upper
     |
       isWrite(value, address, writeIsCertain) and
       isDefImpl(address, base, ind0, addressIsCertain) and
-      certain = writeIsCertain.booleanAnd(addressIsCertain) and
       type = getLanguageType(address) and
       upper = countIndirectionsForCppType(type) and
       ind = ind0 + [lower .. upper] and
       indirectionIndex = ind - (ind0 + lower) and
       lower = getMinIndirectionsForType(any(Type t | type.hasUnspecifiedType(t, _)))
+    |
+      if writeIsCertain.isCertain(addressIsCertain) then certain = true else certain = false
     )
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
index fc6ceb321c1f..c49a59a56e7a 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
@@ -11,7 +11,9 @@ private class Fopen extends Function, AliasFunction, SideEffectFunction, TaintFu
   Fopen() {
     this.hasGlobalOrStdName(["fopen", "fopen_s", "freopen"])
     or
-    this.hasGlobalName(["_open", "_wfopen", "_fsopen", "_wfsopen", "_wopen"])
+    this.hasGlobalName([
+        "_open", "_wfopen", "_fsopen", "_wfsopen", "_wopen", "_sopen_s", "_wsopen_s"
+      ])
   }
 
   override predicate hasOnlySpecificWriteSideEffects() { any() }
@@ -46,6 +48,10 @@ private class Fopen extends Function, AliasFunction, SideEffectFunction, TaintFu
     this.hasGlobalName(["_open", "_wopen"]) and
     i = 0 and
     buffer = true
+    or
+    this.hasGlobalName(["_sopen_s", "_wsopen_s"]) and
+    i = 1 and
+    buffer = true
   }
 
   override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
@@ -64,5 +70,9 @@ private class Fopen extends Function, AliasFunction, SideEffectFunction, TaintFu
     this.hasGlobalName(["_open", "_wopen"]) and
     input.isParameterDeref(0) and
     output.isReturnValue()
+    or
+    this.hasGlobalName(["_sopen_s", "_wsopen_s"]) and
+    input.isParameterDeref(1) and
+    output.isParameterDeref(0)
   }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Scanf.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Scanf.qll
index f1b3edbe3370..2c82e5423239 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Scanf.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Scanf.qll
@@ -30,7 +30,10 @@ abstract private class ScanfFunctionModel extends ArrayFunction, TaintFunction,
     (
       if exists(this.getLengthParameterIndex())
       then result = this.getLengthParameterIndex() + 2
-      else result = 2
+      else
+        if exists(this.(ScanfFunction).getInputParameterIndex())
+        then result = 2
+        else result = 1
     )
   }
 
@@ -69,13 +72,24 @@ abstract private class ScanfFunctionModel extends ArrayFunction, TaintFunction,
   }
 }
 
+private predicate hasFlowSource(
+  ScanfFunction func, ScanfFunctionCall call, FunctionOutput output, string description
+) {
+  exists(int n, Expr arg |
+    call.getScanfFunction() = func and
+    call.getOutputArgument(_) = arg and
+    call.getArgument(n) = arg and
+    output.isParameterDeref(n) and
+    description = "value read by " + func.getName()
+  )
+}
+
 /**
  * The standard function `scanf` and its assorted variants
  */
 private class ScanfModel extends ScanfFunctionModel, LocalFlowSourceFunction instanceof Scanf {
-  override predicate hasLocalFlowSource(FunctionOutput output, string description) {
-    output.isParameterDeref(any(int i | i >= this.getArgsStartPosition())) and
-    description = "value read by " + this.getName()
+  override predicate hasLocalFlowSource(Call call, FunctionOutput output, string description) {
+    hasFlowSource(this, call, output, description)
   }
 }
 
@@ -83,9 +97,8 @@ private class ScanfModel extends ScanfFunctionModel, LocalFlowSourceFunction ins
  * The standard function `fscanf` and its assorted variants
  */
 private class FscanfModel extends ScanfFunctionModel, RemoteFlowSourceFunction instanceof Fscanf {
-  override predicate hasRemoteFlowSource(FunctionOutput output, string description) {
-    output.isParameterDeref(any(int i | i >= this.getArgsStartPosition())) and
-    description = "value read by " + this.getName()
+  override predicate hasRemoteFlowSource(Call call, FunctionOutput output, string description) {
+    hasFlowSource(this, call, output, description)
   }
 
   override predicate hasSocketInput(FunctionInput input) {
diff --git a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FlowSource.qll b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FlowSource.qll
index d2103f83bc0e..cf28fd0d6d30 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FlowSource.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FlowSource.qll
@@ -18,7 +18,17 @@ abstract class RemoteFlowSourceFunction extends Function {
   /**
    * Holds if remote data described by `description` flows from `output` of a call to this function.
    */
-  abstract predicate hasRemoteFlowSource(FunctionOutput output, string description);
+  predicate hasRemoteFlowSource(FunctionOutput output, string description) {
+    this.hasRemoteFlowSource(_, output, description)
+  }
+
+  /**
+   * Holds if remote data described by `description` flows from `output` of `call` to this function.
+   */
+  predicate hasRemoteFlowSource(Call call, FunctionOutput output, string description) {
+    call.getTarget() = this and
+    this.hasRemoteFlowSource(output, description)
+  }
 
   /**
    * Holds if remote data from this source comes from a socket or stream
@@ -35,7 +45,17 @@ abstract class LocalFlowSourceFunction extends Function {
   /**
    * Holds if data described by `description` flows from `output` of a call to this function.
    */
-  abstract predicate hasLocalFlowSource(FunctionOutput output, string description);
+  predicate hasLocalFlowSource(FunctionOutput output, string description) {
+    this.hasLocalFlowSource(_, output, description)
+  }
+
+  /**
+   * Holds if data described by `description` flows from `output` of `call` to this function.
+   */
+  predicate hasLocalFlowSource(Call call, FunctionOutput output, string description) {
+    call.getTarget() = this and
+    this.hasLocalFlowSource(output, description)
+  }
 }
 
 /** A library function that sends data over a network connection. */
diff --git a/cpp/ql/lib/semmle/code/cpp/security/FlowSources.qll b/cpp/ql/lib/semmle/code/cpp/security/FlowSources.qll
index eba6f9339ffe..33695fdd51ab 100644
--- a/cpp/ql/lib/semmle/code/cpp/security/FlowSources.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/FlowSources.qll
@@ -28,8 +28,7 @@ private class RemoteModelSource extends RemoteFlowSource {
 
   RemoteModelSource() {
     exists(CallInstruction call, RemoteFlowSourceFunction func, FunctionOutput output |
-      call.getStaticCallTarget() = func and
-      func.hasRemoteFlowSource(output, sourceType) and
+      func.hasRemoteFlowSource(call.getConvertedResultExpression(), output, sourceType) and
       this = callOutput(call, output)
     )
   }
@@ -46,7 +45,7 @@ private class LocalModelSource extends LocalFlowSource {
   LocalModelSource() {
     exists(CallInstruction call, LocalFlowSourceFunction func, FunctionOutput output |
       call.getStaticCallTarget() = func and
-      func.hasLocalFlowSource(output, sourceType) and
+      func.hasLocalFlowSource(call.getConvertedResultExpression(), output, sourceType) and
       this = callOutput(call, output)
     )
   }
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 770002bb0232..ef8d209a22e2 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -912,6 +912,10 @@ class_template_argument_value(
     int index: int ref,
     int arg_value: @expr ref
 );
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
 
 @user_or_decltype = @usertype | @decltype;
 
@@ -943,6 +947,10 @@ function_template_argument_value(
     int index: int ref,
     int arg_value: @expr ref
 );
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
 
 is_variable_template(unique int id: @variable ref);
 variable_instantiation(
@@ -959,6 +967,30 @@ variable_template_argument_value(
     int index: int ref,
     int arg_value: @expr ref
 );
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
 
 template_template_instantiation(
     int to: @usertype ref,
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index ab81be3fa7cc..0b97bb3329b6 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>12591</v>
+            <v>12550</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -10,15 +10,15 @@
         </e>
         <e>
             <k>@file</k>
-            <v>64946</v>
+            <v>64732</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>12339</v>
+            <v>12298</v>
         </e>
         <e>
             <k>@diagnostic</k>
-            <v>357</v>
+            <v>356</v>
         </e>
         <e>
             <k>@trap</k>
@@ -28,29 +28,29 @@
             <k>@tag</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@location_default</k>
+            <v>46452143</v>
+        </e>
         <e>
             <k>@source_file</k>
             <v>1</v>
         </e>
         <e>
             <k>@pch</k>
-            <v>248</v>
-        </e>
-        <e>
-            <k>@location_default</k>
-            <v>46837435</v>
+            <v>246</v>
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40309769</v>
+            <v>40321986</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>300641</v>
+            <v>300732</v>
         </e>
         <e>
             <k>@normal_function</k>
-            <v>2734631</v>
+            <v>2702108</v>
         </e>
         <e>
             <k>@unknown_function</k>
@@ -58,51 +58,51 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>694343</v>
+            <v>687816</v>
         </e>
         <e>
             <k>@destructor</k>
-            <v>85993</v>
+            <v>85025</v>
         </e>
         <e>
             <k>@conversion_function</k>
-            <v>10329</v>
+            <v>10212</v>
         </e>
         <e>
             <k>@operator</k>
-            <v>650865</v>
+            <v>643042</v>
         </e>
         <e>
             <k>@user_defined_literal</k>
-            <v>995</v>
+            <v>984</v>
         </e>
         <e>
             <k>@deduction_guide</k>
-            <v>5849</v>
+            <v>5783</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4193416</v>
+            <v>4144339</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9367984</v>
+            <v>9431661</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1629528</v>
+            <v>1610928</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>408755</v>
+            <v>408652</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>266845</v>
+            <v>265912</v>
         </e>
         <e>
             <k>@using_directive</k>
-            <v>6430</v>
+            <v>6370</v>
         </e>
         <e>
             <k>@using_enum_declaration</k>
@@ -110,291 +110,291 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>172739</v>
+            <v>172696</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>7011801</v>
+            <v>6929135</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1502766</v>
+            <v>1503222</v>
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>492567</v>
+            <v>662484</v>
         </e>
         <e>
             <k>@localvariable</k>
-            <v>724688</v>
+            <v>724508</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>348040</v>
+            <v>348146</v>
         </e>
         <e>
             <k>@errortype</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@unknowntype</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@void</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@boolean</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@char</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@unsigned_char</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@signed_char</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@short</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@unsigned_short</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@signed_short</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@int</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@unsigned_int</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@signed_int</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@long</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@unsigned_long</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@signed_long</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@long_long</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@unsigned_long_long</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@signed_long_long</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@float</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@double</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@long_double</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_float</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_double</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_long_double</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@imaginary_float</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@imaginary_double</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@imaginary_long_double</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@wchar_t</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@decltype_nullptr</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@int128</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@unsigned_int128</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@signed_int128</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@float128</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_float128</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@char16_t</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@char32_t</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@std_float32</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@float32x</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@std_float64</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@float64x</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@std_float128</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@char8_t</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@float16</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_float16</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@fp16</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@std_bfloat16</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@std_float16</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_std_float32</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_float32x</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_std_float64</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_float64x</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_std_float128</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@mfp8</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@scalable_vector_count</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_fp16</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_std_bfloat16</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@complex_std_float16</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@pointer</k>
-            <v>451499</v>
+            <v>450228</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>691560</v>
+            <v>685493</v>
         </e>
         <e>
             <k>@array</k>
-            <v>90100</v>
+            <v>89824</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>679857</v>
+            <v>673499</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>964973</v>
+            <v>957919</v>
         </e>
         <e>
             <k>@gnu_vector</k>
-            <v>673</v>
+            <v>671</v>
         </e>
         <e>
             <k>@routinereference</k>
-            <v>372</v>
+            <v>368</v>
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>290338</v>
+            <v>287560</v>
         </e>
         <e>
             <k>@block</k>
@@ -404,17 +404,13 @@
             <k>@scalable_vector</k>
             <v>1</v>
         </e>
-        <e>
-            <k>@decltype</k>
-            <v>101757</v>
-        </e>
         <e>
             <k>@typeof</k>
             <v>811</v>
         </e>
         <e>
             <k>@underlying_type</k>
-            <v>622</v>
+            <v>615</v>
         </e>
         <e>
             <k>@bases</k>
@@ -458,7 +454,7 @@
         </e>
         <e>
             <k>@remove_cv</k>
-            <v>2059</v>
+            <v>2095</v>
         </e>
         <e>
             <k>@remove_cvref</k>
@@ -486,27 +482,31 @@
         </e>
         <e>
             <k>@remove_reference</k>
-            <v>5705</v>
+            <v>5688</v>
+        </e>
+        <e>
+            <k>@decltype</k>
+            <v>101817</v>
         </e>
         <e>
             <k>@struct</k>
-            <v>976600</v>
+            <v>1036640</v>
         </e>
         <e>
             <k>@union</k>
-            <v>20907</v>
+            <v>20794</v>
         </e>
         <e>
             <k>@enum</k>
-            <v>41605</v>
+            <v>41618</v>
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>864421</v>
+            <v>862626</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1755750</v>
+            <v>1757492</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -514,55 +514,55 @@
         </e>
         <e>
             <k>@class</k>
-            <v>324188</v>
+            <v>321398</v>
         </e>
         <e>
             <k>@template_template_parameter</k>
-            <v>6090</v>
+            <v>6070</v>
         </e>
         <e>
             <k>@proxy_class</k>
-            <v>48241</v>
+            <v>50200</v>
         </e>
         <e>
             <k>@scoped_enum</k>
-            <v>11573</v>
+            <v>11443</v>
         </e>
         <e>
             <k>@template_struct</k>
-            <v>211176</v>
+            <v>210479</v>
         </e>
         <e>
             <k>@template_class</k>
-            <v>29245</v>
+            <v>28916</v>
         </e>
         <e>
             <k>@template_union</k>
-            <v>1368</v>
+            <v>1353</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6349611</v>
+            <v>6357829</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5913261</v>
+            <v>5915053</v>
         </e>
         <e>
             <k>@concept_template</k>
-            <v>3603</v>
+            <v>3592</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>600586</v>
+            <v>594974</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>9677</v>
+            <v>9645</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>7715</v>
+            <v>7628</v>
         </e>
         <e>
             <k>@gnuattribute</k>
@@ -570,11 +570,11 @@
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>351940</v>
+            <v>347976</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>330396</v>
+            <v>330496</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -586,15 +586,15 @@
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>16585</v>
+            <v>16429</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71626</v>
+            <v>71243</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
-            <v>1587</v>
+            <v>1582</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -610,35 +610,35 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>473794</v>
+            <v>491402</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>767534</v>
+            <v>759702</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11208578</v>
+            <v>11082335</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>8615</v>
+            <v>8586</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3042471</v>
+            <v>3051489</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13541565</v>
+            <v>13547187</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2245206</v>
+            <v>2245054</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -646,131 +646,131 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>402174</v>
+            <v>401821</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1953951</v>
+            <v>1954545</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4915712</v>
+            <v>4917201</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
-            <v>586594</v>
+            <v>586772</v>
         </e>
         <e>
             <k>@unaryplusexpr</k>
-            <v>4060</v>
+            <v>4109</v>
         </e>
         <e>
             <k>@complementexpr</k>
-            <v>38188</v>
+            <v>38199</v>
         </e>
         <e>
             <k>@notexpr</k>
-            <v>355800</v>
+            <v>355910</v>
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>84573</v>
+            <v>84598</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
-            <v>57400</v>
+            <v>57416</v>
         </e>
         <e>
             <k>@preincrexpr</k>
-            <v>96724</v>
+            <v>96753</v>
         </e>
         <e>
             <k>@predecrexpr</k>
-            <v>35824</v>
+            <v>35835</v>
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>897972</v>
+            <v>898245</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>580447</v>
+            <v>580786</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>466847</v>
+            <v>466989</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>445092</v>
+            <v>445352</v>
         </e>
         <e>
             <k>@divexpr</k>
-            <v>52388</v>
+            <v>52404</v>
         </e>
         <e>
             <k>@remexpr</k>
-            <v>15908</v>
+            <v>15758</v>
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>118632</v>
+            <v>118668</v>
         </e>
         <e>
             <k>@psubexpr</k>
-            <v>68017</v>
+            <v>68038</v>
         </e>
         <e>
             <k>@pdiffexpr</k>
-            <v>43805</v>
+            <v>42943</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>552166</v>
+            <v>552247</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>201276</v>
+            <v>201394</v>
         </e>
         <e>
             <k>@andexpr</k>
-            <v>483235</v>
+            <v>483517</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>193911</v>
+            <v>194025</v>
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>73953</v>
+            <v>73976</v>
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>643440</v>
+            <v>643635</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>411912</v>
+            <v>412038</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>111161</v>
+            <v>111194</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>139443</v>
+            <v>139486</v>
         </e>
         <e>
             <k>@geexpr</k>
-            <v>81360</v>
+            <v>81384</v>
         </e>
         <e>
             <k>@leexpr</k>
-            <v>291944</v>
+            <v>292033</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>1281280</v>
+            <v>1281668</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -778,23 +778,23 @@
         </e>
         <e>
             <k>@assignsubexpr</k>
-            <v>15309</v>
+            <v>15313</v>
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>11140</v>
+            <v>11103</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
-            <v>6807</v>
+            <v>6809</v>
         </e>
         <e>
             <k>@assignremexpr</k>
-            <v>871</v>
+            <v>861</v>
         </e>
         <e>
             <k>@assignlshiftexpr</k>
-            <v>3703</v>
+            <v>3704</v>
         </e>
         <e>
             <k>@assignrshiftexpr</k>
@@ -802,47 +802,47 @@
         </e>
         <e>
             <k>@assignandexpr</k>
-            <v>6528</v>
+            <v>6530</v>
         </e>
         <e>
             <k>@assignorexpr</k>
-            <v>19609</v>
+            <v>19615</v>
         </e>
         <e>
             <k>@assignxorexpr</k>
-            <v>29900</v>
+            <v>29909</v>
         </e>
         <e>
             <k>@assignpaddexpr</k>
-            <v>18630</v>
+            <v>18635</v>
         </e>
         <e>
             <k>@assignpsubexpr</k>
-            <v>1575</v>
+            <v>1576</v>
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>346625</v>
+            <v>346730</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>1103652</v>
+            <v>1103987</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>167881</v>
+            <v>165621</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>435188</v>
+            <v>435320</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>238860</v>
+            <v>260823</v>
         </e>
         <e>
             <k>@vastartexpr</k>
-            <v>4963</v>
+            <v>4962</v>
         </e>
         <e>
             <k>@vaargexpr</k>
@@ -850,79 +850,79 @@
         </e>
         <e>
             <k>@vaendexpr</k>
-            <v>2940</v>
+            <v>2941</v>
         </e>
         <e>
             <k>@vacopyexpr</k>
-            <v>135</v>
+            <v>134</v>
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8255503</v>
+            <v>8258005</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>401408</v>
+            <v>401643</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>49552</v>
+            <v>50293</v>
         </e>
         <e>
             <k>@expr_stmt</k>
-            <v>147518</v>
+            <v>147604</v>
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5725988</v>
+            <v>5708340</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1405528</v>
+            <v>1405954</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
-            <v>148427</v>
+            <v>148514</v>
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>702016</v>
+            <v>702229</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>7991777</v>
+            <v>8052387</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
-            <v>1397523</v>
+            <v>1397524</v>
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6027720</v>
+            <v>6029390</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>980525</v>
+            <v>974928</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>45186</v>
+            <v>44841</v>
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1880002</v>
+            <v>1870000</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2094099</v>
+            <v>2077162</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
-            <v>7784</v>
+            <v>7711</v>
         </e>
         <e>
             <k>@assume</k>
-            <v>4137</v>
+            <v>4136</v>
         </e>
         <e>
             <k>@conjugation</k>
@@ -974,35 +974,35 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1553582</v>
+            <v>1553192</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>45896</v>
+            <v>45504</v>
         </e>
         <e>
             <k>@delete_expr</k>
-            <v>11406</v>
+            <v>11299</v>
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>23817</v>
+            <v>23664</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>407669</v>
+            <v>406399</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>2126</v>
+            <v>2092</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>47589</v>
+            <v>47141</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
-            <v>1726</v>
+            <v>2337</v>
         </e>
         <e>
             <k>@hasassignexpr</k>
@@ -1050,7 +1050,7 @@
         </e>
         <e>
             <k>@isbaseofexpr</k>
-            <v>257</v>
+            <v>256</v>
         </e>
         <e>
             <k>@isclassexpr</k>
@@ -1058,19 +1058,19 @@
         </e>
         <e>
             <k>@isconvtoexpr</k>
-            <v>248</v>
+            <v>246</v>
         </e>
         <e>
             <k>@isemptyexpr</k>
-            <v>8835</v>
+            <v>8736</v>
         </e>
         <e>
             <k>@isenumexpr</k>
-            <v>2986</v>
+            <v>2953</v>
         </e>
         <e>
             <k>@ispodexpr</k>
-            <v>831</v>
+            <v>828</v>
         </e>
         <e>
             <k>@ispolyexpr</k>
@@ -1086,75 +1086,75 @@
         </e>
         <e>
             <k>@hastrivialdestructor</k>
-            <v>2775</v>
+            <v>2749</v>
         </e>
         <e>
             <k>@uuidof</k>
-            <v>26787</v>
+            <v>26780</v>
         </e>
         <e>
             <k>@delete_array_expr</k>
-            <v>1241</v>
+            <v>1237</v>
         </e>
         <e>
             <k>@new_array_expr</k>
-            <v>6632</v>
+            <v>6630</v>
         </e>
         <e>
             <k>@foldexpr</k>
-            <v>1244</v>
+            <v>1261</v>
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>112102</v>
+            <v>111048</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
-            <v>3993</v>
+            <v>3956</v>
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>205713</v>
+            <v>203396</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
-            <v>3609</v>
+            <v>3568</v>
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>39195</v>
+            <v>38826</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
-            <v>3960</v>
+            <v>3922</v>
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39567</v>
+            <v>39195</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>347211</v>
+            <v>347361</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
-            <v>39962</v>
+            <v>39952</v>
         </e>
         <e>
             <k>@const_cast</k>
-            <v>24302</v>
+            <v>24073</v>
         </e>
         <e>
             <k>@dynamic_cast</k>
-            <v>788</v>
+            <v>786</v>
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>18997</v>
+            <v>18992</v>
         </e>
         <e>
             <k>@param_ref</k>
-            <v>162057</v>
+            <v>163499</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1162,7 +1162,7 @@
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
-            <v>3733</v>
+            <v>3691</v>
         </e>
         <e>
             <k>@isdestructibleexpr</k>
@@ -1174,19 +1174,19 @@
         </e>
         <e>
             <k>@istriviallydestructibleexpr</k>
-            <v>995</v>
+            <v>984</v>
         </e>
         <e>
             <k>@istriviallyassignableexpr</k>
-            <v>3733</v>
+            <v>3691</v>
         </e>
         <e>
             <k>@isnothrowassignableexpr</k>
-            <v>5102</v>
+            <v>5044</v>
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>3328</v>
+            <v>3310</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -1194,7 +1194,7 @@
         </e>
         <e>
             <k>@istriviallycopyableexpr</k>
-            <v>1368</v>
+            <v>1353</v>
         </e>
         <e>
             <k>@isliteraltypeexpr</k>
@@ -1214,11 +1214,11 @@
         </e>
         <e>
             <k>@isconstructibleexpr</k>
-            <v>3609</v>
+            <v>3568</v>
         </e>
         <e>
             <k>@isnothrowconstructibleexpr</k>
-            <v>20658</v>
+            <v>20425</v>
         </e>
         <e>
             <k>@hasfinalizerexpr</k>
@@ -1254,11 +1254,11 @@
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>9341</v>
+            <v>9254</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>28017</v>
+            <v>30165</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1266,11 +1266,11 @@
         </e>
         <e>
             <k>@builtinchooseexpr</k>
-            <v>20593</v>
+            <v>20605</v>
         </e>
         <e>
             <k>@builtinaddressof</k>
-            <v>15431</v>
+            <v>15257</v>
         </e>
         <e>
             <k>@vec_fill</k>
@@ -1286,7 +1286,7 @@
         </e>
         <e>
             <k>@spaceshipexpr</k>
-            <v>1308</v>
+            <v>1347</v>
         </e>
         <e>
             <k>@co_await</k>
@@ -1298,7 +1298,7 @@
         </e>
         <e>
             <k>@isassignable</k>
-            <v>407</v>
+            <v>406</v>
         </e>
         <e>
             <k>@isaggregate</k>
@@ -1306,15 +1306,15 @@
         </e>
         <e>
             <k>@hasuniqueobjectrepresentations</k>
-            <v>42</v>
+            <v>64</v>
         </e>
         <e>
             <k>@builtinbitcast</k>
-            <v>248</v>
+            <v>246</v>
         </e>
         <e>
             <k>@builtinshuffle</k>
-            <v>610</v>
+            <v>608</v>
         </e>
         <e>
             <k>@blockassignexpr</k>
@@ -1322,7 +1322,7 @@
         </e>
         <e>
             <k>@issame</k>
-            <v>4526</v>
+            <v>4511</v>
         </e>
         <e>
             <k>@isfunction</k>
@@ -1430,7 +1430,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>844446</v>
+            <v>841815</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1526,23 +1526,23 @@
         </e>
         <e>
             <k>@c11_generic</k>
-            <v>29943</v>
+            <v>29960</v>
         </e>
         <e>
             <k>@requires_expr</k>
-            <v>16452</v>
+            <v>16401</v>
         </e>
         <e>
             <k>@nested_requirement</k>
-            <v>686</v>
+            <v>684</v>
         </e>
         <e>
             <k>@compound_requirement</k>
-            <v>10918</v>
+            <v>10884</v>
         </e>
         <e>
             <k>@concept_id</k>
-            <v>90157</v>
+            <v>90089</v>
         </e>
         <e>
             <k>@isinvocable</k>
@@ -1558,75 +1558,75 @@
         </e>
         <e>
             <k>@lambdacapture</k>
-            <v>31864</v>
+            <v>31856</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2031829</v>
+            <v>2032444</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>990319</v>
+            <v>990619</v>
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>39652</v>
+            <v>39664</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>157265</v>
+            <v>156745</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>77727</v>
+            <v>77471</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1238112</v>
+            <v>1233416</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1724482</v>
+            <v>1700014</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>232290</v>
+            <v>232426</v>
         </e>
         <e>
             <k>@stmt_for</k>
-            <v>84398</v>
+            <v>84423</v>
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>833592</v>
+            <v>830953</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>410607</v>
+            <v>409307</v>
         </e>
         <e>
             <k>@stmt_asm</k>
-            <v>63827</v>
+            <v>63865</v>
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>769985</v>
+            <v>769791</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>428111</v>
+            <v>426756</v>
         </e>
         <e>
             <k>@stmt_continue</k>
-            <v>28094</v>
+            <v>28103</v>
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>137498</v>
+            <v>137464</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26379</v>
+            <v>26287</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1642,19 +1642,19 @@
         </e>
         <e>
             <k>@stmt_assigned_goto</k>
-            <v>12423</v>
+            <v>12426</v>
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>6311</v>
+            <v>6157</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>43224</v>
+            <v>43039</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>105781</v>
+            <v>103482</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1674,55 +1674,55 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>589512</v>
+            <v>582872</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>214386</v>
+            <v>214451</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>160487</v>
+            <v>160536</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>21827</v>
+            <v>21755</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>234336</v>
+            <v>231697</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>886819</v>
+            <v>876831</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>317265</v>
+            <v>316217</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2743342</v>
+            <v>2712444</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>100181</v>
+            <v>99052</v>
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>405204</v>
+            <v>400640</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
-            <v>169</v>
+            <v>167</v>
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>18770</v>
+            <v>18775</v>
         </e>
         <e>
             <k>@ppd_error</k>
-            <v>124</v>
+            <v>123</v>
         </e>
         <e>
             <k>@ppd_objc_import</k>
@@ -1750,7 +1750,7 @@
         </e>
         <e>
             <k>@link_target</k>
-            <v>816</v>
+            <v>817</v>
         </e>
         <e>
             <k>@xmldtd</k>
@@ -1780,11 +1780,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>12591</cardinality>
+            <cardinality>12550</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12591</v>
+                    <v>12550</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1802,7 +1802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12591</v>
+                                    <v>12550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1828,19 +1828,19 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1008084</cardinality>
+            <cardinality>1004756</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12591</v>
+                    <v>12550</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>1462</v>
+                    <v>1457</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29149</v>
+                    <v>29053</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1854,52 +1854,52 @@
                                 <b>
                                     <a>36</a>
                                     <b>42</b>
-                                    <v>999</v>
+                                    <v>996</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>1094</v>
+                                    <v>1090</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>715</v>
+                                    <v>712</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>504</v>
+                                    <v>503</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>51</b>
-                                    <v>946</v>
+                                    <v>943</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>70</b>
-                                    <v>483</v>
+                                    <v>482</v>
                                 </b>
                                 <b>
                                     <a>71</a>
                                     <b>72</b>
-                                    <v>704</v>
+                                    <v>702</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>90</b>
-                                    <v>894</v>
+                                    <v>891</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>96</b>
-                                    <v>389</v>
+                                    <v>387</v>
                                 </b>
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1335</v>
+                                    <v>1331</v>
                                 </b>
                                 <b>
                                     <a>100</a>
@@ -1909,22 +1909,22 @@
                                 <b>
                                     <a>103</a>
                                     <b>104</b>
-                                    <v>1988</v>
+                                    <v>1981</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>119</b>
-                                    <v>1062</v>
+                                    <v>1058</v>
                                 </b>
                                 <b>
                                     <a>120</a>
                                     <b>138</b>
-                                    <v>925</v>
+                                    <v>922</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>140</b>
-                                    <v>452</v>
+                                    <v>450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1940,67 +1940,67 @@
                                 <b>
                                     <a>34</a>
                                     <b>38</b>
-                                    <v>589</v>
+                                    <v>587</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1493</v>
+                                    <v>1488</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>40</b>
-                                    <v>978</v>
+                                    <v>975</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>42</b>
-                                    <v>1083</v>
+                                    <v>1079</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>53</b>
-                                    <v>599</v>
+                                    <v>597</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>54</b>
-                                    <v>704</v>
+                                    <v>702</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>63</b>
-                                    <v>894</v>
+                                    <v>891</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>67</b>
-                                    <v>399</v>
+                                    <v>398</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1399</v>
+                                    <v>1394</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>70</b>
-                                    <v>967</v>
+                                    <v>964</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1399</v>
+                                    <v>1394</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>79</b>
-                                    <v>946</v>
+                                    <v>943</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1125</v>
+                                    <v>1121</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -2021,7 +2021,7 @@
                                 <b>
                                     <a>43</a>
                                     <b>90</b>
-                                    <v>63</v>
+                                    <v>62</v>
                                 </b>
                                 <b>
                                     <a>90</a>
@@ -2031,7 +2031,7 @@
                                 <b>
                                     <a>108</a>
                                     <b>183</b>
-                                    <v>105</v>
+                                    <v>104</v>
                                 </b>
                                 <b>
                                     <a>198</a>
@@ -2041,12 +2041,12 @@
                                 <b>
                                     <a>422</a>
                                     <b>595</b>
-                                    <v>126</v>
+                                    <v>125</v>
                                 </b>
                                 <b>
                                     <a>595</a>
                                     <b>605</b>
-                                    <v>126</v>
+                                    <v>125</v>
                                 </b>
                                 <b>
                                     <a>605</a>
@@ -2066,12 +2066,12 @@
                                 <b>
                                     <a>930</a>
                                     <b>1190</b>
-                                    <v>84</v>
+                                    <v>83</v>
                                 </b>
                                 <b>
                                     <a>1197</a>
                                     <b>1198</b>
-                                    <v>378</v>
+                                    <v>377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2087,7 +2087,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>126</v>
+                                    <v>125</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -2117,12 +2117,12 @@
                                 <b>
                                     <a>22</a>
                                     <b>27</b>
-                                    <v>126</v>
+                                    <v>125</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>29</b>
-                                    <v>84</v>
+                                    <v>83</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -2132,7 +2132,7 @@
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>126</v>
+                                    <v>125</v>
                                 </b>
                                 <b>
                                     <a>45</a>
@@ -2152,7 +2152,7 @@
                                 <b>
                                     <a>171</a>
                                     <b>199</b>
-                                    <v>21</v>
+                                    <v>20</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2168,22 +2168,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13349</v>
+                                    <v>13305</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12633</v>
+                                    <v>12592</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>103</b>
-                                    <v>2188</v>
+                                    <v>2180</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>1198</b>
-                                    <v>978</v>
+                                    <v>975</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2199,17 +2199,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19303</v>
+                                    <v>19239</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8689</v>
+                                    <v>8660</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>62</b>
-                                    <v>1157</v>
+                                    <v>1153</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2219,19 +2219,19 @@
         </relation>
         <relation>
             <name>compilation_expanded_args</name>
-            <cardinality>1008084</cardinality>
+            <cardinality>1004756</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12591</v>
+                    <v>12550</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>1462</v>
+                    <v>1457</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29149</v>
+                    <v>29053</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2245,52 +2245,52 @@
                                 <b>
                                     <a>36</a>
                                     <b>42</b>
-                                    <v>999</v>
+                                    <v>996</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>1094</v>
+                                    <v>1090</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>715</v>
+                                    <v>712</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>504</v>
+                                    <v>503</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>51</b>
-                                    <v>946</v>
+                                    <v>943</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>70</b>
-                                    <v>483</v>
+                                    <v>482</v>
                                 </b>
                                 <b>
                                     <a>71</a>
                                     <b>72</b>
-                                    <v>704</v>
+                                    <v>702</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>90</b>
-                                    <v>894</v>
+                                    <v>891</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>96</b>
-                                    <v>389</v>
+                                    <v>387</v>
                                 </b>
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1335</v>
+                                    <v>1331</v>
                                 </b>
                                 <b>
                                     <a>100</a>
@@ -2300,22 +2300,22 @@
                                 <b>
                                     <a>103</a>
                                     <b>104</b>
-                                    <v>1988</v>
+                                    <v>1981</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>119</b>
-                                    <v>1062</v>
+                                    <v>1058</v>
                                 </b>
                                 <b>
                                     <a>120</a>
                                     <b>138</b>
-                                    <v>925</v>
+                                    <v>922</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>140</b>
-                                    <v>452</v>
+                                    <v>450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2331,67 +2331,67 @@
                                 <b>
                                     <a>34</a>
                                     <b>38</b>
-                                    <v>589</v>
+                                    <v>587</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1493</v>
+                                    <v>1488</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>40</b>
-                                    <v>978</v>
+                                    <v>975</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>42</b>
-                                    <v>1083</v>
+                                    <v>1079</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>53</b>
-                                    <v>599</v>
+                                    <v>597</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>54</b>
-                                    <v>704</v>
+                                    <v>702</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>63</b>
-                                    <v>894</v>
+                                    <v>891</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>67</b>
-                                    <v>399</v>
+                                    <v>398</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1399</v>
+                                    <v>1394</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>70</b>
-                                    <v>967</v>
+                                    <v>964</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1399</v>
+                                    <v>1394</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>79</b>
-                                    <v>946</v>
+                                    <v>943</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1125</v>
+                                    <v>1121</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -2412,7 +2412,7 @@
                                 <b>
                                     <a>43</a>
                                     <b>90</b>
-                                    <v>63</v>
+                                    <v>62</v>
                                 </b>
                                 <b>
                                     <a>90</a>
@@ -2422,7 +2422,7 @@
                                 <b>
                                     <a>108</a>
                                     <b>183</b>
-                                    <v>105</v>
+                                    <v>104</v>
                                 </b>
                                 <b>
                                     <a>198</a>
@@ -2432,12 +2432,12 @@
                                 <b>
                                     <a>422</a>
                                     <b>595</b>
-                                    <v>126</v>
+                                    <v>125</v>
                                 </b>
                                 <b>
                                     <a>595</a>
                                     <b>605</b>
-                                    <v>126</v>
+                                    <v>125</v>
                                 </b>
                                 <b>
                                     <a>605</a>
@@ -2457,12 +2457,12 @@
                                 <b>
                                     <a>930</a>
                                     <b>1190</b>
-                                    <v>84</v>
+                                    <v>83</v>
                                 </b>
                                 <b>
                                     <a>1197</a>
                                     <b>1198</b>
-                                    <v>378</v>
+                                    <v>377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2478,7 +2478,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>126</v>
+                                    <v>125</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -2508,12 +2508,12 @@
                                 <b>
                                     <a>22</a>
                                     <b>27</b>
-                                    <v>126</v>
+                                    <v>125</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>29</b>
-                                    <v>84</v>
+                                    <v>83</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -2523,7 +2523,7 @@
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>126</v>
+                                    <v>125</v>
                                 </b>
                                 <b>
                                     <a>45</a>
@@ -2543,7 +2543,7 @@
                                 <b>
                                     <a>171</a>
                                     <b>199</b>
-                                    <v>21</v>
+                                    <v>20</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2559,22 +2559,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13349</v>
+                                    <v>13305</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12633</v>
+                                    <v>12592</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>103</b>
-                                    <v>2188</v>
+                                    <v>2180</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>1198</b>
-                                    <v>978</v>
+                                    <v>975</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2590,17 +2590,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19303</v>
+                                    <v>19239</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8689</v>
+                                    <v>8660</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>62</b>
-                                    <v>1157</v>
+                                    <v>1153</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2658,19 +2658,19 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>15738</cardinality>
+            <cardinality>15743</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2722</v>
+                    <v>2723</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>4520</v>
+                    <v>4521</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>13668</v>
+                    <v>13673</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2858,7 +2858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12307</v>
+                                    <v>12311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2884,7 +2884,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12525</v>
+                                    <v>12529</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2904,15 +2904,15 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>62953</cardinality>
+            <cardinality>62972</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2722</v>
+                    <v>2723</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>4520</v>
+                    <v>4521</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -2920,7 +2920,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>16990</v>
+                    <v>17867</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2985,7 +2985,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2722</v>
+                                    <v>2723</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3001,47 +3001,52 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>381</v>
+                                    <v>490</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>980</v>
+                                    <v>871</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>9</b>
-                                    <v>217</v>
+                                    <b>7</b>
+                                    <v>163</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>8</a>
                                     <b>10</b>
-                                    <v>163</v>
+                                    <v>217</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>163</v>
+                                    <v>108</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>15</b>
+                                    <b>12</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>20</b>
+                                    <a>14</a>
+                                    <b>18</b>
+                                    <v>163</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>21</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>26</b>
+                                    <a>21</a>
+                                    <b>53</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
-                                    <b>132</b>
-                                    <v>163</v>
+                                    <a>116</a>
+                                    <b>117</b>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3093,7 +3098,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4520</v>
+                                    <v>4521</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3109,47 +3114,47 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>871</v>
+                                    <v>926</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1579</v>
+                                    <v>1470</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>163</v>
+                                    <v>217</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>326</v>
+                                    <v>490</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>435</v>
+                                    <v>326</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>163</v>
+                                    <v>217</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>11</b>
+                                    <b>13</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>30</b>
+                                    <a>17</a>
+                                    <b>46</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>40</a>
-                                    <b>95</b>
-                                    <v>217</v>
+                                    <a>51</a>
+                                    <b>98</b>
+                                    <v>108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3200,13 +3205,13 @@
                                     <v>108</v>
                                 </b>
                                 <b>
-                                    <a>177</a>
-                                    <b>178</b>
+                                    <a>166</a>
+                                    <b>167</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>183</a>
-                                    <b>184</b>
+                                    <a>179</a>
+                                    <b>180</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -3223,22 +3228,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10020</v>
+                                    <v>11548</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3975</v>
+                                    <v>4249</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1906</v>
+                                    <v>1416</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>47</b>
-                                    <v>1089</v>
+                                    <b>45</b>
+                                    <v>653</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3254,27 +3259,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9639</v>
+                                    <v>10949</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3757</v>
+                                    <v>3922</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1579</v>
+                                    <v>1307</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>1143</v>
+                                    <b>9</b>
+                                    <v>1416</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>72</b>
-                                    <v>871</v>
+                                    <a>9</a>
+                                    <b>67</b>
+                                    <v>272</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3290,12 +3295,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13941</v>
+                                    <v>16505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3049</v>
+                                    <v>1361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3305,15 +3310,15 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>504</cardinality>
+            <cardinality>503</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
-                    <v>357</v>
+                    <v>356</v>
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>189</v>
+                    <v>188</v>
                 </e>
                 <e>
                     <k>file_number</k>
@@ -3335,12 +3340,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>210</v>
+                                    <v>209</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>147</v>
+                                    <v>146</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3356,7 +3361,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357</v>
+                                    <v>356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3372,7 +3377,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357</v>
+                                    <v>356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3388,17 +3393,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>105</v>
+                                    <v>104</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>63</v>
+                                    <v>62</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>21</v>
+                                    <v>20</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3414,7 +3419,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189</v>
+                                    <v>188</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3430,17 +3435,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>105</v>
+                                    <v>104</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>63</v>
+                                    <v>62</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>21</v>
+                                    <v>20</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3504,7 +3509,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21</v>
+                                    <v>20</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3535,7 +3540,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21</v>
+                                    <v>20</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -3545,7 +3550,7 @@
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>21</v>
+                                    <v>20</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3571,19 +3576,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12591</cardinality>
+            <cardinality>12550</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12591</v>
+                    <v>12550</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9593</v>
+                    <v>8922</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>210</v>
+                    <v>167</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3597,7 +3602,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12591</v>
+                                    <v>12550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3613,7 +3618,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12591</v>
+                                    <v>12550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3629,17 +3634,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8289</v>
+                                    <v>7161</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>967</v>
+                                    <v>1247</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>33</b>
-                                    <v>336</v>
+                                    <b>31</b>
+                                    <v>513</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3655,12 +3660,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9004</v>
+                                    <v>8261</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>589</v>
+                                    <v>660</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3676,37 +3681,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31</v>
+                                    <v>41</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
+                                    <a>4</a>
+                                    <b>5</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>10</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>20</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -3714,33 +3704,38 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>69</a>
-                                    <b>70</b>
+                                    <a>25</a>
+                                    <b>26</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>182</a>
-                                    <b>183</b>
+                                    <a>28</a>
+                                    <b>29</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>216</a>
-                                    <b>217</b>
+                                    <a>76</a>
+                                    <b>77</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>290</a>
+                                    <b>291</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>288</a>
-                                    <b>289</b>
+                                    <a>350</a>
+                                    <b>351</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>319</a>
-                                    <b>320</b>
+                                    <a>362</a>
+                                    <b>363</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -3757,76 +3752,61 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31</v>
+                                    <v>41</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>21</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>10</v>
+                                    <v>20</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>16</a>
+                                    <b>17</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
+                                    <a>25</a>
+                                    <b>26</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>67</a>
-                                    <b>68</b>
+                                    <a>27</a>
+                                    <b>28</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>163</a>
-                                    <b>164</b>
+                                    <a>71</a>
+                                    <b>72</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>170</a>
-                                    <b>171</b>
+                                    <a>168</a>
+                                    <b>169</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>206</a>
-                                    <b>207</b>
+                                    <a>255</a>
+                                    <b>256</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>240</a>
-                                    <b>241</b>
+                                    <a>302</a>
+                                    <b>303</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -4053,42 +4033,42 @@
         </relation>
         <relation>
             <name>sourceLocationPrefix</name>
-            <cardinality>124</cardinality>
+            <cardinality>123</cardinality>
             <columnsizes>
                 <e>
                     <k>prefix</k>
-                    <v>124</v>
+                    <v>123</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46837435</cardinality>
+            <cardinality>46452143</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46837435</v>
+                    <v>46452143</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>40819</v>
+                    <v>40359</v>
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>7483212</v>
+                    <v>7398928</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
-                    <v>21902</v>
+                    <v>21656</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7484208</v>
+                    <v>7399912</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>53263</v>
+                    <v>52910</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4102,7 +4082,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837435</v>
+                                    <v>46452143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4118,7 +4098,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837435</v>
+                                    <v>46452143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4134,7 +4114,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837435</v>
+                                    <v>46452143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4150,7 +4130,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837435</v>
+                                    <v>46452143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4166,7 +4146,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837435</v>
+                                    <v>46452143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4182,72 +4162,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>15</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>41</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>72</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>114</b>
-                                    <v>3360</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>114</a>
                                     <b>142</b>
-                                    <v>3111</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>143</a>
-                                    <b>211</b>
-                                    <v>3111</v>
+                                    <b>212</b>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>213</a>
                                     <b>307</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>310</a>
-                                    <b>430</b>
-                                    <v>3111</v>
+                                    <b>431</b>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>437</a>
                                     <b>596</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>607</a>
-                                    <b>829</b>
-                                    <v>3111</v>
+                                    <b>846</b>
+                                    <v>3076</v>
                                 </b>
                                 <b>
-                                    <a>839</a>
-                                    <b>1298</b>
-                                    <v>3111</v>
+                                    <a>848</a>
+                                    <b>1304</b>
+                                    <v>3076</v>
                                 </b>
                                 <b>
-                                    <a>1303</a>
+                                    <a>1354</a>
                                     <b>2855</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>3114</a>
                                     <b>30788</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>57880</a>
                                     <b>57881</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4263,67 +4243,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3360</v>
+                                    <v>3322</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>31</b>
-                                    <v>3360</v>
+                                    <v>3322</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>47</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>64</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>84</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>85</a>
                                     <b>115</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>160</b>
-                                    <v>3235</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>206</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>206</a>
                                     <b>291</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>298</a>
                                     <b>388</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>395</a>
                                     <b>527</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>1339</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
-                                    <a>1375</a>
+                                    <a>1385</a>
                                     <b>57764</b>
-                                    <v>2862</v>
+                                    <v>2830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4339,67 +4319,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>3733</v>
+                                    <v>3691</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>3235</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>20</b>
-                                    <v>3235</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>28</b>
-                                    <v>3235</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>36</b>
-                                    <v>3235</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>36</a>
-                                    <b>42</b>
-                                    <v>3111</v>
+                                    <b>43</b>
+                                    <v>3322</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
+                                    <a>43</a>
                                     <b>53</b>
-                                    <v>3360</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>62</b>
-                                    <v>3235</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>62</a>
-                                    <b>81</b>
-                                    <v>3111</v>
+                                    <b>80</b>
+                                    <v>3076</v>
                                 </b>
                                 <b>
-                                    <a>81</a>
+                                    <a>80</a>
                                     <b>95</b>
-                                    <v>3111</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>111</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>112</a>
                                     <b>156</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4415,67 +4395,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3360</v>
+                                    <v>3322</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>31</b>
-                                    <v>3360</v>
+                                    <v>3322</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>46</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>63</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>84</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>114</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>118</a>
                                     <b>160</b>
-                                    <v>3235</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>206</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>207</a>
                                     <b>291</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>300</a>
                                     <b>390</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>395</a>
                                     <b>562</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>564</a>
                                     <b>1350</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
-                                    <a>1420</a>
+                                    <a>1430</a>
                                     <b>57764</b>
-                                    <v>2862</v>
+                                    <v>2830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4491,67 +4471,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>12</b>
-                                    <v>3360</v>
+                                    <v>3322</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>3484</v>
+                                    <v>3445</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>34</b>
-                                    <v>3235</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>42</b>
-                                    <v>3235</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>50</b>
-                                    <v>3235</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>61</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>67</b>
-                                    <v>3235</v>
+                                    <v>3322</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>76</b>
-                                    <v>3484</v>
+                                    <v>3445</v>
                                 </b>
                                 <b>
                                     <a>76</a>
                                     <b>88</b>
-                                    <v>3235</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>89</a>
                                     <b>102</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>116</b>
-                                    <v>3484</v>
+                                    <v>3322</v>
                                 </b>
                                 <b>
                                     <a>116</a>
-                                    <b>133</b>
-                                    <v>3111</v>
+                                    <b>132</b>
+                                    <v>3076</v>
                                 </b>
                                 <b>
-                                    <a>136</a>
-                                    <b>363</b>
-                                    <v>1493</v>
+                                    <a>132</a>
+                                    <b>364</b>
+                                    <v>1599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4567,32 +4547,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4945832</v>
+                                    <v>4890126</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>778674</v>
+                                    <v>769903</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>542719</v>
+                                    <v>536607</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>566862</v>
+                                    <v>559370</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>96</b>
-                                    <v>561387</v>
+                                    <v>554941</v>
                                 </b>
                                 <b>
                                     <a>96</a>
-                                    <b>638</b>
-                                    <v>87736</v>
+                                    <b>639</b>
+                                    <v>87978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4608,27 +4588,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5008056</v>
+                                    <v>4951650</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1216857</v>
+                                    <v>1203151</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>638669</v>
+                                    <v>631107</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>56</b>
-                                    <v>562133</v>
+                                    <v>556171</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>329</b>
-                                    <v>57495</v>
+                                    <v>56847</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4644,27 +4624,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5629552</v>
+                                    <v>5566146</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>483109</v>
+                                    <v>477667</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>577316</v>
+                                    <v>570322</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>564996</v>
+                                    <v>558263</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>94</b>
-                                    <v>228238</v>
+                                    <v>226529</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4680,12 +4660,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7018148</v>
+                                    <v>6938241</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>85</b>
-                                    <v>465064</v>
+                                    <v>460687</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4701,32 +4681,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5014278</v>
+                                    <v>4957802</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>741090</v>
+                                    <v>732743</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>535377</v>
+                                    <v>529347</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>584783</v>
+                                    <v>577458</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>71</b>
-                                    <v>561760</v>
+                                    <v>555925</v>
                                 </b>
                                 <b>
                                     <a>71</a>
-                                    <b>250</b>
-                                    <v>45921</v>
+                                    <b>252</b>
+                                    <v>45650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4742,67 +4722,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>40</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>128</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>129</a>
-                                    <b>253</b>
-                                    <v>1742</v>
+                                    <b>262</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>316</a>
-                                    <b>707</b>
-                                    <v>1742</v>
+                                    <a>317</a>
+                                    <b>717</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>791</a>
-                                    <b>1267</b>
-                                    <v>1742</v>
+                                    <a>799</a>
+                                    <b>1281</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>1280</a>
-                                    <b>1943</b>
-                                    <v>1742</v>
+                                    <a>1287</a>
+                                    <b>1966</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>2016</a>
+                                    <a>2038</a>
                                     <b>2400</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>2483</a>
-                                    <b>3212</b>
-                                    <v>1742</v>
+                                    <a>2484</a>
+                                    <b>3299</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>3264</a>
-                                    <b>8088</b>
-                                    <v>1742</v>
+                                    <a>3311</a>
+                                    <b>8093</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>11053</a>
+                                    <a>11052</a>
                                     <b>121030</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4818,67 +4798,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>19</a>
-                                    <b>43</b>
-                                    <v>1742</v>
+                                    <b>44</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>44</a>
-                                    <b>60</b>
-                                    <v>1742</v>
+                                    <b>61</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>93</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>96</a>
                                     <b>117</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>117</a>
-                                    <b>150</b>
-                                    <v>1742</v>
+                                    <a>118</a>
+                                    <b>151</b>
+                                    <v>1845</v>
                                 </b>
                                 <b>
-                                    <a>150</a>
-                                    <b>169</b>
-                                    <v>1742</v>
+                                    <a>152</a>
+                                    <b>170</b>
+                                    <v>1845</v>
                                 </b>
                                 <b>
-                                    <a>169</a>
-                                    <b>181</b>
-                                    <v>1742</v>
+                                    <a>170</a>
+                                    <b>183</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>182</a>
-                                    <b>217</b>
-                                    <v>1866</v>
+                                    <a>183</a>
+                                    <b>244</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>243</a>
+                                    <a>259</a>
                                     <b>329</b>
-                                    <v>497</v>
+                                    <v>369</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4894,67 +4874,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>36</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>36</a>
-                                    <b>101</b>
-                                    <v>1742</v>
+                                    <b>103</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>108</a>
-                                    <b>218</b>
-                                    <v>1742</v>
+                                    <a>109</a>
+                                    <b>220</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>226</a>
-                                    <b>543</b>
-                                    <v>1742</v>
+                                    <b>548</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>634</a>
-                                    <b>1057</b>
-                                    <v>1742</v>
+                                    <a>640</a>
+                                    <b>1059</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>1074</a>
-                                    <b>1407</b>
-                                    <v>1742</v>
+                                    <a>1078</a>
+                                    <b>1412</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>1408</a>
-                                    <b>1603</b>
-                                    <v>1742</v>
+                                    <a>1417</a>
+                                    <b>1609</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>1611</a>
-                                    <b>1810</b>
-                                    <v>1742</v>
+                                    <a>1625</a>
+                                    <b>1811</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>1835</a>
-                                    <b>3794</b>
-                                    <v>1742</v>
+                                    <b>3793</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>3838</a>
                                     <b>59550</b>
-                                    <v>746</v>
+                                    <v>738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4970,67 +4950,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>36</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>36</a>
-                                    <b>102</b>
-                                    <v>1742</v>
+                                    <b>104</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>109</a>
-                                    <b>219</b>
-                                    <v>1742</v>
+                                    <a>110</a>
+                                    <b>221</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>225</a>
-                                    <b>545</b>
-                                    <v>1742</v>
+                                    <b>550</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>632</a>
-                                    <b>1056</b>
-                                    <v>1742</v>
+                                    <a>638</a>
+                                    <b>1058</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>1076</a>
-                                    <b>1404</b>
-                                    <v>1742</v>
+                                    <a>1080</a>
+                                    <b>1414</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>1417</a>
-                                    <b>1602</b>
-                                    <v>1742</v>
+                                    <a>1420</a>
+                                    <b>1607</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>1610</a>
-                                    <b>1808</b>
-                                    <v>1742</v>
+                                    <a>1624</a>
+                                    <b>1809</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>1836</a>
                                     <b>3771</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>3831</a>
                                     <b>59557</b>
-                                    <v>746</v>
+                                    <v>738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5046,67 +5026,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2115</v>
+                                    <v>2091</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1493</v>
+                                    <v>1476</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1617</v>
+                                    <v>1599</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>23</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>33</b>
-                                    <v>1866</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
+                                    <a>33</a>
                                     <b>44</b>
-                                    <v>1742</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>45</a>
-                                    <b>57</b>
-                                    <v>1742</v>
+                                    <b>58</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>74</b>
-                                    <v>1991</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>74</a>
-                                    <b>86</b>
-                                    <v>1866</v>
+                                    <b>87</b>
+                                    <v>1968</v>
                                 </b>
                                 <b>
-                                    <a>86</a>
+                                    <a>87</a>
                                     <b>99</b>
-                                    <v>1866</v>
+                                    <v>1722</v>
                                 </b>
                                 <b>
                                     <a>100</a>
-                                    <b>259</b>
-                                    <v>1742</v>
+                                    <b>160</b>
+                                    <v>1722</v>
                                 </b>
                                 <b>
-                                    <a>298</a>
+                                    <a>261</a>
                                     <b>299</b>
-                                    <v>124</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5122,32 +5102,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4943591</v>
+                                    <v>4887911</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>782034</v>
+                                    <v>773226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>541973</v>
+                                    <v>535868</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>565493</v>
+                                    <v>558263</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>95</b>
-                                    <v>562382</v>
+                                    <b>94</b>
+                                    <v>555187</v>
                                 </b>
                                 <b>
-                                    <a>95</a>
-                                    <b>621</b>
-                                    <v>88731</v>
+                                    <a>94</a>
+                                    <b>622</b>
+                                    <v>89455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5163,27 +5143,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5005069</v>
+                                    <v>4948697</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1220466</v>
+                                    <v>1206720</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>631078</v>
+                                    <v>623601</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>51</b>
-                                    <v>562009</v>
+                                    <v>556048</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>329</b>
-                                    <v>65584</v>
+                                    <v>64845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5199,12 +5179,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7035322</v>
+                                    <v>6955098</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>448885</v>
+                                    <v>444814</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5220,27 +5200,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628183</v>
+                                    <v>5564792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>481615</v>
+                                    <v>476191</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>581547</v>
+                                    <v>574382</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>568356</v>
+                                    <v>561093</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>89</b>
-                                    <v>224505</v>
+                                    <v>223453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5256,32 +5236,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5012785</v>
+                                    <v>4956325</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>746317</v>
+                                    <v>737911</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>533759</v>
+                                    <v>527747</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>586774</v>
+                                    <v>579304</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>561636</v>
+                                    <v>555679</v>
                                 </b>
                                 <b>
                                     <a>72</a>
-                                    <b>250</b>
-                                    <v>42934</v>
+                                    <b>252</b>
+                                    <v>42943</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5297,52 +5277,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15680</v>
+                                    <v>15626</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5600</v>
+                                    <v>5414</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>4231</v>
+                                    <b>6</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>17</b>
-                                    <v>4106</v>
+                                    <a>6</a>
+                                    <b>16</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>33</b>
-                                    <v>4106</v>
+                                    <a>16</a>
+                                    <b>31</b>
+                                    <v>4183</v>
                                 </b>
                                 <b>
-                                    <a>33</a>
-                                    <b>106</b>
-                                    <v>4106</v>
+                                    <a>31</a>
+                                    <b>93</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>114</a>
-                                    <b>689</b>
-                                    <v>4106</v>
+                                    <a>96</a>
+                                    <b>660</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>722</a>
-                                    <b>2461</b>
-                                    <v>4106</v>
+                                    <a>661</a>
+                                    <b>2409</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>2595</a>
-                                    <b>4749</b>
-                                    <v>4106</v>
+                                    <a>2461</a>
+                                    <b>4698</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>4759</a>
+                                    <a>4717</a>
                                     <b>33780</b>
-                                    <v>3111</v>
+                                    <v>3322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5358,52 +5338,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18542</v>
+                                    <v>18210</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5600</v>
+                                    <v>5660</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3609</v>
+                                    <v>3691</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>3733</v>
+                                    <b>8</b>
+                                    <v>4306</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>16</b>
-                                    <v>4231</v>
+                                    <a>8</a>
+                                    <b>17</b>
+                                    <v>4183</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>75</b>
-                                    <v>4106</v>
+                                    <a>17</a>
+                                    <b>84</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>79</a>
-                                    <b>142</b>
-                                    <v>4106</v>
+                                    <a>88</a>
+                                    <b>160</b>
+                                    <v>4183</v>
                                 </b>
                                 <b>
-                                    <a>151</a>
-                                    <b>208</b>
-                                    <v>4106</v>
+                                    <a>160</a>
+                                    <b>214</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>210</a>
-                                    <b>262</b>
-                                    <v>4231</v>
+                                    <a>215</a>
+                                    <b>267</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>262</a>
+                                    <a>267</a>
                                     <b>329</b>
-                                    <v>995</v>
+                                    <v>492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5419,52 +5399,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15929</v>
+                                    <v>15873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5973</v>
+                                    <v>5783</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>4231</v>
+                                    <b>7</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
+                                    <a>7</a>
                                     <b>18</b>
-                                    <v>4355</v>
+                                    <v>4429</v>
                                 </b>
                                 <b>
                                     <a>18</a>
-                                    <b>40</b>
-                                    <v>4106</v>
+                                    <b>39</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>41</a>
-                                    <b>217</b>
-                                    <v>4106</v>
+                                    <a>39</a>
+                                    <b>155</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>235</a>
-                                    <b>758</b>
-                                    <v>4106</v>
+                                    <a>187</a>
+                                    <b>643</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>768</a>
-                                    <b>2172</b>
-                                    <v>4106</v>
+                                    <a>746</a>
+                                    <b>2054</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>2206</a>
-                                    <b>2884</b>
-                                    <v>4106</v>
+                                    <a>2170</a>
+                                    <b>2875</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>2887</a>
+                                    <a>2880</a>
                                     <b>30763</b>
-                                    <v>2240</v>
+                                    <v>2460</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5480,52 +5460,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17173</v>
+                                    <v>16857</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6222</v>
+                                    <v>6398</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3235</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>4231</v>
+                                    <v>4060</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>14</b>
-                                    <v>4231</v>
+                                    <b>13</b>
+                                    <v>4183</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
+                                    <a>13</a>
                                     <b>28</b>
-                                    <v>4480</v>
+                                    <v>4675</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>46</b>
-                                    <v>4106</v>
+                                    <v>4060</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>70</b>
-                                    <v>4106</v>
+                                    <v>4060</v>
                                 </b>
                                 <b>
                                     <a>70</a>
-                                    <b>82</b>
-                                    <v>4231</v>
+                                    <b>83</b>
+                                    <v>4306</v>
                                 </b>
                                 <b>
-                                    <a>82</a>
+                                    <a>83</a>
                                     <b>117</b>
-                                    <v>1244</v>
+                                    <v>1107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5541,52 +5521,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15929</v>
+                                    <v>15873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5973</v>
+                                    <v>5783</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>4231</v>
+                                    <b>7</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>18</b>
-                                    <v>4355</v>
+                                    <a>7</a>
+                                    <b>17</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>40</b>
-                                    <v>4106</v>
+                                    <a>17</a>
+                                    <b>30</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>40</a>
-                                    <b>216</b>
-                                    <v>4106</v>
+                                    <a>32</a>
+                                    <b>100</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>233</a>
-                                    <b>755</b>
-                                    <v>4106</v>
+                                    <a>104</a>
+                                    <b>621</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>769</a>
-                                    <b>2172</b>
-                                    <v>4106</v>
+                                    <a>628</a>
+                                    <b>1958</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>2206</a>
-                                    <b>2862</b>
-                                    <v>4106</v>
+                                    <a>1966</a>
+                                    <b>2836</b>
+                                    <v>4060</v>
                                 </b>
                                 <b>
-                                    <a>2864</a>
+                                    <a>2841</a>
                                     <b>30757</b>
-                                    <v>2240</v>
+                                    <v>2830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5596,15 +5576,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>64946</cardinality>
+            <cardinality>64732</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>64946</v>
+                    <v>64732</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>64946</v>
+                    <v>64732</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5618,7 +5598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64946</v>
+                                    <v>64732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5634,7 +5614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64946</v>
+                                    <v>64732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5644,15 +5624,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>12339</cardinality>
+            <cardinality>12298</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12339</v>
+                    <v>12298</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>12339</v>
+                    <v>12298</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5666,7 +5646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12339</v>
+                                    <v>12298</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5682,7 +5662,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12339</v>
+                                    <v>12298</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5692,15 +5672,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>77264</cardinality>
+            <cardinality>77009</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>12339</v>
+                    <v>12298</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>77264</v>
+                    <v>77009</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5714,37 +5694,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6006</v>
+                                    <v>5986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1514</v>
+                                    <v>1509</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>662</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>999</v>
+                                    <v>996</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>967</v>
+                                    <v>964</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>999</v>
+                                    <v>996</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>44</b>
-                                    <v>925</v>
+                                    <v>922</v>
                                 </b>
                                 <b>
                                     <a>44</a>
@@ -5765,7 +5745,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77264</v>
+                                    <v>77009</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5775,23 +5755,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>805928</cardinality>
+            <cardinality>796112</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>804808</v>
+                    <v>795005</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>39325</v>
+                    <v>38882</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>33974</v>
+                    <v>33591</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>18293</v>
+                    <v>18087</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5805,12 +5785,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>803688</v>
+                                    <v>793898</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1120</v>
+                                    <v>1107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5826,12 +5806,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>803688</v>
+                                    <v>793898</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1120</v>
+                                    <v>1107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5847,12 +5827,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>804559</v>
+                                    <v>794759</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5868,27 +5848,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26631</v>
+                                    <v>26332</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3733</v>
+                                    <v>3691</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3360</v>
+                                    <v>3322</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>35</b>
-                                    <v>2986</v>
+                                    <v>2953</v>
                                 </b>
                                 <b>
                                     <a>39</a>
-                                    <b>1983</b>
-                                    <v>2613</v>
+                                    <b>1981</b>
+                                    <v>2583</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5904,27 +5884,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27129</v>
+                                    <v>26824</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4106</v>
+                                    <v>4060</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2488</v>
+                                    <v>2460</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>3484</v>
+                                    <v>3445</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>2115</v>
+                                    <v>2091</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5940,27 +5920,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26756</v>
+                                    <v>26455</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4106</v>
+                                    <v>4060</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2364</v>
+                                    <v>2337</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>3235</v>
+                                    <v>3199</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>2862</v>
+                                    <v>2830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5976,32 +5956,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21778</v>
+                                    <v>21533</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3609</v>
+                                    <v>3568</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2364</v>
+                                    <v>2337</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>13</b>
-                                    <v>2862</v>
+                                    <b>12</b>
+                                    <v>2583</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>198</b>
-                                    <v>2613</v>
+                                    <a>12</a>
+                                    <b>157</b>
+                                    <v>2583</v>
                                 </b>
                                 <b>
-                                    <a>204</a>
-                                    <b>2092</b>
-                                    <v>746</v>
+                                    <a>172</a>
+                                    <b>2090</b>
+                                    <v>984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6017,32 +5997,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22151</v>
+                                    <v>21902</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3609</v>
+                                    <v>3568</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2115</v>
+                                    <v>2091</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>2737</v>
+                                    <v>2707</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>1493</v>
+                                    <v>1476</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6058,27 +6038,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21902</v>
+                                    <v>21656</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4231</v>
+                                    <v>4183</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2862</v>
+                                    <v>2830</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3111</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6094,32 +6074,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11324</v>
+                                    <v>11197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1120</v>
+                                    <v>1107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1493</v>
+                                    <v>1476</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>22</b>
-                                    <v>1493</v>
+                                    <v>1476</v>
                                 </b>
                                 <b>
                                     <a>42</a>
-                                    <b>3651</b>
-                                    <v>871</v>
+                                    <b>3648</b>
+                                    <v>861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6135,32 +6115,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11324</v>
+                                    <v>11197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1120</v>
+                                    <v>1107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1617</v>
+                                    <v>1599</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>27</b>
-                                    <v>1493</v>
+                                    <v>1476</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>48</b>
-                                    <v>746</v>
+                                    <v>738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6176,32 +6156,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11324</v>
+                                    <v>11197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1368</v>
+                                    <v>1353</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>1493</v>
+                                    <v>1476</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>31</b>
-                                    <v>1493</v>
+                                    <v>1476</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>42</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6211,15 +6191,15 @@
         </relation>
         <relation>
             <name>diagnostics</name>
-            <cardinality>357</cardinality>
+            <cardinality>356</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>357</v>
+                    <v>356</v>
                 </e>
                 <e>
                     <k>severity</k>
-                    <v>21</v>
+                    <v>20</v>
                 </e>
                 <e>
                     <k>error_tag</k>
@@ -6227,7 +6207,7 @@
                 </e>
                 <e>
                     <k>error_message</k>
-                    <v>147</v>
+                    <v>146</v>
                 </e>
                 <e>
                     <k>full_error_message</k>
@@ -6249,7 +6229,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357</v>
+                                    <v>356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6265,7 +6245,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357</v>
+                                    <v>356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6281,7 +6261,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357</v>
+                                    <v>356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6297,7 +6277,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357</v>
+                                    <v>356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6313,7 +6293,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357</v>
+                                    <v>356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6434,7 +6414,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42</v>
+                                    <v>41</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6559,7 +6539,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105</v>
+                                    <v>104</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6585,7 +6565,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147</v>
+                                    <v>146</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6601,7 +6581,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147</v>
+                                    <v>146</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6659,7 +6639,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>168</v>
+                                    <v>167</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -6744,7 +6724,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>168</v>
+                                    <v>167</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -6823,15 +6803,15 @@
         </relation>
         <relation>
             <name>extractor_version</name>
-            <cardinality>124</cardinality>
+            <cardinality>123</cardinality>
             <columnsizes>
                 <e>
                     <k>codeql_version</k>
-                    <v>124</v>
+                    <v>123</v>
                 </e>
                 <e>
                     <k>frontend_version</k>
-                    <v>124</v>
+                    <v>123</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -6845,7 +6825,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6861,7 +6841,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7159,7 +7139,7 @@
         </relation>
         <relation>
             <name>pch_uses</name>
-            <cardinality>4121</cardinality>
+            <cardinality>4120</cardinality>
             <columnsizes>
                 <e>
                     <k>pch</k>
@@ -7167,11 +7147,11 @@
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>4121</v>
+                    <v>4120</v>
                 </e>
                 <e>
                     <k>id</k>
-                    <v>4121</v>
+                    <v>4120</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7367,7 +7347,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4121</v>
+                                    <v>4120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7383,7 +7363,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4121</v>
+                                    <v>4120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7399,7 +7379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4121</v>
+                                    <v>4120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7415,7 +7395,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4121</v>
+                                    <v>4120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7425,19 +7405,19 @@
         </relation>
         <relation>
             <name>pch_creations</name>
-            <cardinality>248</cardinality>
+            <cardinality>246</cardinality>
             <columnsizes>
                 <e>
                     <k>pch</k>
-                    <v>248</v>
+                    <v>246</v>
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>248</v>
+                    <v>246</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>248</v>
+                    <v>246</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7451,7 +7431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7467,7 +7447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7483,7 +7463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7499,7 +7479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7515,7 +7495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7531,7 +7511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7541,23 +7521,23 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4183417</cardinality>
+            <cardinality>4169606</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5743</v>
+                    <v>5724</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>21</v>
+                    <v>20</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58477</v>
+                    <v>58284</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>39353</v>
+                    <v>39223</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7576,7 +7556,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5543</v>
+                                    <v>5525</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7592,57 +7572,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>86</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>88</a>
                                     <b>206</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>212</a>
                                     <b>291</b>
-                                    <v>441</v>
+                                    <v>440</v>
                                 </b>
                                 <b>
                                     <a>291</a>
                                     <b>359</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>362</a>
                                     <b>401</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>402</a>
                                     <b>479</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>480</a>
                                     <b>549</b>
-                                    <v>252</v>
+                                    <v>251</v>
                                 </b>
                                 <b>
                                     <a>550</a>
                                     <b>551</b>
-                                    <v>1325</v>
+                                    <v>1321</v>
                                 </b>
                                 <b>
                                     <a>553</a>
                                     <b>628</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>631</a>
                                     <b>753</b>
-                                    <v>452</v>
+                                    <v>450</v>
                                 </b>
                                 <b>
                                     <a>753</a>
                                     <b>1231</b>
-                                    <v>441</v>
+                                    <v>440</v>
                                 </b>
                                 <b>
                                     <a>1234</a>
@@ -7663,67 +7643,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>98</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>244</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>244</a>
                                     <b>351</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>352</a>
                                     <b>434</b>
-                                    <v>441</v>
+                                    <v>440</v>
                                 </b>
                                 <b>
                                     <a>434</a>
                                     <b>490</b>
-                                    <v>441</v>
+                                    <v>440</v>
                                 </b>
                                 <b>
                                     <a>490</a>
                                     <b>628</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>632</a>
                                     <b>702</b>
-                                    <v>63</v>
+                                    <v>62</v>
                                 </b>
                                 <b>
                                     <a>706</a>
                                     <b>707</b>
-                                    <v>1325</v>
+                                    <v>1321</v>
                                 </b>
                                 <b>
                                     <a>710</a>
                                     <b>939</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>939</a>
                                     <b>1038</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>1066</a>
                                     <b>1853</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>1853</a>
                                     <b>3292</b>
-                                    <v>431</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>3423</a>
                                     <b>3742</b>
-                                    <v>21</v>
+                                    <v>20</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7802,62 +7782,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10982</v>
+                                    <v>10945</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4344</v>
+                                    <v>4330</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>5038</v>
+                                    <v>5022</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>4081</v>
+                                    <v>4068</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>4575</v>
+                                    <v>4560</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>4312</v>
+                                    <v>4298</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>19</b>
-                                    <v>4870</v>
+                                    <v>4854</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>27</b>
-                                    <v>4239</v>
+                                    <v>4225</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>47</b>
-                                    <v>4817</v>
+                                    <v>4801</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>128</b>
-                                    <v>4902</v>
+                                    <v>4885</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>459</b>
-                                    <v>4607</v>
+                                    <v>4592</v>
                                 </b>
                                 <b>
                                     <a>459</a>
                                     <b>546</b>
-                                    <v>1704</v>
+                                    <v>1698</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7873,7 +7853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58477</v>
+                                    <v>58284</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7889,57 +7869,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11539</v>
+                                    <v>11501</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7658</v>
+                                    <v>7632</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4081</v>
+                                    <v>4068</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4049</v>
+                                    <v>4036</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>3408</v>
+                                    <v>3397</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>4723</v>
+                                    <v>4707</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>5375</v>
+                                    <v>5357</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>23</b>
-                                    <v>4681</v>
+                                    <v>4665</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>41</b>
-                                    <v>4660</v>
+                                    <v>4644</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>4449</v>
+                                    <v>4435</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>1726</b>
-                                    <v>3850</v>
+                                    <v>3837</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7955,72 +7935,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3345</v>
+                                    <v>3334</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1630</v>
+                                    <v>1625</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3176</v>
+                                    <v>3166</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>2451</v>
+                                    <v>2442</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>2955</v>
+                                    <v>2946</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>1925</v>
+                                    <v>1918</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3029</v>
+                                    <v>3019</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>51</b>
-                                    <v>3523</v>
+                                    <v>3512</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>58</b>
-                                    <v>3019</v>
+                                    <v>3009</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>80</b>
-                                    <v>2966</v>
+                                    <v>2956</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>151</b>
-                                    <v>3071</v>
+                                    <v>3061</v>
                                 </b>
                                 <b>
                                     <a>151</a>
                                     <b>334</b>
-                                    <v>2966</v>
+                                    <v>2956</v>
                                 </b>
                                 <b>
                                     <a>334</a>
                                     <b>473</b>
-                                    <v>2987</v>
+                                    <v>2977</v>
                                 </b>
                                 <b>
                                     <a>473</a>
                                     <b>547</b>
-                                    <v>2303</v>
+                                    <v>2296</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8036,7 +8016,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39342</v>
+                                    <v>39212</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8057,67 +8037,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3387</v>
+                                    <v>3376</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1904</v>
+                                    <v>1897</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3040</v>
+                                    <v>3030</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>2472</v>
+                                    <v>2463</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>3471</v>
+                                    <v>3459</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>3439</v>
+                                    <v>3428</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>28</b>
-                                    <v>3187</v>
+                                    <v>3176</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>3134</v>
+                                    <v>3124</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>3187</v>
+                                    <v>3176</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>66</b>
-                                    <v>2976</v>
+                                    <v>2967</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>92</b>
-                                    <v>3061</v>
+                                    <v>3051</v>
                                 </b>
                                 <b>
                                     <a>92</a>
                                     <b>113</b>
-                                    <v>2976</v>
+                                    <v>2967</v>
                                 </b>
                                 <b>
                                     <a>113</a>
                                     <b>145</b>
-                                    <v>3019</v>
+                                    <v>3009</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -8132,15 +8112,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>150011437</cardinality>
+            <cardinality>150057030</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24673503</v>
+                    <v>24680985</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3705721</v>
+                    <v>3706846</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8154,37 +8134,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>2209722</v>
+                                    <v>2210373</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1475129</v>
+                                    <v>1475577</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1620535</v>
+                                    <v>1621028</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6583220</v>
+                                    <v>6585222</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8719894</v>
+                                    <v>8722546</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3557413</v>
+                                    <v>3558495</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>22</b>
-                                    <v>507586</v>
+                                    <v>507741</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8200,57 +8180,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>531761</v>
+                                    <v>531923</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>743309</v>
+                                    <v>743535</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>481562</v>
+                                    <v>481708</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>275331</v>
+                                    <v>275415</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>282181</v>
+                                    <v>282267</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>330280</v>
+                                    <v>330381</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3046</v>
+                                    <v>3047</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>444696</v>
+                                    <v>444831</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>307830</v>
+                                    <v>307921</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>281784</v>
+                                    <v>281870</v>
                                 </b>
                                 <b>
                                     <a>423</a>
                                     <b>7616</b>
-                                    <v>23937</v>
+                                    <v>23944</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8260,15 +8240,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48740838</cardinality>
+            <cardinality>48755653</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7045464</v>
+                    <v>7047601</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3803511</v>
+                    <v>3804666</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8282,37 +8262,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3847105</v>
+                                    <v>3848269</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>766383</v>
+                                    <v>766616</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>361878</v>
+                                    <v>361989</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>772815</v>
+                                    <v>773050</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>535215</v>
+                                    <v>535377</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>556324</v>
+                                    <v>556493</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>9900</b>
-                                    <v>205740</v>
+                                    <v>205803</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8328,67 +8308,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>313280</v>
+                                    <v>313374</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>316640</v>
+                                    <v>316736</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>301118</v>
+                                    <v>301210</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>342974</v>
+                                    <v>343078</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>456051</v>
+                                    <v>456190</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>226122</v>
+                                    <v>226191</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>408080</v>
+                                    <v>408204</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>166446</v>
+                                    <v>166496</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>377716</v>
+                                    <v>377831</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>200657</v>
+                                    <v>200718</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>344291</v>
+                                    <v>344395</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>25</b>
-                                    <v>285422</v>
+                                    <v>285509</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>207</b>
-                                    <v>64709</v>
+                                    <v>64728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8398,19 +8378,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40391183</cardinality>
+            <cardinality>40403426</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40391183</v>
+                    <v>40403426</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>182706</v>
+                    <v>182761</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5926766</v>
+                    <v>5928563</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -8428,7 +8408,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40391183</v>
+                                    <v>40403426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8444,7 +8424,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40391183</v>
+                                    <v>40403426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8460,7 +8440,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40391183</v>
+                                    <v>40403426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8476,47 +8456,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61156</v>
+                                    <v>61174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27664</v>
+                                    <v>27673</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18080</v>
+                                    <v>18085</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10020</v>
+                                    <v>10023</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>13832</v>
+                                    <v>13836</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>14703</v>
+                                    <v>14708</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>33</b>
-                                    <v>13723</v>
+                                    <v>13727</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>182</b>
-                                    <v>13723</v>
+                                    <v>13727</v>
                                 </b>
                                 <b>
                                     <a>186</a>
                                     <b>72214</b>
-                                    <v>9802</v>
+                                    <v>9805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8532,42 +8512,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77765</v>
+                                    <v>77789</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30659</v>
+                                    <v>30669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>14376</v>
+                                    <v>14381</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10292</v>
+                                    <v>10295</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>14050</v>
+                                    <v>14054</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>14213</v>
+                                    <v>14217</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>90</b>
-                                    <v>13723</v>
+                                    <v>13727</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>12207</b>
-                                    <v>7624</v>
+                                    <v>7626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8583,12 +8563,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178186</v>
+                                    <v>178240</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4520</v>
+                                    <v>4521</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8604,17 +8584,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5262706</v>
+                                    <v>5264301</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>429618</v>
+                                    <v>429748</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72214</b>
-                                    <v>234441</v>
+                                    <v>234512</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8630,12 +8610,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5904602</v>
+                                    <v>5906392</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>37</b>
-                                    <v>22164</v>
+                                    <v>22171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8651,7 +8631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5926766</v>
+                                    <v>5928563</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8724,15 +8704,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33686920</cardinality>
+            <cardinality>33697131</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33686920</v>
+                    <v>33697131</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15942726</v>
+                    <v>15947558</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8746,7 +8726,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33686920</v>
+                                    <v>33697131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8762,27 +8742,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7816185</v>
+                                    <v>7818554</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1595835</v>
+                                    <v>1596319</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4707507</v>
+                                    <v>4708934</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1297133</v>
+                                    <v>1297526</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>205</b>
-                                    <v>526063</v>
+                                    <v>526223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8792,15 +8772,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6023015</cardinality>
+            <cardinality>6005902</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4209042</v>
+                    <v>4197329</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2272308</v>
+                    <v>2266082</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8814,27 +8794,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3285657</v>
+                                    <v>3276557</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>489010</v>
+                                    <v>487596</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8601</v>
+                                    <v>8638</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>412624</v>
+                                    <v>411558</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>13149</v>
+                                    <v>12979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8850,27 +8830,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1332170</v>
+                                    <v>1328930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>481395</v>
+                                    <v>479769</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7786</v>
+                                    <v>7804</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>426910</v>
+                                    <v>425585</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>522</b>
-                                    <v>24046</v>
+                                    <v>23991</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8880,19 +8860,19 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>82169670</cardinality>
+            <cardinality>81891296</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26181901</v>
+                    <v>26088765</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>694</v>
+                    <v>691</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>341869</v>
+                    <v>340741</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8906,22 +8886,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9643301</v>
+                                    <v>9605164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9733558</v>
+                                    <v>9701025</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4982534</v>
+                                    <v>4966085</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1822507</v>
+                                    <v>1816490</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8937,22 +8917,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9825192</v>
+                                    <v>9786454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9751073</v>
+                                    <v>9718482</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4826468</v>
+                                    <v>4810534</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1779167</v>
+                                    <v>1773293</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8968,7 +8948,7 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>610</v>
+                                    <v>608</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
@@ -8977,7 +8957,7 @@
                                 </b>
                                 <b>
                                     <a>646904</a>
-                                    <b>2488917</b>
+                                    <b>2488278</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -8994,7 +8974,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>610</v>
+                                    <v>608</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -9020,57 +9000,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39542</v>
+                                    <v>39411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>62074</v>
+                                    <v>61870</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20933</v>
+                                    <v>20854</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34440</v>
+                                    <v>34452</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39090</v>
+                                    <v>38961</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>30748</v>
+                                    <v>30531</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>28875</v>
+                                    <v>28780</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>25772</v>
+                                    <v>25687</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>27024</v>
+                                    <v>26935</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>25909</v>
+                                    <v>25823</v>
                                 </b>
                                 <b>
                                     <a>518</a>
-                                    <b>486643</b>
-                                    <v>7458</v>
+                                    <b>486640</b>
+                                    <v>7433</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9086,17 +9066,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>242188</v>
+                                    <v>241388</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89509</v>
+                                    <v>89214</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10172</v>
+                                    <v>10138</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9106,19 +9086,19 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>82169670</cardinality>
+            <cardinality>81891296</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26181901</v>
+                    <v>26088765</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>694</v>
+                    <v>691</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>207053</v>
+                    <v>206369</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9132,22 +9112,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9643301</v>
+                                    <v>9605164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9733558</v>
+                                    <v>9701025</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4982534</v>
+                                    <v>4966085</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1822507</v>
+                                    <v>1816490</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9163,22 +9143,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12591079</v>
+                                    <v>12543042</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8396184</v>
+                                    <v>8368235</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4208285</v>
+                                    <v>4194392</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>986351</v>
+                                    <v>983095</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9194,7 +9174,7 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>610</v>
+                                    <v>608</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
@@ -9203,7 +9183,7 @@
                                 </b>
                                 <b>
                                     <a>646904</a>
-                                    <b>2488917</b>
+                                    <b>2488278</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -9220,7 +9200,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599</v>
+                                    <v>597</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9230,7 +9210,7 @@
                                 <b>
                                     <a>950</a>
                                     <b>16173</b>
-                                    <v>42</v>
+                                    <v>41</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9246,57 +9226,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21743</v>
+                                    <v>21671</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26750</v>
+                                    <v>26662</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43297</v>
+                                    <v>43144</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15842</v>
+                                    <v>15915</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3250</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>18324</v>
+                                    <v>18148</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>18882</v>
+                                    <v>18819</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>18251</v>
+                                    <v>18190</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15694</v>
+                                    <v>15643</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>251</b>
-                                    <v>15547</v>
+                                    <v>15496</v>
                                 </b>
                                 <b>
                                     <a>251</a>
-                                    <b>1169648</b>
-                                    <v>9467</v>
+                                    <b>1169057</b>
+                                    <v>9436</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9312,17 +9292,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104625</v>
+                                    <v>104280</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>88552</v>
+                                    <v>88259</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>13875</v>
+                                    <v>13829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9332,19 +9312,19 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4043207</cardinality>
+            <cardinality>3995453</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4043207</v>
+                    <v>3995453</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1689263</v>
+                    <v>1670237</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>871</v>
+                    <v>861</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9358,7 +9338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4043207</v>
+                                    <v>3995453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9374,7 +9354,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4043207</v>
+                                    <v>3995453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9390,17 +9370,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1441362</v>
+                                    <v>1425128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>140377</v>
+                                    <v>138796</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>107523</v>
+                                    <v>106312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9416,12 +9396,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1686401</v>
+                                    <v>1667407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2862</v>
+                                    <v>2830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9437,37 +9417,37 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>48</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>83</a>
                                     <b>84</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>691</a>
                                     <b>692</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>4456</a>
                                     <b>4457</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>5230</a>
-                                    <b>5231</b>
-                                    <v>124</v>
+                                    <a>5226</a>
+                                    <b>5227</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>21974</a>
-                                    <b>21975</b>
-                                    <v>124</v>
+                                    <a>21960</a>
+                                    <b>21961</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9483,37 +9463,37 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>42</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>302</a>
                                     <b>303</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>504</a>
                                     <b>505</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>12687</a>
                                     <b>12688</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9523,26 +9503,26 @@
         </relation>
         <relation>
             <name>builtin_functions</name>
-            <cardinality>30800</cardinality>
+            <cardinality>30699</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30800</v>
+                    <v>30699</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1134663</cardinality>
+            <cardinality>1123627</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1130940</v>
+                    <v>1120308</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1134663</v>
+                    <v>1123627</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9556,12 +9536,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1127758</v>
+                                    <v>1117525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>3181</v>
+                                    <v>2782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9577,7 +9557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1134663</v>
+                                    <v>1123627</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9587,15 +9567,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4060505</cardinality>
+            <cardinality>4012556</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4043207</v>
+                    <v>3995453</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>617762</v>
+                    <v>610312</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9609,12 +9589,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4025908</v>
+                                    <v>3978349</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17298</v>
+                                    <v>17103</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9630,27 +9610,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>309005</v>
+                                    <v>305402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>213180</v>
+                                    <v>210533</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48037</v>
+                                    <v>47496</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>365</b>
-                                    <v>46419</v>
+                                    <v>45773</v>
                                 </b>
                                 <b>
                                     <a>432</a>
-                                    <b>9958</b>
-                                    <v>1120</v>
+                                    <b>9957</b>
+                                    <v>1107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9930,59 +9910,59 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>131903</cardinality>
+            <cardinality>131870</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>131903</v>
+                    <v>131870</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>87797</cardinality>
+            <cardinality>87523</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>87797</v>
+                    <v>87523</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>51524</cardinality>
+            <cardinality>51363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51524</v>
+                    <v>51363</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4041713</cardinality>
+            <cardinality>3993976</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4041713</v>
+                    <v>3993976</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>deduction_guide_for_class</name>
-            <cardinality>5849</cardinality>
+            <cardinality>5783</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5849</v>
+                    <v>5783</v>
                 </e>
                 <e>
                     <k>class_template</k>
-                    <v>2240</v>
+                    <v>2214</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9996,7 +9976,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5849</v>
+                                    <v>5783</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10012,32 +9992,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1120</v>
+                                    <v>1107</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373</v>
+                                    <v>369</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10047,15 +10027,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>672519</cardinality>
+            <cardinality>664083</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>672519</v>
+                    <v>664083</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>175596</v>
+                    <v>173496</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10069,7 +10049,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>672519</v>
+                                    <v>664083</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10085,37 +10065,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47041</v>
+                                    <v>46634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36836</v>
+                                    <v>36421</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32605</v>
+                                    <v>31992</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>20036</v>
+                                    <v>19810</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>12818</v>
+                                    <v>12673</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>14436</v>
+                                    <v>14396</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>11822</v>
+                                    <v>11566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10125,27 +10105,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4199390</cardinality>
+            <cardinality>4150246</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4193416</v>
+                    <v>4144339</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4018690</v>
+                    <v>3971090</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>609797</v>
+                    <v>602560</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1687770</v>
+                    <v>1668760</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2806438</v>
+                    <v>2774828</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10159,7 +10139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193416</v>
+                                    <v>4144339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10175,12 +10155,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4187442</v>
+                                    <v>4138433</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5973</v>
+                                    <v>5906</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10196,7 +10176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193416</v>
+                                    <v>4144339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10212,7 +10192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193416</v>
+                                    <v>4144339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10228,12 +10208,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3858525</v>
+                                    <v>3812236</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>160165</v>
+                                    <v>158853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10249,12 +10229,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4000396</v>
+                                    <v>3953002</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18293</v>
+                                    <v>18087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10270,7 +10250,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4018690</v>
+                                    <v>3971090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10286,12 +10266,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3878437</v>
+                                    <v>3832416</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>140253</v>
+                                    <v>138673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10307,27 +10287,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>294445</v>
+                                    <v>291128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>220024</v>
+                                    <v>217177</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48286</v>
+                                    <v>47865</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>364</b>
-                                    <v>45797</v>
+                                    <b>365</b>
+                                    <v>45281</v>
                                 </b>
                                 <b>
-                                    <a>364</a>
-                                    <b>10294</b>
-                                    <v>1244</v>
+                                    <a>463</a>
+                                    <b>10297</b>
+                                    <v>1107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10343,27 +10323,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>304401</v>
+                                    <v>300972</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211313</v>
+                                    <v>208564</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48037</v>
+                                    <v>47619</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>1163</b>
-                                    <v>45797</v>
+                                    <b>1479</b>
+                                    <v>45281</v>
                                 </b>
                                 <b>
-                                    <a>1485</a>
-                                    <b>9907</b>
-                                    <v>248</v>
+                                    <a>9905</a>
+                                    <b>9906</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10379,22 +10359,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>490327</v>
+                                    <v>484558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52766</v>
+                                    <v>52048</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>50028</v>
+                                    <v>49464</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2238</b>
-                                    <v>16676</v>
+                                    <v>16488</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10410,22 +10390,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>453863</v>
+                                    <v>448505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69317</v>
+                                    <v>68414</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>55877</v>
+                                    <v>55248</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4756</b>
-                                    <v>30738</v>
+                                    <v>30392</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10441,22 +10421,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1328363</v>
+                                    <v>1313155</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>193392</v>
+                                    <v>191460</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>129550</v>
+                                    <v>128091</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3169</b>
-                                    <v>36463</v>
+                                    <v>36052</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10472,17 +10452,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1440864</v>
+                                    <v>1424636</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>140875</v>
+                                    <v>139289</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>106030</v>
+                                    <v>104835</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10498,12 +10478,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1598167</v>
+                                    <v>1580167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1596</b>
-                                    <v>89602</v>
+                                    <v>88593</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10519,17 +10499,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1363955</v>
+                                    <v>1348593</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>207828</v>
+                                    <v>205488</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1592</b>
-                                    <v>115985</v>
+                                    <v>114679</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10545,17 +10525,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2413305</v>
+                                    <v>2387600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>252008</v>
+                                    <v>247816</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>141124</v>
+                                    <v>139412</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10571,17 +10551,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2431972</v>
+                                    <v>2406057</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>233838</v>
+                                    <v>229851</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>140626</v>
+                                    <v>138919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10597,12 +10577,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2692318</v>
+                                    <v>2662241</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>211</b>
-                                    <v>114119</v>
+                                    <v>112587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10618,12 +10598,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2767361</v>
+                                    <v>2736192</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>39076</v>
+                                    <v>38636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10633,22 +10613,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1418837</cardinality>
+            <cardinality>1400518</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1418837</v>
+                    <v>1400518</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>7911</cardinality>
+            <cardinality>7909</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7911</v>
+                    <v>7909</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10666,15 +10646,15 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4269578</cardinality>
+            <cardinality>4221244</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1744270</v>
+                    <v>1724378</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1368</v>
+                    <v>1353</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10688,22 +10668,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>362269</v>
+                                    <v>357943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>261590</v>
+                                    <v>258644</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1097511</v>
+                                    <v>1085149</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>22898</v>
+                                    <v>22640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10719,57 +10699,57 @@
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>20</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>224</a>
-                                    <b>225</b>
-                                    <v>124</v>
+                                    <a>222</a>
+                                    <b>223</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>261</a>
                                     <b>262</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>562</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>826</a>
                                     <b>827</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1034</a>
                                     <b>1035</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1093</a>
                                     <b>1094</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>8148</a>
                                     <b>8149</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>11028</a>
                                     <b>11029</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>11099</a>
                                     <b>11100</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10900,26 +10880,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>421590</cardinality>
+            <cardinality>421484</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>421590</v>
+                    <v>421484</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>140906</cardinality>
+            <cardinality>139581</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>140906</v>
+                    <v>139581</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>140466</v>
+                    <v>139145</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10933,7 +10913,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140906</v>
+                                    <v>139581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10949,12 +10929,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140026</v>
+                                    <v>138709</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>440</v>
+                                    <v>435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10964,11 +10944,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1160855</cardinality>
+            <cardinality>1147042</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1160855</v>
+                    <v>1147042</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -11073,11 +11053,11 @@
         </relation>
         <relation>
             <name>fun_requires</name>
-            <cardinality>29022</cardinality>
+            <cardinality>28932</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10081</v>
+                    <v>10050</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -11085,7 +11065,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>28786</v>
+                    <v>28696</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11099,7 +11079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10017</v>
+                                    <v>9986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11120,27 +11100,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7250</v>
+                                    <v>7227</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>493</v>
+                                    <v>491</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>858</v>
+                                    <v>855</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>321</v>
+                                    <v>320</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>1136</v>
+                                    <v>1133</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -11203,7 +11183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28550</v>
+                                    <v>28461</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11224,7 +11204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28786</v>
+                                    <v>28696</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11234,19 +11214,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7294672</cardinality>
+            <cardinality>7208821</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7294672</v>
+                    <v>7208821</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7964</v>
+                    <v>7874</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3524008</v>
+                    <v>3482840</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11260,7 +11240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7294672</v>
+                                    <v>7208821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11276,7 +11256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7294672</v>
+                                    <v>7208821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11292,32 +11272,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3982</v>
+                                    <v>3937</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>147</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16218</b>
-                                    <v>622</v>
+                                    <b>16206</b>
+                                    <v>615</v>
                                 </b>
                                 <b>
-                                    <a>28317</a>
-                                    <b>28318</b>
-                                    <v>124</v>
+                                    <a>28305</a>
+                                    <b>28306</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11333,32 +11313,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3982</v>
+                                    <v>3937</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>147</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16218</b>
-                                    <v>622</v>
+                                    <b>16206</b>
+                                    <v>615</v>
                                 </b>
                                 <b>
-                                    <a>28317</a>
-                                    <b>28318</b>
-                                    <v>124</v>
+                                    <a>28305</a>
+                                    <b>28306</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11374,27 +11354,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1505826</v>
+                                    <v>1488866</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>973933</v>
+                                    <v>961980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>600712</v>
+                                    <v>593700</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>290089</v>
+                                    <v>286576</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>153444</v>
+                                    <v>151716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11410,27 +11390,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1505826</v>
+                                    <v>1488866</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>973933</v>
+                                    <v>961980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>600712</v>
+                                    <v>593700</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>290089</v>
+                                    <v>286576</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>153444</v>
+                                    <v>151716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11440,27 +11420,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9374456</cardinality>
+            <cardinality>9438060</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9367984</v>
+                    <v>9431661</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9027369</v>
+                    <v>9094636</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1452936</v>
+                    <v>1436079</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>850481</v>
+                    <v>840901</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6259510</v>
+                    <v>6190362</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11474,7 +11454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9367984</v>
+                                    <v>9431661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11490,12 +11470,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9361513</v>
+                                    <v>9425263</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6471</v>
+                                    <v>6398</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11511,7 +11491,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9367984</v>
+                                    <v>9431661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11527,7 +11507,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9367984</v>
+                                    <v>9431661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11543,12 +11523,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8704176</v>
+                                    <v>8774837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>323192</v>
+                                    <v>319798</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11564,12 +11544,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8974354</v>
+                                    <v>9042218</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53015</v>
+                                    <v>52417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11585,12 +11565,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8922210</v>
+                                    <v>8990662</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>105158</v>
+                                    <v>103974</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11606,12 +11586,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8783076</v>
+                                    <v>8853095</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>244292</v>
+                                    <v>241540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11627,27 +11607,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847867</v>
+                                    <v>839056</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>283244</v>
+                                    <v>279685</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>127186</v>
+                                    <v>125138</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>112874</v>
+                                    <v>111357</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2949</b>
-                                    <v>81762</v>
+                                    <b>2963</b>
+                                    <v>80841</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11663,27 +11643,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>868526</v>
+                                    <v>859482</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>268435</v>
+                                    <v>265042</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>122581</v>
+                                    <v>120585</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>112501</v>
+                                    <v>110988</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2872</b>
-                                    <v>80891</v>
+                                    <b>2886</b>
+                                    <v>79980</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11699,22 +11679,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1116800</v>
+                                    <v>1104222</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>192148</v>
+                                    <v>189861</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>114990</v>
+                                    <v>113326</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1038</b>
-                                    <v>28996</v>
+                                    <v>28669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11730,27 +11710,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>983018</v>
+                                    <v>971823</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>218531</v>
+                                    <v>216070</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>133284</v>
+                                    <v>131660</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>95</b>
-                                    <v>109016</v>
+                                    <b>98</b>
+                                    <v>107789</v>
                                 </b>
                                 <b>
-                                    <a>97</a>
+                                    <a>99</a>
                                     <b>2622</b>
-                                    <v>9084</v>
+                                    <v>8736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11766,32 +11746,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>464690</v>
+                                    <v>458595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>164894</v>
+                                    <v>162052</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>59361</v>
+                                    <v>59431</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>66206</v>
+                                    <v>64968</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>25</b>
-                                    <v>64090</v>
+                                    <b>24</b>
+                                    <v>63492</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>27137</b>
-                                    <v>31236</v>
+                                    <a>24</a>
+                                    <b>27139</b>
+                                    <v>32361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11807,32 +11787,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>475766</v>
+                                    <v>469546</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>164894</v>
+                                    <v>162052</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>55130</v>
+                                    <v>55248</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>72180</v>
+                                    <v>71367</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>44</b>
-                                    <v>63842</v>
+                                    <v>63861</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>26704</b>
-                                    <v>18667</v>
+                                    <v>18826</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11848,22 +11828,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>653105</v>
+                                    <v>644273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>110510</v>
+                                    <v>111111</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>65335</v>
+                                    <v>64230</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3463</b>
-                                    <v>21529</v>
+                                    <v>21287</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11879,27 +11859,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492442</v>
+                                    <v>485911</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>182939</v>
+                                    <v>181371</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>51521</v>
+                                    <v>51433</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>64837</v>
+                                    <v>64107</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>22619</b>
-                                    <v>58739</v>
+                                    <v>58078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11915,17 +11895,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5758605</v>
+                                    <v>5693745</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>470788</v>
+                                    <v>467947</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>2941</b>
-                                    <v>30116</v>
+                                    <b>2943</b>
+                                    <v>28669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11941,12 +11921,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5839247</v>
+                                    <v>5773479</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>420262</v>
+                                    <v>416882</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11962,12 +11942,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5961705</v>
+                                    <v>5895911</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2555</b>
-                                    <v>297805</v>
+                                    <v>294451</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11983,12 +11963,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6247189</v>
+                                    <v>6178180</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>12320</v>
+                                    <v>12181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11998,37 +11978,37 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3763198</cardinality>
+            <cardinality>3716014</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3763198</v>
+                    <v>3716014</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_specialized</name>
-            <cardinality>643</cardinality>
+            <cardinality>641</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>643</v>
+                    <v>641</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>488709</cardinality>
+            <cardinality>482712</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>488709</v>
+                    <v>482712</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>497</v>
+                    <v>492</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12042,7 +12022,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>488709</v>
+                                    <v>482712</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12058,22 +12038,22 @@
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>77</a>
                                     <b>78</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>653</a>
                                     <b>654</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>3181</a>
-                                    <b>3182</b>
-                                    <v>124</v>
+                                    <a>3177</a>
+                                    <b>3178</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12083,18 +12063,18 @@
         </relation>
         <relation>
             <name>is_structured_binding</name>
-            <cardinality>943</cardinality>
+            <cardinality>940</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>943</v>
+                    <v>940</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_requires</name>
-            <cardinality>386</cardinality>
+            <cardinality>384</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12102,7 +12082,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>386</v>
+                    <v>384</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12142,7 +12122,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>386</v>
+                                    <v>384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12152,19 +12132,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1629528</cardinality>
+            <cardinality>1610928</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1629528</v>
+                    <v>1610928</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1610612</v>
+                    <v>1592225</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1543659</v>
+                    <v>1526272</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12178,7 +12158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1629528</v>
+                                    <v>1610928</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12194,7 +12174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1629528</v>
+                                    <v>1610928</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12210,12 +12190,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1594309</v>
+                                    <v>1576106</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>16302</v>
+                                    <v>16119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12231,12 +12211,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1594434</v>
+                                    <v>1576229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>16178</v>
+                                    <v>15996</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12252,12 +12232,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1521631</v>
+                                    <v>1504493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>64</b>
-                                    <v>22027</v>
+                                    <v>21779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12273,12 +12253,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1521756</v>
+                                    <v>1504616</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>64</b>
-                                    <v>21902</v>
+                                    <v>21656</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12288,37 +12268,37 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1092906</cardinality>
+            <cardinality>1080351</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1092906</v>
+                    <v>1080351</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>676476</cardinality>
+            <cardinality>676681</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>676476</v>
+                    <v>676681</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_requires</name>
-            <cardinality>7657</cardinality>
+            <cardinality>7634</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2037</v>
+                    <v>2031</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>7636</v>
+                    <v>7612</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12332,17 +12312,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1008</v>
+                                    <v>1005</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>107</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>600</v>
+                                    <v>598</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12352,7 +12332,7 @@
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>150</v>
+                                    <v>149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12368,7 +12348,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7614</v>
+                                    <v>7591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12383,23 +12363,23 @@
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>408755</cardinality>
+            <cardinality>408652</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>408755</v>
+                    <v>408652</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
-                    <v>1838</v>
+                    <v>1837</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>408755</v>
+                    <v>408652</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>408755</v>
+                    <v>408652</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12413,7 +12393,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408755</v>
+                                    <v>408652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12429,7 +12409,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408755</v>
+                                    <v>408652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12445,7 +12425,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408755</v>
+                                    <v>408652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12659,7 +12639,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408755</v>
+                                    <v>408652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12675,7 +12655,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408755</v>
+                                    <v>408652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12691,7 +12671,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408755</v>
+                                    <v>408652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12707,7 +12687,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408755</v>
+                                    <v>408652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12723,7 +12703,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408755</v>
+                                    <v>408652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12739,7 +12719,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408755</v>
+                                    <v>408652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12749,23 +12729,23 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>270979</cardinality>
+            <cardinality>270032</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>270979</v>
+                    <v>270032</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>58813</v>
+                    <v>58567</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>26740</v>
+                    <v>26652</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>21</v>
+                    <v>20</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12779,7 +12759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270979</v>
+                                    <v>270032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12795,7 +12775,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270979</v>
+                                    <v>270032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12811,7 +12791,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270979</v>
+                                    <v>270032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12827,17 +12807,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51113</v>
+                                    <v>50892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5364</v>
+                                    <v>5347</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>134</b>
-                                    <v>2335</v>
+                                    <v>2327</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12853,17 +12833,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51113</v>
+                                    <v>50892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5364</v>
+                                    <v>5347</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>134</b>
-                                    <v>2335</v>
+                                    <v>2327</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12879,7 +12859,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58813</v>
+                                    <v>58567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12895,22 +12875,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21091</v>
+                                    <v>21021</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2293</v>
+                                    <v>2285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1935</v>
+                                    <v>1929</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>367</b>
-                                    <v>1420</v>
+                                    <b>366</b>
+                                    <v>1415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12926,22 +12906,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21091</v>
+                                    <v>21021</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2293</v>
+                                    <v>2285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1935</v>
+                                    <v>1929</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>367</b>
-                                    <v>1420</v>
+                                    <b>366</b>
+                                    <v>1415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12957,7 +12937,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26740</v>
+                                    <v>26652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12976,8 +12956,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>25367</a>
-                                    <b>25368</b>
+                                    <a>25362</a>
+                                    <b>25363</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -12997,8 +12977,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5377</a>
-                                    <b>5378</b>
+                                    <a>5372</a>
+                                    <b>5373</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -13030,15 +13010,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>577799</cardinality>
+            <cardinality>575839</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>21806</v>
+                    <v>21734</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>270979</v>
+                    <v>270032</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13052,42 +13032,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10330</v>
+                                    <v>10295</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1609</v>
+                                    <v>1604</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>1851</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2282</v>
+                                    <v>2275</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>28</b>
-                                    <v>1662</v>
+                                    <v>1656</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>136</b>
-                                    <v>778</v>
+                                    <v>775</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>2608</v>
+                                    <v>2600</v>
                                 </b>
                                 <b>
                                     <a>146</a>
                                     <b>437</b>
-                                    <v>683</v>
+                                    <v>681</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13103,27 +13083,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96210</v>
+                                    <v>95840</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>119794</v>
+                                    <v>119399</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20018</v>
+                                    <v>19952</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26603</v>
+                                    <v>26515</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>8352</v>
+                                    <v>8324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13133,27 +13113,27 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>172739</cardinality>
+            <cardinality>172696</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>172739</v>
+                    <v>172696</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>172739</v>
+                    <v>172696</v>
                 </e>
                 <e>
                     <k>message</k>
-                    <v>38650</v>
+                    <v>38640</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>22584</v>
+                    <v>22578</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>6810</v>
+                    <v>6808</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13167,7 +13147,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172739</v>
+                                    <v>172696</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13183,7 +13163,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172739</v>
+                                    <v>172696</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13199,7 +13179,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172739</v>
+                                    <v>172696</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13215,7 +13195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172739</v>
+                                    <v>172696</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13231,7 +13211,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172739</v>
+                                    <v>172696</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13247,7 +13227,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172739</v>
+                                    <v>172696</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13263,7 +13243,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172739</v>
+                                    <v>172696</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13279,7 +13259,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172739</v>
+                                    <v>172696</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13295,7 +13275,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28414</v>
+                                    <v>28407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13305,17 +13285,17 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3619</v>
+                                    <v>3618</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>2081</v>
+                                    <v>2080</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>3125</v>
+                                    <v>3124</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -13336,7 +13316,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28414</v>
+                                    <v>28407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13346,17 +13326,17 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3619</v>
+                                    <v>3618</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>2081</v>
+                                    <v>2080</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>3125</v>
+                                    <v>3124</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -13377,12 +13357,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35816</v>
+                                    <v>35807</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>33</b>
-                                    <v>2834</v>
+                                    <v>2833</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13398,7 +13378,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30220</v>
+                                    <v>30212</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13408,7 +13388,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3384</v>
+                                    <v>3383</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13434,17 +13414,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4267</v>
+                                    <v>4266</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3716</v>
+                                    <v>3715</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1741</v>
+                                    <v>1740</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13454,7 +13434,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4720</v>
+                                    <v>4719</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -13474,12 +13454,12 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4380</v>
+                                    <v>4379</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>52</b>
-                                    <v>502</v>
+                                    <v>501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13495,17 +13475,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4267</v>
+                                    <v>4266</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3716</v>
+                                    <v>3715</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1741</v>
+                                    <v>1740</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13515,7 +13495,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4720</v>
+                                    <v>4719</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -13535,12 +13515,12 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4380</v>
+                                    <v>4379</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>52</b>
-                                    <v>502</v>
+                                    <v>501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13556,17 +13536,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6939</v>
+                                    <v>6937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7652</v>
+                                    <v>7650</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7757</v>
+                                    <v>7755</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13587,12 +13567,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5052</v>
+                                    <v>5051</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8073</v>
+                                    <v>8071</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13602,7 +13582,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4745</v>
+                                    <v>4744</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -13633,7 +13613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5708</v>
+                                    <v>5707</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13664,7 +13644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5708</v>
+                                    <v>5707</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13695,7 +13675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5862</v>
+                                    <v>5861</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13721,7 +13701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5846</v>
+                                    <v>5845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13741,23 +13721,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>7052247</cardinality>
+            <cardinality>6969125</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7011801</v>
+                    <v>6929135</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3400306</v>
+                    <v>3360408</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7964</v>
+                    <v>7874</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1217355</v>
+                    <v>1203274</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13771,7 +13751,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7011801</v>
+                                    <v>6929135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13787,7 +13767,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7011801</v>
+                                    <v>6929135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13803,12 +13783,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6971355</v>
+                                    <v>6889145</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>40445</v>
+                                    <v>39990</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13824,27 +13804,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1470856</v>
+                                    <v>1454044</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>924776</v>
+                                    <v>913499</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>578187</v>
+                                    <v>571429</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>280506</v>
+                                    <v>277101</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>145978</v>
+                                    <v>144333</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13860,27 +13840,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1470856</v>
+                                    <v>1454044</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>924776</v>
+                                    <v>913499</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>578187</v>
+                                    <v>571429</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>280506</v>
+                                    <v>277101</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>145978</v>
+                                    <v>144333</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13896,22 +13876,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1778617</v>
+                                    <v>1757600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1029313</v>
+                                    <v>1017228</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>437436</v>
+                                    <v>432386</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>154938</v>
+                                    <v>153193</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13927,32 +13907,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3982</v>
+                                    <v>3937</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>138</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>322</a>
-                                    <b>15505</b>
-                                    <v>622</v>
+                                    <b>15494</b>
+                                    <v>615</v>
                                 </b>
                                 <b>
-                                    <a>27323</a>
-                                    <b>27324</b>
-                                    <v>124</v>
+                                    <a>27310</a>
+                                    <b>27311</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13968,32 +13948,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3982</v>
+                                    <v>3937</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>138</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>322</a>
-                                    <b>15505</b>
-                                    <v>622</v>
+                                    <b>15494</b>
+                                    <v>615</v>
                                 </b>
                                 <b>
-                                    <a>27323</a>
-                                    <b>27324</b>
-                                    <v>124</v>
+                                    <a>27310</a>
+                                    <b>27311</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14009,32 +13989,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3982</v>
+                                    <v>3937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>55</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>116</a>
-                                    <b>2703</b>
-                                    <v>622</v>
+                                    <b>2700</b>
+                                    <v>615</v>
                                 </b>
                                 <b>
-                                    <a>7497</a>
-                                    <b>7498</b>
-                                    <v>124</v>
+                                    <a>7494</a>
+                                    <b>7495</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14050,27 +14030,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>735615</v>
+                                    <v>728068</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>239687</v>
+                                    <v>236495</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>93087</v>
+                                    <v>91669</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>93709</v>
+                                    <v>92408</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>2574</b>
-                                    <v>55255</v>
+                                    <v>54632</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14086,27 +14066,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>817502</v>
+                                    <v>809278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>179081</v>
+                                    <v>175833</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>106154</v>
+                                    <v>104958</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>27</b>
-                                    <v>91967</v>
+                                    <v>90808</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>2562</b>
-                                    <v>22649</v>
+                                    <v>22394</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14122,17 +14102,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>992725</v>
+                                    <v>981544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>166387</v>
+                                    <v>164267</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>65</b>
-                                    <v>58241</v>
+                                    <v>57462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14142,15 +14122,15 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>159143</cardinality>
+            <cardinality>159103</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>150374</v>
+                    <v>150336</v>
                 </e>
                 <e>
                     <k>old</k>
-                    <v>17798</v>
+                    <v>17794</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14164,12 +14144,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>141612</v>
+                                    <v>141576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>8761</v>
+                                    <v>8759</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14185,12 +14165,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9684</v>
+                                    <v>9682</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2405</v>
+                                    <v>2404</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14205,12 +14185,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>17</b>
-                                    <v>1336</v>
+                                    <v>1335</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>230</b>
-                                    <v>1247</v>
+                                    <v>1246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14220,19 +14200,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1505217</cardinality>
+            <cardinality>1505673</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1502766</v>
+                    <v>1503222</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>457991</v>
+                    <v>458130</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>644237</v>
+                    <v>644432</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14246,12 +14226,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1500425</v>
+                                    <v>1500880</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2341</v>
+                                    <v>2342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14267,7 +14247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1502766</v>
+                                    <v>1503222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14283,22 +14263,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>339817</v>
+                                    <v>339920</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>72592</v>
+                                    <v>72614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>35397</v>
+                                    <v>35408</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>4445</b>
-                                    <v>10183</v>
+                                    <v>10186</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14314,17 +14294,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357407</v>
+                                    <v>357515</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64750</v>
+                                    <v>64770</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>57</b>
-                                    <v>34362</v>
+                                    <v>34373</v>
                                 </b>
                                 <b>
                                     <a>60</a>
@@ -14345,22 +14325,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>423356</v>
+                                    <v>423484</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>122584</v>
+                                    <v>122621</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>58106</v>
+                                    <v>58124</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>664</b>
-                                    <v>40189</v>
+                                    <v>40202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14376,17 +14356,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>526390</v>
+                                    <v>526550</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>73300</v>
+                                    <v>73322</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>668</b>
-                                    <v>44546</v>
+                                    <v>44560</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14396,19 +14376,19 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>492567</cardinality>
+            <cardinality>662484</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>492567</v>
+                    <v>662484</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>10329</v>
+                    <v>10212</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>112252</v>
+                    <v>110988</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14422,7 +14402,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492567</v>
+                                    <v>662484</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14438,7 +14418,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492567</v>
+                                    <v>662484</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14454,32 +14434,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6969</v>
+                                    <v>6890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373</v>
+                                    <v>369</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>746</v>
+                                    <v>738</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>20</b>
-                                    <v>871</v>
+                                    <v>861</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>80</b>
-                                    <v>871</v>
+                                    <v>861</v>
                                 </b>
                                 <b>
                                     <a>152</a>
-                                    <b>2216</b>
-                                    <v>497</v>
+                                    <b>2369</b>
+                                    <v>492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14495,32 +14475,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7093</v>
+                                    <v>7013</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373</v>
+                                    <v>369</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>746</v>
+                                    <v>738</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>20</b>
-                                    <v>746</v>
+                                    <v>738</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>74</b>
-                                    <v>871</v>
+                                    <v>861</v>
                                 </b>
                                 <b>
-                                    <a>125</a>
+                                    <a>137</a>
                                     <b>228</b>
-                                    <v>497</v>
+                                    <v>492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14536,17 +14516,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>94954</v>
+                                    <v>92900</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>7</b>
-                                    <v>8835</v>
+                                    <b>8</b>
+                                    <v>9351</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>604</b>
-                                    <v>8462</v>
+                                    <a>8</a>
+                                    <b>139</b>
+                                    <v>8367</v>
+                                </b>
+                                <b>
+                                    <a>181</a>
+                                    <b>1156</b>
+                                    <v>369</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14562,17 +14547,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96696</v>
+                                    <v>94130</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15307</v>
+                                    <v>16611</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14582,19 +14567,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>724688</cardinality>
+            <cardinality>724508</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>724688</v>
+                    <v>724508</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53301</v>
+                    <v>53305</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>101408</v>
+                    <v>101431</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14608,7 +14593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724688</v>
+                                    <v>724508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14624,7 +14609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724688</v>
+                                    <v>724508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14640,37 +14625,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28793</v>
+                                    <v>28819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7806</v>
+                                    <v>7799</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4020</v>
+                                    <v>4033</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4060</v>
+                                    <v>4057</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>4128</v>
+                                    <v>4105</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>162</b>
-                                    <v>4000</v>
+                                    <b>163</b>
+                                    <v>4001</v>
                                 </b>
                                 <b>
-                                    <a>162</a>
+                                    <a>164</a>
                                     <b>19347</b>
-                                    <v>491</v>
+                                    <v>487</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14686,22 +14671,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38252</v>
+                                    <v>38253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6704</v>
+                                    <v>6705</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4468</v>
+                                    <v>4469</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>3509</b>
-                                    <v>3877</v>
+                                    <v>3878</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14717,32 +14702,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62401</v>
+                                    <v>62415</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16003</v>
+                                    <v>16007</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6516</v>
+                                    <v>6525</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>8129</v>
+                                    <v>8139</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>134</b>
-                                    <v>7606</v>
+                                    <b>137</b>
+                                    <v>7616</v>
                                 </b>
                                 <b>
-                                    <a>134</a>
-                                    <b>7549</b>
-                                    <v>750</v>
+                                    <a>137</a>
+                                    <b>7546</b>
+                                    <v>726</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14758,17 +14743,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84398</v>
+                                    <v>84417</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8393</v>
+                                    <v>8395</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>7666</v>
+                                    <v>7668</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -14783,15 +14768,15 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>228611</cardinality>
+            <cardinality>224437</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>228611</v>
+                    <v>224437</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
-                    <v>622</v>
+                    <v>615</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14805,7 +14790,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>228611</v>
+                                    <v>224437</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14821,27 +14806,27 @@
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>80</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>454</a>
-                                    <b>455</b>
-                                    <v>124</v>
+                                    <a>450</a>
+                                    <b>451</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>530</a>
-                                    <b>531</b>
-                                    <v>124</v>
+                                    <a>527</a>
+                                    <b>528</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>736</a>
-                                    <b>737</b>
-                                    <v>124</v>
+                                    <a>730</a>
+                                    <b>731</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14851,15 +14836,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>44035</cardinality>
+            <cardinality>43621</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>44035</v>
+                    <v>43621</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>40786</v>
+                    <v>40402</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14873,7 +14858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44035</v>
+                                    <v>43621</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14889,12 +14874,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39939</v>
+                                    <v>39564</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>47</b>
-                                    <v>846</v>
+                                    <v>838</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14904,19 +14889,19 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>348040</cardinality>
+            <cardinality>348146</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>348040</v>
+                    <v>348146</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41605</v>
+                    <v>41618</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>13941</v>
+                    <v>13945</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -14924,11 +14909,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>347659</v>
+                    <v>347764</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>320648</v>
+                    <v>320745</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14942,7 +14927,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348040</v>
+                                    <v>348146</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14958,7 +14943,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348040</v>
+                                    <v>348146</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14974,7 +14959,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348040</v>
+                                    <v>348146</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14990,7 +14975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348040</v>
+                                    <v>348146</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15006,7 +14991,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348040</v>
+                                    <v>348146</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15022,57 +15007,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1524</v>
+                                    <v>1525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5826</v>
+                                    <v>5828</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8713</v>
+                                    <v>8715</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5554</v>
+                                    <v>5556</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4574</v>
+                                    <v>4575</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2559</v>
+                                    <v>2560</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1960</v>
+                                    <v>1961</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2995</v>
+                                    <v>2996</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3430</v>
+                                    <v>3431</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>33</b>
-                                    <v>3158</v>
+                                    <v>3159</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1306</v>
+                                    <v>1307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15088,57 +15073,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1524</v>
+                                    <v>1525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5826</v>
+                                    <v>5828</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8713</v>
+                                    <v>8715</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5554</v>
+                                    <v>5556</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4574</v>
+                                    <v>4575</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2559</v>
+                                    <v>2560</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1960</v>
+                                    <v>1961</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2995</v>
+                                    <v>2996</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3430</v>
+                                    <v>3431</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>33</b>
-                                    <v>3158</v>
+                                    <v>3159</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1306</v>
+                                    <v>1307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15154,7 +15139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41605</v>
+                                    <v>41618</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15170,57 +15155,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1524</v>
+                                    <v>1525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5826</v>
+                                    <v>5828</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8713</v>
+                                    <v>8715</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5554</v>
+                                    <v>5556</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4574</v>
+                                    <v>4575</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2559</v>
+                                    <v>2560</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1960</v>
+                                    <v>1961</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2995</v>
+                                    <v>2996</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3430</v>
+                                    <v>3431</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>33</b>
-                                    <v>3158</v>
+                                    <v>3159</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1306</v>
+                                    <v>1307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15236,27 +15221,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2123</v>
+                                    <v>2124</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6044</v>
+                                    <v>6046</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8767</v>
+                                    <v>8770</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5500</v>
+                                    <v>5501</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4574</v>
+                                    <v>4575</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -15266,12 +15251,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1851</v>
+                                    <v>1852</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>3812</v>
+                                    <v>3813</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -15281,7 +15266,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>165</b>
-                                    <v>3158</v>
+                                    <v>3159</v>
                                 </b>
                                 <b>
                                     <a>256</a>
@@ -15302,12 +15287,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2778</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2232</v>
+                                    <v>2233</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15358,12 +15343,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2778</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2232</v>
+                                    <v>2233</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15414,7 +15399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13941</v>
+                                    <v>13945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15430,12 +15415,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2778</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2232</v>
+                                    <v>2233</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15486,12 +15471,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2778</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2232</v>
+                                    <v>2233</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15622,7 +15607,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347278</v>
+                                    <v>347383</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15643,7 +15628,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347278</v>
+                                    <v>347383</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15664,7 +15649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347659</v>
+                                    <v>347764</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15680,7 +15665,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347659</v>
+                                    <v>347764</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15696,7 +15681,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347278</v>
+                                    <v>347383</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15717,12 +15702,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319613</v>
+                                    <v>319710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>205</b>
-                                    <v>1034</v>
+                                    <v>1035</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15738,7 +15723,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320648</v>
+                                    <v>320745</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15754,12 +15739,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319613</v>
+                                    <v>319710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>205</b>
-                                    <v>1034</v>
+                                    <v>1035</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15775,7 +15760,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320648</v>
+                                    <v>320745</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15791,12 +15776,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319613</v>
+                                    <v>319710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>205</b>
-                                    <v>1034</v>
+                                    <v>1035</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15806,31 +15791,31 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>7218</cardinality>
+            <cardinality>7136</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7218</v>
+                    <v>7136</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>7218</v>
+                    <v>7136</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>7218</v>
+                    <v>7136</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>871</v>
+                    <v>861</v>
                 </e>
                 <e>
                     <k>sign</k>
-                    <v>373</v>
+                    <v>369</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>622</v>
+                    <v>615</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15844,7 +15829,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15860,7 +15845,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15876,7 +15861,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15892,7 +15877,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15908,7 +15893,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15924,7 +15909,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15940,7 +15925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15956,7 +15941,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15972,7 +15957,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15988,7 +15973,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16004,7 +15989,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16020,7 +16005,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16036,7 +16021,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16052,7 +16037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16068,7 +16053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218</v>
+                                    <v>7136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16084,32 +16069,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16125,32 +16110,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16166,32 +16151,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16207,12 +16192,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16228,12 +16213,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>497</v>
+                                    <v>492</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373</v>
+                                    <v>369</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16249,17 +16234,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>41</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16275,17 +16260,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>41</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16301,17 +16286,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>41</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16327,12 +16312,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16348,7 +16333,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>373</v>
+                                    <v>369</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16364,27 +16349,27 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16400,27 +16385,27 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16436,27 +16421,27 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16472,7 +16457,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16488,7 +16473,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16498,23 +16483,23 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3023725</cardinality>
+            <cardinality>2998651</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3023725</v>
+                    <v>2998651</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1457167</v>
+                    <v>1444200</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>746</v>
+                    <v>738</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1942143</v>
+                    <v>1926174</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16528,7 +16513,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023725</v>
+                                    <v>2998651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16544,7 +16529,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023725</v>
+                                    <v>2998651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16560,7 +16545,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023725</v>
+                                    <v>2998651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16576,17 +16561,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1340932</v>
+                                    <v>1326444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>28</b>
-                                    <v>109639</v>
+                                    <b>22</b>
+                                    <v>108527</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>4302</b>
-                                    <v>6595</v>
+                                    <a>22</a>
+                                    <b>4289</b>
+                                    <v>9228</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16602,7 +16587,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1457167</v>
+                                    <v>1444200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16618,17 +16603,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1341056</v>
+                                    <v>1326567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>28</b>
-                                    <v>109514</v>
+                                    <b>22</b>
+                                    <v>108404</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>4302</b>
-                                    <v>6595</v>
+                                    <a>22</a>
+                                    <b>4289</b>
+                                    <v>9228</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16642,34 +16627,34 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>724</a>
-                                    <b>725</b>
-                                    <v>124</v>
+                                    <a>730</a>
+                                    <b>731</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>2333</a>
-                                    <b>2334</b>
-                                    <v>124</v>
+                                    <a>2337</a>
+                                    <b>2338</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>3628</a>
-                                    <b>3629</b>
-                                    <v>124</v>
+                                    <a>3659</a>
+                                    <b>3660</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>4301</a>
-                                    <b>4302</b>
-                                    <v>124</v>
+                                    <a>4288</a>
+                                    <b>4289</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>5557</a>
-                                    <b>5558</b>
-                                    <v>124</v>
+                                    <a>5571</a>
+                                    <b>5572</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>7754</a>
-                                    <b>7755</b>
-                                    <v>124</v>
+                                    <a>7785</a>
+                                    <b>7786</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16685,32 +16670,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>671</a>
-                                    <b>672</b>
-                                    <v>124</v>
+                                    <a>674</a>
+                                    <b>675</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>1613</a>
-                                    <b>1614</b>
-                                    <v>124</v>
+                                    <a>1614</a>
+                                    <b>1615</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>2429</a>
-                                    <b>2430</b>
-                                    <v>124</v>
+                                    <a>2432</a>
+                                    <b>2433</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>2655</a>
-                                    <b>2656</b>
-                                    <v>124</v>
+                                    <a>2672</a>
+                                    <b>2673</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>4340</a>
-                                    <b>4341</b>
-                                    <v>124</v>
+                                    <a>4344</a>
+                                    <b>4345</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16724,34 +16709,34 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>207</a>
-                                    <b>208</b>
-                                    <v>124</v>
+                                    <a>213</a>
+                                    <b>214</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>2333</a>
-                                    <b>2334</b>
-                                    <v>124</v>
+                                    <a>2337</a>
+                                    <b>2338</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>3624</a>
-                                    <b>3625</b>
-                                    <v>124</v>
+                                    <a>3655</a>
+                                    <b>3656</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>4301</a>
-                                    <b>4302</b>
-                                    <v>124</v>
+                                    <a>4288</a>
+                                    <b>4289</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>5492</a>
-                                    <b>5493</b>
-                                    <v>124</v>
+                                    <a>5506</a>
+                                    <b>5507</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>7754</a>
-                                    <b>7755</b>
-                                    <v>124</v>
+                                    <a>7785</a>
+                                    <b>7786</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16767,22 +16752,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1314424</v>
+                                    <v>1303434</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>374963</v>
+                                    <v>372462</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>122955</v>
+                                    <v>121324</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>129799</v>
+                                    <v>128953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16798,22 +16783,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1315918</v>
+                                    <v>1304911</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>374963</v>
+                                    <v>372462</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>121461</v>
+                                    <v>119847</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>129799</v>
+                                    <v>128953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16829,22 +16814,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1316291</v>
+                                    <v>1305280</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>375585</v>
+                                    <v>373077</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>123204</v>
+                                    <v>121570</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>127061</v>
+                                    <v>126246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16854,19 +16839,19 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2242064</cardinality>
+            <cardinality>2223333</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2242064</v>
+                    <v>2223333</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>248</v>
+                    <v>246</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>248</v>
+                    <v>246</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16880,7 +16865,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2242064</v>
+                                    <v>2223333</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16896,7 +16881,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2242064</v>
+                                    <v>2223333</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16912,12 +16897,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>18013</a>
-                                    <b>18014</b>
-                                    <v>124</v>
+                                    <a>18066</a>
+                                    <b>18067</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16933,7 +16918,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16949,12 +16934,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>18013</a>
-                                    <b>18014</b>
-                                    <v>124</v>
+                                    <a>18066</a>
+                                    <b>18067</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16970,7 +16955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16980,23 +16965,23 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>80393</cardinality>
+            <cardinality>79488</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>80393</v>
+                    <v>79488</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>17796</v>
+                    <v>17595</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>20160</v>
+                    <v>19933</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>622</v>
+                    <v>615</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17010,7 +16995,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80393</v>
+                                    <v>79488</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17026,7 +17011,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80393</v>
+                                    <v>79488</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17042,7 +17027,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80393</v>
+                                    <v>79488</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17058,37 +17043,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10827</v>
+                                    <v>10705</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3484</v>
+                                    <v>3445</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>1493</v>
+                                    <v>1476</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>42</b>
-                                    <v>1368</v>
+                                    <v>1353</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>57</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17104,22 +17089,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11698</v>
+                                    <v>11566</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3982</v>
+                                    <v>3937</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>995</v>
+                                    <v>984</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1120</v>
+                                    <v>1107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17135,22 +17120,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11698</v>
+                                    <v>11566</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3982</v>
+                                    <v>3937</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>746</v>
+                                    <v>738</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1368</v>
+                                    <v>1353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17166,37 +17151,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12693</v>
+                                    <v>12550</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>497</v>
+                                    <v>492</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2737</v>
+                                    <v>2707</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>1493</v>
+                                    <v>1476</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>1617</v>
+                                    <v>1599</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>45</b>
-                                    <v>497</v>
+                                    <v>492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17212,22 +17197,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14560</v>
+                                    <v>14396</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3609</v>
+                                    <v>3568</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17243,22 +17228,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14809</v>
+                                    <v>14642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3360</v>
+                                    <v>3322</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1617</v>
+                                    <v>1599</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>373</v>
+                                    <v>369</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17274,27 +17259,27 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>86</a>
                                     <b>87</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>91</a>
                                     <b>92</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>121</a>
                                     <b>122</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>338</a>
                                     <b>339</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17310,22 +17295,22 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>49</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>140</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17341,27 +17326,27 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>20</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>21</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>49</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>140</a>
                                     <b>141</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17419,15 +17404,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1755750</cardinality>
+            <cardinality>1757492</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1755750</v>
+                    <v>1757492</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>834219</v>
+                    <v>835030</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17441,7 +17426,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1755750</v>
+                                    <v>1757492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17457,22 +17442,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>659334</v>
+                                    <v>660534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80757</v>
+                                    <v>80564</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63915</v>
+                                    <v>63746</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4525</b>
-                                    <v>30211</v>
+                                    <v>30185</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17482,15 +17467,15 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>814571</cardinality>
+            <cardinality>814818</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>27567</v>
+                    <v>27575</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>814571</v>
+                    <v>814818</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17498,7 +17483,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>3341</v>
+                    <v>3342</v>
                 </e>
                 <e>
                     <k>parentheses_would_change_meaning</k>
@@ -17516,17 +17501,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9738</v>
+                                    <v>9741</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3649</v>
+                                    <v>3650</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3627</v>
+                                    <v>3628</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -17536,12 +17521,12 @@
                                 <b>
                                     <a>23</a>
                                     <b>24</b>
-                                    <v>3253</v>
+                                    <v>3254</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>30</b>
-                                    <v>3143</v>
+                                    <v>3144</v>
                                 </b>
                                 <b>
                                     <a>32</a>
@@ -17551,7 +17536,7 @@
                                 <b>
                                     <a>171</a>
                                     <b>172</b>
-                                    <v>3077</v>
+                                    <v>3078</v>
                                 </b>
                                 <b>
                                     <a>173</a>
@@ -17572,7 +17557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27567</v>
+                                    <v>27575</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17588,7 +17573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27567</v>
+                                    <v>27575</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17604,7 +17589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27567</v>
+                                    <v>27575</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17620,7 +17605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814571</v>
+                                    <v>814818</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17636,7 +17621,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814571</v>
+                                    <v>814818</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17652,7 +17637,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814571</v>
+                                    <v>814818</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17668,7 +17653,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814571</v>
+                                    <v>814818</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17840,7 +17825,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3341</v>
+                                    <v>3342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17856,7 +17841,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3341</v>
+                                    <v>3342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17930,15 +17915,15 @@
         </relation>
         <relation>
             <name>type_operators</name>
-            <cardinality>7936</cardinality>
+            <cardinality>7954</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7936</v>
+                    <v>7954</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>7164</v>
+                    <v>7184</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17946,7 +17931,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>5233</v>
+                    <v>5217</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17960,7 +17945,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7936</v>
+                                    <v>7954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17976,7 +17961,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7936</v>
+                                    <v>7954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17992,7 +17977,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7936</v>
+                                    <v>7954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18008,12 +17993,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6392</v>
+                                    <v>6415</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>772</v>
+                                    <v>769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18029,12 +18014,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6392</v>
+                                    <v>6415</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>772</v>
+                                    <v>769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18050,7 +18035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7143</v>
+                                    <v>7163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18079,8 +18064,8 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>96</a>
-                                    <b>97</b>
+                                    <a>98</a>
+                                    <b>99</b>
                                     <v>21</v>
                                 </b>
                                 <b>
@@ -18110,8 +18095,8 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>96</a>
-                                    <b>97</b>
+                                    <a>98</a>
+                                    <b>99</b>
                                     <v>21</v>
                                 </b>
                                 <b>
@@ -18141,8 +18126,8 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>72</a>
-                                    <b>73</b>
+                                    <a>74</a>
+                                    <b>75</b>
                                     <v>21</v>
                                 </b>
                                 <b>
@@ -18164,22 +18149,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3625</v>
+                                    <v>3571</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>900</v>
+                                    <v>940</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>343</v>
+                                    <v>342</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>364</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18195,17 +18180,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3775</v>
+                                    <v>3720</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>986</v>
+                                    <v>1026</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>450</v>
+                                    <v>449</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -18226,12 +18211,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4075</v>
+                                    <v>4020</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1136</v>
+                                    <v>1176</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18246,19 +18231,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4137521</cardinality>
+            <cardinality>4199005</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4137521</v>
+                    <v>4199005</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>915335</v>
+                    <v>949198</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>126</v>
+                    <v>125</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18272,7 +18257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4137521</v>
+                                    <v>4199005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18288,7 +18273,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4137521</v>
+                                    <v>4199005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18304,22 +18289,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>652055</v>
+                                    <v>680968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>158085</v>
+                                    <v>161107</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>70343</v>
+                                    <v>71369</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>32667</b>
-                                    <v>34850</v>
+                                    <b>33450</b>
+                                    <v>35752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18335,12 +18320,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>863800</v>
+                                    <v>897382</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51534</v>
+                                    <v>51815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18384,8 +18369,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>4586</a>
-                                    <b>4587</b>
+                                    <a>4788</a>
+                                    <b>4789</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18394,23 +18379,23 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>21491</a>
-                                    <b>21492</b>
+                                    <a>21602</a>
+                                    <b>21603</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>82174</a>
-                                    <b>82175</b>
+                                    <a>82275</a>
+                                    <b>82276</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>92838</a>
-                                    <b>92839</b>
+                                    <a>98872</a>
+                                    <b>98873</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>166906</a>
-                                    <b>166907</b>
+                                    <a>167625</a>
+                                    <b>167626</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18450,8 +18435,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>771</a>
-                                    <b>772</b>
+                                    <a>783</a>
+                                    <b>784</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18460,8 +18445,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>3066</a>
-                                    <b>3067</b>
+                                    <a>3068</a>
+                                    <b>3069</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18475,13 +18460,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>12187</a>
-                                    <b>12188</b>
+                                    <a>12270</a>
+                                    <b>12271</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>57664</a>
-                                    <b>57665</b>
+                                    <a>61131</a>
+                                    <b>61132</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18492,19 +18477,19 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1359600</cardinality>
+            <cardinality>1420243</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1359600</v>
+                    <v>1420243</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>1472</v>
+                    <v>1467</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>84</v>
+                    <v>83</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18518,7 +18503,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359600</v>
+                                    <v>1420243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18534,7 +18519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359600</v>
+                                    <v>1420243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18550,12 +18535,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>462</v>
+                                    <v>461</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>189</v>
+                                    <v>188</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18594,7 +18579,7 @@
                                 </b>
                                 <b>
                                     <a>1839</a>
-                                    <b>99841</b>
+                                    <b>106053</b>
                                     <v>52</v>
                                 </b>
                             </bs>
@@ -18611,7 +18596,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1199</v>
+                                    <v>1195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18670,8 +18655,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>115036</a>
-                                    <b>115037</b>
+                                    <a>121248</a>
+                                    <b>121249</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18688,7 +18673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21</v>
+                                    <v>20</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18728,26 +18713,26 @@
         </relation>
         <relation>
             <name>usertype_final</name>
-            <cardinality>11449</cardinality>
+            <cardinality>11320</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11449</v>
+                    <v>11320</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>47930</cardinality>
+            <cardinality>47918</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>47930</v>
+                    <v>47918</v>
                 </e>
                 <e>
                     <k>uuid</k>
-                    <v>47387</v>
+                    <v>47375</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18761,7 +18746,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47930</v>
+                                    <v>47918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18777,7 +18762,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46845</v>
+                                    <v>46833</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18792,15 +18777,15 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1755750</cardinality>
+            <cardinality>1757492</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1755750</v>
+                    <v>1757492</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
-                    <v>21</v>
+                    <v>20</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18814,7 +18799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1755750</v>
+                                    <v>1757492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18828,13 +18813,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>36914</a>
-                                    <b>36915</b>
+                                    <a>36955</a>
+                                    <b>36956</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>129992</a>
-                                    <b>129993</b>
+                                    <a>130670</a>
+                                    <b>130671</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18845,26 +18830,26 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>761293</cardinality>
+            <cardinality>753499</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>761293</v>
+                    <v>753499</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_template_type_constraint</name>
-            <cardinality>27070</cardinality>
+            <cardinality>26986</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13342</v>
+                    <v>13300</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>25933</v>
+                    <v>25852</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18878,27 +18863,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10189</v>
+                                    <v>10157</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>900</v>
+                                    <v>898</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1029</v>
+                                    <v>1026</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>14</b>
-                                    <v>1115</v>
+                                    <v>1111</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>107</v>
+                                    <v>106</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18914,12 +18899,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24796</v>
+                                    <v>24719</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1136</v>
+                                    <v>1133</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18929,19 +18914,19 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7910444</cardinality>
+            <cardinality>8194180</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7910444</v>
+                    <v>8194180</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6349611</v>
+                    <v>6357829</v>
                 </e>
                 <e>
                     <k>is_complete</k>
-                    <v>248</v>
+                    <v>246</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18955,7 +18940,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910444</v>
+                                    <v>8194180</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18971,7 +18956,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910444</v>
+                                    <v>8194180</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18987,12 +18972,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6016213</v>
+                                    <v>6002593</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1120</b>
-                                    <v>333397</v>
+                                    <v>355236</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19008,7 +18993,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349611</v>
+                                    <v>6357829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19024,12 +19009,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>63558</a>
-                                    <b>63559</b>
-                                    <v>124</v>
+                                    <a>66588</a>
+                                    <b>66589</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19045,12 +19030,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>51016</a>
-                                    <b>51017</b>
-                                    <v>124</v>
+                                    <a>51664</a>
+                                    <b>51665</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19060,59 +19045,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>590973</cardinality>
+            <cardinality>607950</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>590973</v>
+                    <v>607950</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1120536</cardinality>
+            <cardinality>1181968</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1120536</v>
+                    <v>1181968</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1341507</cardinality>
+            <cardinality>1402209</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1341507</v>
+                    <v>1402209</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>231184</cardinality>
+            <cardinality>230421</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>231184</v>
+                    <v>230421</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1122188</cardinality>
+            <cardinality>1182545</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1119158</v>
+                    <v>1179556</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>71521</v>
+                    <v>71725</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19126,12 +19111,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1117033</v>
+                                    <v>1177470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2124</v>
+                                    <v>2086</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19147,47 +19132,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20386</v>
+                                    <v>20329</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12833</v>
+                                    <v>12770</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7111</v>
+                                    <v>7108</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4639</v>
+                                    <v>4655</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>6059</v>
+                                    <v>6175</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>5680</v>
+                                    <v>5682</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>5890</v>
+                                    <v>5860</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>51</b>
-                                    <v>5364</v>
+                                    <b>52</b>
+                                    <v>5399</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>4223</b>
-                                    <v>3555</v>
+                                    <a>52</a>
+                                    <b>4358</b>
+                                    <v>3743</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19197,19 +19182,19 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2887364</cardinality>
+            <cardinality>2998626</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1362199</v>
+                    <v>1422098</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1178</v>
+                    <v>1174</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>818756</v>
+                    <v>844162</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19223,27 +19208,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>577725</v>
+                                    <v>599073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408636</v>
+                                    <v>433897</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>249940</v>
+                                    <v>263364</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>102679</v>
+                                    <b>8</b>
+                                    <v>107667</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
+                                    <a>8</a>
                                     <b>113</b>
-                                    <v>23216</v>
+                                    <v>18096</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19259,17 +19244,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>606159</v>
+                                    <v>627926</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>422574</v>
+                                    <v>448051</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>250771</v>
+                                    <v>263427</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19295,7 +19280,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>746</v>
+                                    <v>744</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -19314,13 +19299,13 @@
                                 </b>
                                 <b>
                                     <a>643</a>
-                                    <b>7128</b>
+                                    <b>7143</b>
                                     <v>94</v>
                                 </b>
                                 <b>
-                                    <a>11968</a>
-                                    <b>129492</b>
-                                    <v>42</v>
+                                    <a>11996</a>
+                                    <b>135625</b>
+                                    <v>41</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19341,12 +19326,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>746</v>
+                                    <v>744</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>105</v>
+                                    <v>104</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -19360,12 +19345,12 @@
                                 </b>
                                 <b>
                                     <a>196</a>
-                                    <b>3263</b>
+                                    <b>3290</b>
                                     <v>94</v>
                                 </b>
                                 <b>
-                                    <a>10412</a>
-                                    <b>44535</b>
+                                    <a>11128</a>
+                                    <b>46222</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -19382,27 +19367,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>511558</v>
+                                    <v>523971</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>166890</v>
+                                    <v>174580</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>74919</v>
+                                    <v>77680</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>46</b>
-                                    <v>61412</v>
+                                    <b>44</b>
+                                    <v>63442</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>12620</b>
-                                    <v>3976</v>
+                                    <a>44</a>
+                                    <b>13909</b>
+                                    <v>4487</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19418,17 +19403,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>720873</v>
+                                    <v>737082</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79589</v>
+                                    <v>87809</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>18293</v>
+                                    <v>19270</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19438,19 +19423,19 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>506795</cardinality>
+            <cardinality>508368</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>204505</v>
+                    <v>208919</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>304</v>
+                    <v>301</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>506660</v>
+                    <v>508234</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19464,17 +19449,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>154817</v>
+                                    <v>159699</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>43087</v>
+                                    <v>42682</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>6600</v>
+                                    <v>6538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19490,22 +19475,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146998</v>
+                                    <v>151953</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>40210</v>
+                                    <v>39832</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>45</b>
-                                    <v>15434</v>
+                                    <b>52</b>
+                                    <v>15892</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
+                                    <a>54</a>
                                     <b>154</b>
-                                    <v>1861</v>
+                                    <v>1240</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19549,18 +19534,18 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>981</a>
-                                    <b>982</b>
+                                    <a>982</a>
+                                    <b>983</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>2472</a>
-                                    <b>2473</b>
+                                    <a>2571</a>
+                                    <b>2572</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>3753</a>
-                                    <b>3754</b>
+                                    <a>3842</a>
+                                    <b>3843</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -19605,18 +19590,18 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>2433</a>
-                                    <b>2434</b>
+                                    <a>2434</a>
+                                    <b>2435</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>4802</a>
-                                    <b>4803</b>
+                                    <a>4901</a>
+                                    <b>4902</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>6051</a>
-                                    <b>6052</b>
+                                    <a>6140</a>
+                                    <b>6141</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -19633,12 +19618,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506524</v>
+                                    <v>508100</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>135</v>
+                                    <v>134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19654,7 +19639,95 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506660</v>
+                                    <v>508234</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>class_template_generated_from</name>
+            <cardinality>61398</cardinality>
+            <columnsizes>
+                <e>
+                    <k>template</k>
+                    <v>61398</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>3732</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>template</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>61398</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>template</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1509</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>471</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>209</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>178</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>262</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>262</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>16</b>
+                                    <v>283</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>63</b>
+                                    <v>335</v>
+                                </b>
+                                <b>
+                                    <a>63</a>
+                                    <b>603</b>
+                                    <v>220</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19664,15 +19737,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>48241</cardinality>
+            <cardinality>50200</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>48241</v>
+                    <v>50200</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>45580</v>
+                    <v>46897</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19686,7 +19759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>48241</v>
+                                    <v>50200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19702,12 +19775,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44865</v>
+                                    <v>46143</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>79</b>
-                                    <v>715</v>
+                                    <b>82</b>
+                                    <v>754</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19717,19 +19790,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5913261</cardinality>
+            <cardinality>5915053</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5913261</v>
+                    <v>5915053</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>278007</v>
+                    <v>278092</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5856951</v>
+                    <v>5858726</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19747,7 +19820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5913261</v>
+                                    <v>5915053</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19763,7 +19836,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5913261</v>
+                                    <v>5915053</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19779,7 +19852,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5913261</v>
+                                    <v>5915053</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19795,42 +19868,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137451</v>
+                                    <v>137493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31204</v>
+                                    <v>31213</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11653</v>
+                                    <v>11657</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14975</v>
+                                    <v>14980</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19931</v>
+                                    <v>19937</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21783</v>
+                                    <v>21789</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21020</v>
+                                    <v>21027</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>8941</b>
-                                    <v>19986</v>
+                                    <v>19992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19846,42 +19919,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137451</v>
+                                    <v>137493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31204</v>
+                                    <v>31213</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11653</v>
+                                    <v>11657</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14975</v>
+                                    <v>14980</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19931</v>
+                                    <v>19937</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21783</v>
+                                    <v>21789</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21020</v>
+                                    <v>21027</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>8941</b>
-                                    <v>19986</v>
+                                    <v>19992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19897,7 +19970,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>278007</v>
+                                    <v>278092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19913,12 +19986,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5811261</v>
+                                    <v>5813022</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45690</v>
+                                    <v>45704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19934,12 +20007,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5811261</v>
+                                    <v>5813022</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45690</v>
+                                    <v>45704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19955,7 +20028,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5856951</v>
+                                    <v>5858726</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20013,26 +20086,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1328114</cardinality>
+            <cardinality>1312417</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1328114</v>
+                    <v>1312417</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>967592</cardinality>
+            <cardinality>958530</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>967592</v>
+                    <v>958530</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>181523</v>
+                    <v>179850</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20046,7 +20119,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>967592</v>
+                                    <v>958530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20062,27 +20135,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>109834</v>
+                                    <v>108835</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42546</v>
+                                    <v>42146</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>14351</v>
+                                    <v>14216</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>104</b>
-                                    <v>13640</v>
+                                    <v>13512</v>
                                 </b>
                                 <b>
                                     <a>119</a>
                                     <b>1532</b>
-                                    <v>1150</v>
+                                    <v>1139</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20092,19 +20165,19 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2468721</cardinality>
+            <cardinality>2445949</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1443892</v>
+                    <v>1430587</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>473</v>
+                    <v>469</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>296062</v>
+                    <v>293279</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20118,22 +20191,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>777946</v>
+                                    <v>770800</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410500</v>
+                                    <v>406674</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>170691</v>
+                                    <v>169154</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>84753</v>
+                                    <v>83956</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20149,22 +20222,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>796968</v>
+                                    <v>789644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408604</v>
+                                    <v>404797</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>168525</v>
+                                    <v>167008</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>69793</v>
+                                    <v>69137</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20180,7 +20253,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>169</v>
+                                    <v>167</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -20213,18 +20286,18 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>7547</a>
-                                    <b>7548</b>
+                                    <a>7549</a>
+                                    <b>7550</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>19675</a>
-                                    <b>19676</b>
+                                    <a>19678</a>
+                                    <b>19679</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>42659</a>
-                                    <b>42660</b>
+                                    <a>42667</a>
+                                    <b>42668</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -20241,7 +20314,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>169</v>
+                                    <v>167</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -20279,8 +20352,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>2754</a>
-                                    <b>2755</b>
+                                    <a>2755</a>
+                                    <b>2756</b>
                                     <v>33</v>
                                 </b>
                                 <b>
@@ -20302,37 +20375,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173636</v>
+                                    <v>172004</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26163</v>
+                                    <v>25884</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19868</v>
+                                    <v>19513</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>22508</v>
+                                    <v>22430</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>23083</v>
+                                    <v>22933</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>76</b>
-                                    <v>23219</v>
+                                    <v>23000</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>2452</b>
-                                    <v>7581</v>
+                                    <v>7510</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20348,17 +20421,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255140</v>
+                                    <v>252708</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31918</v>
+                                    <v>31651</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>9003</v>
+                                    <v>8918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20368,19 +20441,19 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>449830</cardinality>
+            <cardinality>445568</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>195502</v>
+                    <v>193664</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>473</v>
+                    <v>469</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>447156</v>
+                    <v>442919</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20394,17 +20467,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>150417</v>
+                                    <v>149003</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42613</v>
+                                    <v>42213</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>2470</v>
+                                    <v>2447</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20420,22 +20493,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>143546</v>
+                                    <v>142197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36453</v>
+                                    <v>36110</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>54</b>
-                                    <v>14757</v>
+                                    <v>14618</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>113</b>
-                                    <v>744</v>
+                                    <v>737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20451,7 +20524,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>169</v>
+                                    <v>167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20512,7 +20585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>169</v>
+                                    <v>167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20545,8 +20618,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>3295</a>
-                                    <b>3296</b>
+                                    <a>3294</a>
+                                    <b>3295</b>
                                     <v>33</v>
                                 </b>
                                 <b>
@@ -20573,12 +20646,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>444482</v>
+                                    <v>440270</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2673</v>
+                                    <v>2648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20594,7 +20667,110 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447156</v>
+                                    <v>442919</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>function_template_generated_from</name>
+            <cardinality>863408</cardinality>
+            <columnsizes>
+                <e>
+                    <k>template</k>
+                    <v>863408</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>22129</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>template</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>863408</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>template</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3587</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1173</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1676</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>1777</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>1676</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>20</b>
+                                    <v>1575</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>23</b>
+                                    <v>1676</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>32</b>
+                                    <v>1844</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>66</b>
+                                    <v>2045</v>
+                                </b>
+                                <b>
+                                    <a>70</a>
+                                    <b>79</b>
+                                    <v>1374</v>
+                                </b>
+                                <b>
+                                    <a>83</a>
+                                    <b>110</b>
+                                    <v>1844</v>
+                                </b>
+                                <b>
+                                    <a>111</a>
+                                    <b>370</b>
+                                    <v>1877</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20604,26 +20780,26 @@
         </relation>
         <relation>
             <name>is_variable_template</name>
-            <cardinality>58490</cardinality>
+            <cardinality>57832</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>58490</v>
+                    <v>57832</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>427356</cardinality>
+            <cardinality>598007</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>427356</v>
+                    <v>598007</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>35343</v>
+                    <v>36175</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20637,7 +20813,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>427356</v>
+                                    <v>598007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20653,47 +20829,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15182</v>
+                                    <v>14396</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3857</v>
+                                    <v>3937</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2364</v>
+                                    <v>2583</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2986</v>
+                                    <v>2707</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>2240</v>
+                                    <v>2707</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>12</b>
-                                    <v>3111</v>
+                                    <b>11</b>
+                                    <v>3199</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>31</b>
-                                    <v>2737</v>
+                                    <a>11</a>
+                                    <b>30</b>
+                                    <v>2830</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>390</b>
-                                    <v>2737</v>
+                                    <a>30</a>
+                                    <b>94</b>
+                                    <v>2830</v>
                                 </b>
                                 <b>
-                                    <a>545</a>
-                                    <b>546</b>
-                                    <v>124</v>
+                                    <a>103</a>
+                                    <b>1155</b>
+                                    <v>984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20703,19 +20879,19 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>772451</cardinality>
+            <cardinality>1129692</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>405577</v>
+                    <v>576474</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1991</v>
+                    <v>1968</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>255741</v>
+                    <v>464378</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20729,22 +20905,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>161534</v>
+                                    <v>189615</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>189535</v>
+                                    <v>289652</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>36338</v>
+                                    <v>77519</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>18169</v>
+                                    <v>19687</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20760,22 +20936,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>176343</v>
+                                    <v>207333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>179828</v>
+                                    <v>276855</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>33601</v>
+                                    <v>75427</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>15804</v>
+                                    <v>16857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20789,44 +20965,44 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>28</a>
-                                    <b>29</b>
-                                    <v>871</v>
+                                    <a>27</a>
+                                    <b>28</b>
+                                    <v>861</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
-                                    <b>35</b>
-                                    <v>373</v>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>369</v>
                                 </b>
                                 <b>
-                                    <a>37</a>
-                                    <b>38</b>
-                                    <v>124</v>
+                                    <a>40</a>
+                                    <b>41</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>66</a>
-                                    <b>67</b>
-                                    <v>124</v>
+                                    <a>72</a>
+                                    <b>73</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>146</a>
-                                    <b>147</b>
-                                    <v>124</v>
+                                    <a>160</a>
+                                    <b>161</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>438</a>
-                                    <b>439</b>
-                                    <v>124</v>
+                                    <a>790</a>
+                                    <b>791</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>1961</a>
-                                    <b>1962</b>
-                                    <v>124</v>
+                                    <a>3144</a>
+                                    <b>3145</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>3259</a>
-                                    <b>3260</b>
-                                    <v>124</v>
+                                    <a>4685</a>
+                                    <b>4686</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20842,42 +21018,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>871</v>
+                                    <v>861</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373</v>
+                                    <v>369</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>28</a>
-                                    <b>29</b>
-                                    <v>124</v>
+                                    <a>35</a>
+                                    <b>36</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>54</a>
-                                    <b>55</b>
-                                    <v>124</v>
+                                    <a>63</a>
+                                    <b>64</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>161</a>
-                                    <b>162</b>
-                                    <v>124</v>
+                                    <a>362</a>
+                                    <b>363</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>747</a>
-                                    <b>748</b>
-                                    <v>124</v>
+                                    <a>1465</a>
+                                    <b>1466</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>1327</a>
-                                    <b>1328</b>
-                                    <v>124</v>
+                                    <a>2164</a>
+                                    <b>2165</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20893,22 +21069,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173481</v>
+                                    <v>360650</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>46294</v>
+                                    <v>57832</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>21529</v>
+                                    <b>16</b>
+                                    <v>35437</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>206</b>
-                                    <v>14436</v>
+                                    <a>16</a>
+                                    <b>224</b>
+                                    <v>10458</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20924,17 +21100,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>227491</v>
+                                    <v>430909</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>24640</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
                                     <b>7</b>
-                                    <v>3609</v>
+                                    <v>33468</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20944,19 +21115,19 @@
         </relation>
         <relation>
             <name>variable_template_argument_value</name>
-            <cardinality>19911</cardinality>
+            <cardinality>19810</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>14809</v>
+                    <v>14765</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>497</v>
+                    <v>492</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>19911</v>
+                    <v>19810</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20970,12 +21141,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13315</v>
+                                    <v>13289</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1493</v>
+                                    <v>1476</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20991,17 +21162,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10453</v>
+                                    <v>10458</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3982</v>
+                                    <v>3937</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>373</v>
+                                    <v>369</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21017,22 +21188,22 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>28</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>41</a>
-                                    <b>42</b>
-                                    <v>124</v>
+                                    <a>43</a>
+                                    <b>44</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>47</b>
-                                    <v>124</v>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21048,22 +21219,22 @@
                                 <b>
                                     <a>22</a>
                                     <b>23</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>30</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>50</a>
-                                    <b>51</b>
-                                    <v>124</v>
+                                    <a>52</a>
+                                    <b>53</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>59</a>
-                                    <b>60</b>
-                                    <v>124</v>
+                                    <a>58</a>
+                                    <b>59</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21079,7 +21250,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19911</v>
+                                    <v>19810</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21095,7 +21266,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19911</v>
+                                    <v>19810</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21104,21 +21275,21 @@
             </dependencies>
         </relation>
         <relation>
-            <name>template_template_instantiation</name>
-            <cardinality>6346</cardinality>
+            <name>variable_template_generated_from</name>
+            <cardinality>492</cardinality>
             <columnsizes>
                 <e>
-                    <k>to</k>
-                    <v>4977</v>
+                    <k>template</k>
+                    <v>492</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>1120</v>
+                    <v>246</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
-                    <src>to</src>
+                    <src>template</src>
                     <trg>from</trg>
                     <val>
                         <hist>
@@ -21127,12 +21298,66 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3609</v>
+                                    <v>492</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>template</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1368</v>
+                                    <v>246</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>is_alias_template</name>
+            <cardinality>107393</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>107393</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>alias_instantiation</name>
+            <cardinality>459650</cardinality>
+            <columnsizes>
+                <e>
+                    <k>to</k>
+                    <v>459650</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>92205</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>to</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>459650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21148,22 +21373,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>746</v>
+                                    <v>16529</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>124</v>
+                                    <v>16798</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>124</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>20016</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>124</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>12472</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>6705</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>4794</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>7812</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>143</b>
+                                    <v>6940</v>
+                                </b>
+                                <b>
+                                    <a>163</a>
+                                    <b>795</b>
+                                    <v>134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21172,20 +21422,20 @@
             </dependencies>
         </relation>
         <relation>
-            <name>template_template_argument</name>
-            <cardinality>9635</cardinality>
+            <name>alias_template_argument</name>
+            <cardinality>993065</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>6090</v>
+                    <v>566977</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>105</v>
+                    <v>301</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>9046</v>
+                    <v>127712</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21199,22 +21449,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4996</v>
+                                    <v>276179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>420</v>
+                                    <v>182331</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>504</v>
+                                    <b>4</b>
+                                    <v>86907</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>11</b>
-                                    <v>168</v>
+                                    <a>4</a>
+                                    <b>10</b>
+                                    <v>21559</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21230,22 +21480,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5017</v>
+                                    <v>277419</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>181124</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
                                     <b>4</b>
-                                    <v>557</v>
+                                    <v>88349</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>462</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>52</v>
+                                    <v>20083</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21261,52 +21511,47 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>10</v>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>10</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>10</v>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>10</v>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>38</a>
-                                    <b>39</b>
-                                    <v>10</v>
+                                    <a>91</a>
+                                    <b>92</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>50</a>
-                                    <b>51</b>
-                                    <v>10</v>
+                                    <a>643</a>
+                                    <b>644</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>64</a>
-                                    <b>65</b>
-                                    <v>10</v>
+                                    <a>3235</a>
+                                    <b>3236</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>104</a>
-                                    <b>105</b>
-                                    <v>10</v>
+                                    <a>8673</a>
+                                    <b>8674</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>579</a>
-                                    <b>580</b>
-                                    <v>10</v>
+                                    <a>16910</a>
+                                    <b>16911</b>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21320,54 +21565,49 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>10</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>10</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>10</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>10</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>38</a>
-                                    <b>39</b>
-                                    <v>10</v>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>50</a>
-                                    <b>51</b>
-                                    <v>10</v>
+                                    <a>61</a>
+                                    <b>62</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>64</a>
-                                    <b>65</b>
-                                    <v>10</v>
+                                    <a>568</a>
+                                    <b>569</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>99</a>
-                                    <b>100</b>
-                                    <v>10</v>
+                                    <a>1513</a>
+                                    <b>1514</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>538</a>
-                                    <b>539</b>
-                                    <v>10</v>
+                                    <a>2209</a>
+                                    <b>2210</b>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21383,12 +21623,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9015</v>
+                                    <v>78156</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>20285</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>43</b>
-                                    <v>31</v>
+                                    <b>4</b>
+                                    <v>5431</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>10461</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>76</b>
+                                    <v>10829</v>
+                                </b>
+                                <b>
+                                    <a>84</a>
+                                    <b>4474</b>
+                                    <v>2548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21404,12 +21664,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9025</v>
+                                    <v>108801</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>11</b>
-                                    <v>21</v>
+                                    <b>3</b>
+                                    <v>17301</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>9</b>
+                                    <v>1609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21418,20 +21683,20 @@
             </dependencies>
         </relation>
         <relation>
-            <name>template_template_argument_value</name>
-            <cardinality>746</cardinality>
+            <name>alias_template_argument_value</name>
+            <cardinality>173177</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>124</v>
+                    <v>160604</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>124</v>
+                    <v>134</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>746</v>
+                    <v>173177</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21445,7 +21710,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>159363</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1240</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21454,6 +21724,440 @@
                 <dep>
                     <src>type_id</src>
                     <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>158693</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>42</b>
+                                    <v>1911</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>33</v>
+                                </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>50</b>
+                                    <v>33</v>
+                                </b>
+                                <b>
+                                    <a>199</a>
+                                    <b>200</b>
+                                    <v>33</v>
+                                </b>
+                                <b>
+                                    <a>4545</a>
+                                    <b>4546</b>
+                                    <v>33</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>38</a>
+                                    <b>39</b>
+                                    <v>33</v>
+                                </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>50</b>
+                                    <v>33</v>
+                                </b>
+                                <b>
+                                    <a>249</a>
+                                    <b>250</b>
+                                    <v>33</v>
+                                </b>
+                                <b>
+                                    <a>4829</a>
+                                    <b>4830</b>
+                                    <v>33</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_value</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>173177</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_value</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>173177</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>alias_template_generated_from</name>
+            <cardinality>99816</cardinality>
+            <columnsizes>
+                <e>
+                    <k>template</k>
+                    <v>99816</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>1911</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>template</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>99816</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>template</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>18</b>
+                                    <v>167</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>20</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>201</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>50</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>65</b>
+                                    <v>67</v>
+                                </b>
+                                <b>
+                                    <a>65</a>
+                                    <b>66</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>74</a>
+                                    <b>84</b>
+                                    <v>167</v>
+                                </b>
+                                <b>
+                                    <a>111</a>
+                                    <b>112</b>
+                                    <v>268</v>
+                                </b>
+                                <b>
+                                    <a>150</a>
+                                    <b>294</b>
+                                    <v>100</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>template_template_instantiation</name>
+            <cardinality>6029</cardinality>
+            <columnsizes>
+                <e>
+                    <k>to</k>
+                    <v>4675</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>1107</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>to</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3322</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1353</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>to</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>738</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>123</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>123</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>28</b>
+                                    <v>123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>template_template_argument</name>
+            <cardinality>9603</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>6070</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>104</v>
+                </e>
+                <e>
+                    <k>arg_type</k>
+                    <v>9016</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>type_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4980</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>419</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>503</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>167</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>arg_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5001</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>555</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>10</b>
+                                    <v>461</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>52</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>28</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>38</a>
+                                    <b>39</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>51</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>65</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>104</a>
+                                    <b>105</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>579</a>
+                                    <b>580</b>
+                                    <v>10</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>arg_type</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -21461,7 +22165,146 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>28</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>38</a>
+                                    <b>39</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>51</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>65</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>99</a>
+                                    <b>100</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>538</a>
+                                    <b>539</b>
+                                    <v>10</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_type</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8985</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>43</b>
+                                    <v>31</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_type</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8995</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>11</b>
+                                    <v>20</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>template_template_argument_value</name>
+            <cardinality>1107</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>123</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>123</v>
+                </e>
+                <e>
+                    <k>arg_value</k>
+                    <v>1107</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>type_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21477,7 +22320,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21491,9 +22334,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>124</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21509,7 +22352,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>746</v>
+                                    <v>1107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21525,7 +22368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>746</v>
+                                    <v>1107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21535,19 +22378,19 @@
         </relation>
         <relation>
             <name>concept_templates</name>
-            <cardinality>3603</cardinality>
+            <cardinality>3592</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>3603</v>
+                    <v>3592</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>3603</v>
+                    <v>3592</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3603</v>
+                    <v>3592</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21561,7 +22404,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3603</v>
+                                    <v>3592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21577,7 +22420,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3603</v>
+                                    <v>3592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21593,7 +22436,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3603</v>
+                                    <v>3592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21609,7 +22452,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3603</v>
+                                    <v>3592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21625,7 +22468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3603</v>
+                                    <v>3592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21641,7 +22484,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3603</v>
+                                    <v>3592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21651,15 +22494,15 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>90157</cardinality>
+            <cardinality>90089</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>90157</v>
+                    <v>90089</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>3432</v>
+                    <v>3421</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21673,7 +22516,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90157</v>
+                                    <v>90089</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21694,12 +22537,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>107</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>364</v>
+                                    <v>363</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21709,57 +22552,57 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>300</v>
+                                    <v>299</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>235</v>
+                                    <v>213</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>107</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>278</v>
+                                    <v>277</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>214</v>
+                                    <v>213</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>19</b>
-                                    <v>214</v>
+                                    <v>213</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>25</b>
-                                    <v>257</v>
+                                    <v>256</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>37</b>
-                                    <v>257</v>
+                                    <v>256</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>49</b>
-                                    <v>257</v>
+                                    <v>256</v>
                                 </b>
                                 <b>
                                     <a>50</a>
-                                    <b>72</b>
-                                    <v>257</v>
+                                    <b>73</b>
+                                    <v>256</v>
                                 </b>
                                 <b>
-                                    <a>78</a>
+                                    <a>79</a>
                                     <b>387</b>
-                                    <v>214</v>
+                                    <v>213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21769,22 +22612,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>36787</cardinality>
+            <cardinality>36673</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>36787</v>
+                    <v>36673</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>112701</cardinality>
+            <cardinality>112671</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76149</v>
+                    <v>76126</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21792,7 +22635,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>21364</v>
+                    <v>21490</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21806,17 +22649,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46333</v>
+                                    <v>46317</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24603</v>
+                                    <v>24612</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>5212</v>
+                                    <v>5196</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21832,17 +22675,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49937</v>
+                                    <v>49909</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22308</v>
+                                    <v>22324</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3904</v>
+                                    <v>3891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21876,13 +22719,13 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>1390</a>
-                                    <b>1391</b>
+                                    <a>1394</a>
+                                    <b>1395</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>3550</a>
-                                    <b>3551</b>
+                                    <a>3560</a>
+                                    <b>3561</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -21917,13 +22760,13 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>359</a>
-                                    <b>360</b>
+                                    <a>360</a>
+                                    <b>361</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>640</a>
-                                    <b>641</b>
+                                    <a>649</a>
+                                    <b>650</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -21940,42 +22783,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10360</v>
+                                    <v>10520</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2960</v>
+                                    <v>2929</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1051</v>
+                                    <v>1069</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1351</v>
+                                    <v>1347</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1158</v>
+                                    <v>1133</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>1608</v>
+                                    <v>1625</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>1973</v>
+                                    <v>1945</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>259</b>
-                                    <v>900</v>
+                                    <v>919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21991,12 +22834,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17975</v>
+                                    <v>18090</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3260</v>
+                                    <v>3271</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22011,7 +22854,7 @@
         </relation>
         <relation>
             <name>concept_template_argument_value</name>
-            <cardinality>105</cardinality>
+            <cardinality>104</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
@@ -22019,11 +22862,11 @@
                 </e>
                 <e>
                     <k>index</k>
-                    <v>15</v>
+                    <v>14</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>105</v>
+                    <v>104</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22053,7 +22896,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60</v>
+                                    <v>59</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22116,7 +22959,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105</v>
+                                    <v>104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22132,7 +22975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105</v>
+                                    <v>104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22142,15 +22985,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>600586</cardinality>
+            <cardinality>594974</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>600586</v>
+                    <v>594974</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>282015</v>
+                    <v>279398</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22164,7 +23007,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>600586</v>
+                                    <v>594974</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22180,17 +23023,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232564</v>
+                                    <v>230412</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34998</v>
+                                    <v>34669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4677</b>
-                                    <v>14452</v>
+                                    <v>14316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22200,11 +23043,11 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1178524</cardinality>
+            <cardinality>1178881</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>416004</v>
+                    <v>416130</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22212,7 +23055,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>112074</v>
+                    <v>112108</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22226,32 +23069,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82939</v>
+                                    <v>82964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>126070</v>
+                                    <v>126108</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>107881</v>
+                                    <v>107913</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>49284</v>
+                                    <v>49299</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>33164</v>
+                                    <v>33174</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>19</b>
-                                    <v>16664</v>
+                                    <v>16669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22267,27 +23110,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88929</v>
+                                    <v>88956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>138704</v>
+                                    <v>138746</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>114633</v>
+                                    <v>114668</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>40734</v>
+                                    <v>40746</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>32892</v>
+                                    <v>32902</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -22485,47 +23328,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33273</v>
+                                    <v>33283</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15574</v>
+                                    <v>15579</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13287</v>
+                                    <v>13291</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>9802</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>6371</v>
+                                    <v>6373</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>9475</v>
+                                    <v>9478</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9530</v>
+                                    <v>9533</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>8658</v>
+                                    <v>8661</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>926</b>
-                                    <v>6099</v>
+                                    <v>6101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22541,22 +23384,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79399</v>
+                                    <v>79423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17535</v>
+                                    <v>17540</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>9475</v>
+                                    <v>9478</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>5663</v>
+                                    <v>5665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22566,19 +23409,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>9677</cardinality>
+            <cardinality>9645</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9677</v>
+                    <v>9645</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>7942</v>
+                    <v>7915</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>4849</v>
+                    <v>4833</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22592,7 +23435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9677</v>
+                                    <v>9645</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22608,7 +23451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9677</v>
+                                    <v>9645</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22624,12 +23467,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7731</v>
+                                    <v>7706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>84</b>
-                                    <v>210</v>
+                                    <v>209</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22645,12 +23488,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7731</v>
+                                    <v>7706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>84</b>
-                                    <v>210</v>
+                                    <v>209</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22666,22 +23509,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3892</v>
+                                    <v>3879</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515</v>
+                                    <v>513</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>399</v>
+                                    <v>398</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>42</v>
+                                    <v>41</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22697,22 +23540,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3892</v>
+                                    <v>3879</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515</v>
+                                    <v>513</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>399</v>
+                                    <v>398</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>42</v>
+                                    <v>41</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22722,15 +23565,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>7715</cardinality>
+            <cardinality>7628</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7715</v>
+                    <v>7628</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>7715</v>
+                    <v>7628</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22744,7 +23587,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7715</v>
+                                    <v>7628</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22760,7 +23603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7715</v>
+                                    <v>7628</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22770,15 +23613,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>852347</cardinality>
+            <cardinality>849782</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>844880</v>
+                    <v>844676</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1617</v>
+                    <v>94</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22792,12 +23635,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>837413</v>
+                                    <v>839570</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7466</v>
+                                    <v>5106</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22811,69 +23654,49 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>124</v>
+                                    <a>168</a>
+                                    <b>169</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
-                                    <b>45</b>
-                                    <v>124</v>
+                                    <a>215</a>
+                                    <b>216</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
-                                    <v>124</v>
+                                    <a>225</a>
+                                    <b>226</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
-                                    <v>124</v>
+                                    <a>533</a>
+                                    <b>534</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>112</a>
-                                    <b>113</b>
-                                    <v>124</v>
+                                    <a>821</a>
+                                    <b>822</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>199</a>
-                                    <b>200</b>
-                                    <v>124</v>
+                                    <a>1568</a>
+                                    <b>1569</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>325</a>
-                                    <b>326</b>
-                                    <v>124</v>
+                                    <a>4195</a>
+                                    <b>4196</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>547</a>
-                                    <b>548</b>
-                                    <v>124</v>
+                                    <a>18432</a>
+                                    <b>18433</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5462</a>
-                                    <b>5463</b>
-                                    <v>124</v>
+                                    <a>54893</a>
+                                    <b>54894</b>
+                                    <v>10</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22883,15 +23706,15 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9694786</cardinality>
+            <cardinality>9579810</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4002636</v>
+                    <v>3954724</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>2364</v>
+                    <v>2337</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22905,27 +23728,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526111</v>
+                                    <v>1507569</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>506132</v>
+                                    <v>499939</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1034042</v>
+                                    <v>1021657</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>691186</v>
+                                    <v>683402</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>245163</v>
+                                    <v>242156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22941,97 +23764,97 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>54</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>114</a>
                                     <b>115</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>216</a>
                                     <b>217</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>272</a>
                                     <b>273</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>356</a>
                                     <b>357</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>653</a>
                                     <b>654</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>769</a>
                                     <b>770</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>823</a>
                                     <b>824</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1096</a>
                                     <b>1097</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1261</a>
                                     <b>1262</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1670</a>
                                     <b>1671</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>3304</a>
-                                    <b>3305</b>
-                                    <v>124</v>
+                                    <a>3297</a>
+                                    <b>3298</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>3355</a>
-                                    <b>3356</b>
-                                    <v>124</v>
+                                    <a>3348</a>
+                                    <b>3349</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>6170</a>
-                                    <b>6171</b>
-                                    <v>124</v>
+                                    <a>6163</a>
+                                    <b>6164</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>15137</a>
-                                    <b>15138</b>
-                                    <v>124</v>
+                                    <a>15130</a>
+                                    <b>15131</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>19840</a>
-                                    <b>19841</b>
-                                    <v>124</v>
+                                    <a>19822</a>
+                                    <b>19823</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>22778</a>
-                                    <b>22779</b>
-                                    <v>124</v>
+                                    <a>22777</a>
+                                    <b>22778</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23041,15 +23864,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3078855</cardinality>
+            <cardinality>3216566</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2314866</v>
+                    <v>2461674</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1120</v>
+                    <v>1107</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23063,17 +23886,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1654293</v>
+                                    <v>1809034</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>557653</v>
+                                    <v>550880</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>102918</v>
+                                    <v>101759</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23089,47 +23912,47 @@
                                 <b>
                                     <a>97</a>
                                     <b>98</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>240</a>
                                     <b>241</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1091</a>
                                     <b>1092</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>1334</a>
-                                    <b>1335</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>2238</a>
                                     <b>2239</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>2816</a>
-                                    <b>2817</b>
-                                    <v>124</v>
+                                    <a>2746</a>
+                                    <b>2747</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>3492</a>
-                                    <b>3493</b>
-                                    <v>124</v>
+                                    <a>2812</a>
+                                    <b>2813</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>4939</a>
-                                    <b>4940</b>
-                                    <v>124</v>
+                                    <a>3506</a>
+                                    <b>3507</b>
+                                    <v>123</v>
+                                </b>
+                                <b>
+                                    <a>4918</a>
+                                    <b>4919</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>8493</a>
                                     <b>8494</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23139,15 +23962,15 @@
         </relation>
         <relation>
             <name>explicit_specifier_exprs</name>
-            <cardinality>41192</cardinality>
+            <cardinality>40728</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>41192</v>
+                    <v>40728</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>41192</v>
+                    <v>40728</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23161,7 +23984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41192</v>
+                                    <v>40728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23177,7 +24000,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41192</v>
+                                    <v>40728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23187,27 +24010,27 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>652234</cardinality>
+            <cardinality>644888</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>652234</v>
+                    <v>644888</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>373</v>
+                    <v>369</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2115</v>
+                    <v>2091</v>
                 </e>
                 <e>
                     <k>name_space</k>
-                    <v>248</v>
+                    <v>246</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>646136</v>
+                    <v>638859</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23221,7 +24044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>652234</v>
+                                    <v>644888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23237,7 +24060,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>652234</v>
+                                    <v>644888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23253,7 +24076,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>652234</v>
+                                    <v>644888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23269,7 +24092,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>652234</v>
+                                    <v>644888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23285,17 +24108,17 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>2406</a>
                                     <b>2407</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>2828</a>
                                     <b>2829</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23311,17 +24134,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23337,12 +24160,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23358,17 +24181,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>2360</a>
                                     <b>2361</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>2828</a>
                                     <b>2829</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23384,72 +24207,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>25</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>59</a>
                                     <b>60</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>63</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>73</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>341</a>
                                     <b>342</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1977</a>
                                     <b>1978</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>2629</a>
                                     <b>2630</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23465,12 +24288,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23486,7 +24309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2115</v>
+                                    <v>2091</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23502,77 +24325,77 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>25</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>59</a>
                                     <b>60</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>63</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>73</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>336</a>
                                     <b>337</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1977</a>
                                     <b>1978</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>2629</a>
                                     <b>2630</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23588,12 +24411,12 @@
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>5230</a>
                                     <b>5231</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23609,12 +24432,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23630,12 +24453,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23651,12 +24474,12 @@
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>5181</a>
                                     <b>5182</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23672,12 +24495,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>640287</v>
+                                    <v>633075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5849</v>
+                                    <v>5783</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23693,7 +24516,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>646136</v>
+                                    <v>638859</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23709,12 +24532,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>641034</v>
+                                    <v>633814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5102</v>
+                                    <v>5044</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23730,7 +24553,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>646136</v>
+                                    <v>638859</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23740,11 +24563,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>82085</cardinality>
+            <cardinality>82133</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>82085</v>
+                    <v>82133</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -23752,7 +24575,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>70847</v>
+                    <v>70889</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23760,7 +24583,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>56854</v>
+                    <v>56887</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23774,7 +24597,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82085</v>
+                                    <v>82133</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23790,7 +24613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82085</v>
+                                    <v>82133</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23806,7 +24629,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82085</v>
+                                    <v>82133</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23822,7 +24645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82085</v>
+                                    <v>82133</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23942,12 +24765,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65410</v>
+                                    <v>65448</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>5316</v>
+                                    <v>5319</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -23968,12 +24791,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69340</v>
+                                    <v>69380</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1507</v>
+                                    <v>1508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23989,12 +24812,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67821</v>
+                                    <v>67860</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3026</v>
+                                    <v>3028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24010,12 +24833,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68350</v>
+                                    <v>68390</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>2497</v>
+                                    <v>2498</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24195,17 +25018,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41266</v>
+                                    <v>41291</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11789</v>
+                                    <v>11796</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>25</b>
-                                    <v>3797</v>
+                                    <v>3799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24221,12 +25044,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47377</v>
+                                    <v>47405</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9476</v>
+                                    <v>9482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24242,17 +25065,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42613</v>
+                                    <v>42638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12227</v>
+                                    <v>12234</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>2013</v>
+                                    <v>2015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24268,7 +25091,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56606</v>
+                                    <v>56639</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24283,15 +25106,15 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>16585</cardinality>
+            <cardinality>16429</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>16585</v>
+                    <v>16429</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>507</v>
+                    <v>502</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24305,7 +25128,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16585</v>
+                                    <v>16429</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24321,7 +25144,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>203</v>
+                                    <v>201</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -24439,15 +25262,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71626</cardinality>
+            <cardinality>71243</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71626</v>
+                    <v>71243</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71626</v>
+                    <v>71243</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24461,7 +25284,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71626</v>
+                                    <v>71243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24477,7 +25300,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71626</v>
+                                    <v>71243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24487,15 +25310,15 @@
         </relation>
         <relation>
             <name>attribute_arg_expr</name>
-            <cardinality>1587</cardinality>
+            <cardinality>1582</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>1587</v>
+                    <v>1582</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1587</v>
+                    <v>1582</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24509,7 +25332,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1587</v>
+                                    <v>1582</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24525,7 +25348,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1587</v>
+                                    <v>1582</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24588,15 +25411,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>96074</cardinality>
+            <cardinality>94992</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>94331</v>
+                    <v>93269</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>32356</v>
+                    <v>31992</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24610,12 +25433,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>92589</v>
+                                    <v>91546</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1742</v>
+                                    <v>1722</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24631,17 +25454,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27876</v>
+                                    <v>27562</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>2488</v>
+                                    <v>2460</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>58</b>
-                                    <v>1991</v>
+                                    <v>1968</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24651,15 +25474,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>841520</cardinality>
+            <cardinality>830073</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>797092</v>
+                    <v>786146</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>615273</v>
+                    <v>608343</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24673,12 +25496,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>757144</v>
+                                    <v>746648</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>39947</v>
+                                    <v>39498</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24694,12 +25517,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>570347</v>
+                                    <v>563923</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>213</b>
-                                    <v>44925</v>
+                                    <v>44419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24772,15 +25595,15 @@
         </relation>
         <relation>
             <name>namespaceattributes</name>
-            <cardinality>5957</cardinality>
+            <cardinality>5901</cardinality>
             <columnsizes>
                 <e>
                     <k>namespace_id</k>
-                    <v>135</v>
+                    <v>134</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>5957</v>
+                    <v>5901</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24820,7 +25643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5957</v>
+                                    <v>5901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24830,15 +25653,15 @@
         </relation>
         <relation>
             <name>stmtattributes</name>
-            <cardinality>2230</cardinality>
+            <cardinality>2223</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt_id</k>
-                    <v>2230</v>
+                    <v>2223</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>579</v>
+                    <v>577</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24852,7 +25675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2230</v>
+                                    <v>2223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24873,7 +25696,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>150</v>
+                                    <v>149</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24883,7 +25706,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>107</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -24898,15 +25721,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7228466</cardinality>
+            <cardinality>7381947</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7228466</v>
+                    <v>7381947</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>3955719</v>
+                    <v>4143724</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24920,7 +25743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7228466</v>
+                                    <v>7381947</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24936,22 +25759,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2475280</v>
+                                    <v>2676022</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1114436</v>
+                                    <v>1106067</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>304027</v>
+                                    <b>8</b>
+                                    <v>312292</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
+                                    <a>8</a>
                                     <b>892</b>
-                                    <v>61975</v>
+                                    <v>49341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24961,19 +25784,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4182340</cardinality>
+            <cardinality>4133757</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>541973</v>
+                    <v>535991</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>29618</v>
+                    <v>29285</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4177735</v>
+                    <v>4129205</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24987,57 +25810,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>128679</v>
+                                    <v>127722</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83131</v>
+                                    <v>81949</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32356</v>
+                                    <v>31992</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44801</v>
+                                    <v>44296</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>42312</v>
+                                    <v>41712</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>33849</v>
+                                    <v>33468</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>42188</v>
+                                    <v>41712</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>41068</v>
+                                    <v>40605</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>41192</v>
+                                    <v>40728</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>40694</v>
+                                    <v>40236</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>239</b>
-                                    <v>11698</v>
+                                    <v>11566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25053,57 +25876,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>128430</v>
+                                    <v>127476</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83256</v>
+                                    <v>82072</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32107</v>
+                                    <v>31746</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44925</v>
+                                    <v>44542</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>42436</v>
+                                    <v>41712</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>32729</v>
+                                    <v>32361</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>42561</v>
+                                    <v>42082</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>41441</v>
+                                    <v>40974</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>41316</v>
+                                    <v>40851</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>40694</v>
+                                    <v>40236</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>265</b>
-                                    <v>12071</v>
+                                    <v>11935</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25119,57 +25942,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6471</v>
+                                    <v>6398</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2613</v>
+                                    <v>2583</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>2862</v>
+                                    <v>2830</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>2240</v>
+                                    <v>2214</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>26</b>
-                                    <v>2240</v>
+                                    <v>2214</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>36</b>
-                                    <v>2488</v>
+                                    <v>2460</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>50</b>
-                                    <v>2240</v>
+                                    <v>2214</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>141</b>
-                                    <v>2240</v>
+                                    <v>2214</v>
                                 </b>
                                 <b>
                                     <a>150</a>
                                     <b>468</b>
-                                    <v>2240</v>
+                                    <v>2214</v>
                                 </b>
                                 <b>
                                     <a>480</a>
-                                    <b>4310</b>
-                                    <v>2115</v>
+                                    <b>4311</b>
+                                    <v>2091</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25185,57 +26008,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5475</v>
+                                    <v>5414</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3609</v>
+                                    <v>3568</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>2862</v>
+                                    <v>2830</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>20</b>
-                                    <v>2240</v>
+                                    <v>2214</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>27</b>
-                                    <v>2240</v>
+                                    <v>2214</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>37</b>
-                                    <v>2613</v>
+                                    <v>2583</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>56</b>
-                                    <v>2364</v>
+                                    <v>2337</v>
                                 </b>
                                 <b>
                                     <a>58</a>
-                                    <b>156</b>
-                                    <v>2240</v>
+                                    <b>155</b>
+                                    <v>2214</v>
                                 </b>
                                 <b>
                                     <a>164</a>
                                     <b>528</b>
-                                    <v>2240</v>
+                                    <v>2214</v>
                                 </b>
                                 <b>
                                     <a>548</a>
                                     <b>4332</b>
-                                    <v>1866</v>
+                                    <v>1845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25251,7 +26074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4177735</v>
+                                    <v>4129205</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25267,12 +26090,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4173131</v>
+                                    <v>4124652</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4604</v>
+                                    <v>4552</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25282,15 +26105,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>114977</cardinality>
+            <cardinality>114597</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>114977</v>
+                    <v>114597</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>69091</v>
+                    <v>68863</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25304,7 +26127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114977</v>
+                                    <v>114597</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25320,22 +26143,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37470</v>
+                                    <v>37346</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24478</v>
+                                    <v>24397</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6059</v>
+                                    <v>6039</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>45</b>
-                                    <v>1083</v>
+                                    <v>1079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25345,27 +26168,27 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>473794</cardinality>
+            <cardinality>491402</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>473794</v>
+                    <v>491402</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>452200</v>
+                    <v>470011</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>236</v>
+                    <v>234</v>
                 </e>
                 <e>
                     <k>super</k>
-                    <v>234020</v>
+                    <v>238962</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>35167</v>
+                    <v>34836</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25379,7 +26202,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473794</v>
+                                    <v>491402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25395,7 +26218,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473794</v>
+                                    <v>491402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25411,7 +26234,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473794</v>
+                                    <v>491402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25427,7 +26250,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473794</v>
+                                    <v>491402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25443,12 +26266,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435784</v>
+                                    <v>453749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16415</v>
+                                    <v>16261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25464,12 +26287,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435784</v>
+                                    <v>453749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16415</v>
+                                    <v>16261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25485,12 +26308,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435784</v>
+                                    <v>453749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16415</v>
+                                    <v>16261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25506,12 +26329,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435784</v>
+                                    <v>453749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16415</v>
+                                    <v>16261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25527,7 +26350,7 @@
                                 <b>
                                     <a>25</a>
                                     <b>26</b>
-                                    <v>101</v>
+                                    <v>100</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -25545,8 +26368,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>13360</a>
-                                    <b>13361</b>
+                                    <a>14018</a>
+                                    <b>14019</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -25563,7 +26386,7 @@
                                 <b>
                                     <a>25</a>
                                     <b>26</b>
-                                    <v>135</v>
+                                    <v>134</v>
                                 </b>
                                 <b>
                                     <a>52</a>
@@ -25576,8 +26399,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>13360</a>
-                                    <b>13361</b>
+                                    <a>14018</a>
+                                    <b>14019</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -25617,8 +26440,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>6510</a>
-                                    <b>6511</b>
+                                    <a>6723</a>
+                                    <b>6724</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -25635,7 +26458,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>135</v>
+                                    <v>134</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -25666,12 +26489,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>224272</v>
+                                    <v>229205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>1655</b>
-                                    <v>9748</v>
+                                    <b>1758</b>
+                                    <v>9756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25687,12 +26510,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>224272</v>
+                                    <v>229205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>1655</b>
-                                    <v>9748</v>
+                                    <b>1758</b>
+                                    <v>9756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25708,12 +26531,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233580</v>
+                                    <v>238526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>440</v>
+                                    <v>435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25729,12 +26552,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>228706</v>
+                                    <v>233597</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>81</b>
-                                    <v>5314</v>
+                                    <v>5364</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25750,27 +26573,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26333</v>
+                                    <v>25850</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3113</v>
+                                    <v>3185</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>22</b>
-                                    <v>2741</v>
+                                    <v>2782</v>
                                 </b>
                                 <b>
                                     <a>22</a>
-                                    <b>383</b>
-                                    <v>2673</v>
+                                    <b>371</b>
+                                    <v>2615</v>
                                 </b>
                                 <b>
-                                    <a>388</a>
-                                    <b>928</b>
-                                    <v>304</v>
+                                    <a>379</a>
+                                    <b>985</b>
+                                    <v>402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25786,27 +26609,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26333</v>
+                                    <v>25850</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3113</v>
+                                    <v>3185</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>22</b>
-                                    <v>2741</v>
+                                    <v>2782</v>
                                 </b>
                                 <b>
                                     <a>22</a>
-                                    <b>383</b>
-                                    <v>2673</v>
+                                    <b>371</b>
+                                    <v>2615</v>
                                 </b>
                                 <b>
-                                    <a>388</a>
-                                    <b>928</b>
-                                    <v>304</v>
+                                    <a>379</a>
+                                    <b>985</b>
+                                    <v>402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25822,7 +26645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35167</v>
+                                    <v>34836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25838,22 +26661,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28533</v>
+                                    <v>28164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2606</v>
+                                    <v>2548</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>26</b>
-                                    <v>2809</v>
+                                    <b>24</b>
+                                    <v>2615</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>928</b>
-                                    <v>1218</v>
+                                    <a>24</a>
+                                    <b>933</b>
+                                    <v>1508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25863,15 +26686,15 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>475554</cardinality>
+            <cardinality>493146</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>473354</v>
+                    <v>490966</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>135</v>
+                    <v>134</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25885,12 +26708,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>471154</v>
+                                    <v>488787</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2200</v>
+                                    <v>2179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25919,8 +26742,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>12789</a>
-                                    <b>12790</b>
+                                    <a>13447</a>
+                                    <b>13448</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -25931,15 +26754,15 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>447055</cardinality>
+            <cardinality>464914</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>447055</v>
+                    <v>464914</v>
                 </e>
                 <e>
                     <k>offset</k>
-                    <v>507</v>
+                    <v>502</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25953,7 +26776,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447055</v>
+                                    <v>464914</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25969,17 +26792,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>101</v>
+                                    <v>100</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>135</v>
+                                    <v>134</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>101</v>
+                                    <v>100</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -26002,8 +26825,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>13058</a>
-                                    <b>13059</b>
+                                    <a>13716</a>
+                                    <b>13717</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26014,19 +26837,19 @@
         </relation>
         <relation>
             <name>virtual_base_offsets</name>
-            <cardinality>5787</cardinality>
+            <cardinality>5733</cardinality>
             <columnsizes>
                 <e>
                     <k>sub</k>
-                    <v>5787</v>
+                    <v>5733</v>
                 </e>
                 <e>
                     <k>super</k>
-                    <v>101</v>
+                    <v>100</v>
                 </e>
                 <e>
                     <k>offset</k>
-                    <v>338</v>
+                    <v>335</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26040,7 +26863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5787</v>
+                                    <v>5733</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26056,7 +26879,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5787</v>
+                                    <v>5733</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26114,7 +26937,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>304</v>
+                                    <v>301</v>
                                 </b>
                                 <b>
                                     <a>153</a>
@@ -26140,7 +26963,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>304</v>
+                                    <v>301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26150,23 +26973,23 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>767534</cardinality>
+            <cardinality>759702</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>767534</v>
+                    <v>759702</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>54340</v>
+                    <v>53847</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>100695</v>
+                    <v>99782</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6056</v>
+                    <v>6001</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26180,7 +27003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>767534</v>
+                                    <v>759702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26196,7 +27019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>767534</v>
+                                    <v>759702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26212,7 +27035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>767534</v>
+                                    <v>759702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26228,42 +27051,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5582</v>
+                                    <v>5532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>25004</v>
+                                    <v>24778</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4770</v>
+                                    <v>4794</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4737</v>
+                                    <v>4627</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>27</b>
-                                    <v>4466</v>
+                                    <v>4425</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>45</b>
-                                    <v>4297</v>
+                                    <v>4258</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>81</b>
-                                    <v>4737</v>
+                                    <v>4694</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>121</b>
-                                    <v>744</v>
+                                    <v>737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26279,42 +27102,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5582</v>
+                                    <v>5532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>25004</v>
+                                    <v>24778</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4770</v>
+                                    <v>4794</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4737</v>
+                                    <v>4627</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>27</b>
-                                    <v>4466</v>
+                                    <v>4425</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>45</b>
-                                    <v>4297</v>
+                                    <v>4258</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>81</b>
-                                    <v>4737</v>
+                                    <v>4694</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>121</b>
-                                    <v>744</v>
+                                    <v>737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26330,12 +27153,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52987</v>
+                                    <v>52506</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>1353</v>
+                                    <v>1341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26351,32 +27174,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67502</v>
+                                    <v>66890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8120</v>
+                                    <v>8046</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9203</v>
+                                    <v>9119</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7613</v>
+                                    <v>7544</v>
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>136</b>
-                                    <v>7646</v>
+                                    <b>134</b>
+                                    <v>7544</v>
                                 </b>
                                 <b>
-                                    <a>136</a>
+                                    <a>135</a>
                                     <b>191</b>
-                                    <v>609</v>
+                                    <v>637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26392,32 +27215,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67502</v>
+                                    <v>66890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8120</v>
+                                    <v>8046</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9203</v>
+                                    <v>9119</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7613</v>
+                                    <v>7544</v>
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>136</b>
-                                    <v>7646</v>
+                                    <b>134</b>
+                                    <v>7544</v>
                                 </b>
                                 <b>
-                                    <a>136</a>
+                                    <a>135</a>
                                     <b>191</b>
-                                    <v>609</v>
+                                    <v>637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26433,12 +27256,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99477</v>
+                                    <v>98575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1218</v>
+                                    <v>1207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26454,12 +27277,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5684</v>
+                                    <v>5632</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>22495</b>
-                                    <v>372</v>
+                                    <b>22469</b>
+                                    <v>368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26475,12 +27298,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5921</v>
+                                    <v>5867</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1509</b>
-                                    <v>135</v>
+                                    <v>134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26496,12 +27319,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5718</v>
+                                    <v>5666</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2844</b>
-                                    <v>338</v>
+                                    <v>335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26511,19 +27334,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11208578</cardinality>
+            <cardinality>11082335</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11208578</v>
+                    <v>11082335</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4294966</v>
+                    <v>4246591</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11208578</v>
+                    <v>11082335</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26537,7 +27360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208578</v>
+                                    <v>11082335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26553,7 +27376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208578</v>
+                                    <v>11082335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26569,17 +27392,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3920500</v>
+                                    <v>3876344</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>322819</v>
+                                    <v>319183</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>34447</b>
-                                    <v>51646</v>
+                                    <v>51064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26595,17 +27418,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3920500</v>
+                                    <v>3876344</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>322819</v>
+                                    <v>319183</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>34447</b>
-                                    <v>51646</v>
+                                    <v>51064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26621,7 +27444,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208578</v>
+                                    <v>11082335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26637,7 +27460,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208578</v>
+                                    <v>11082335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26647,15 +27470,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3905318</cardinality>
+            <cardinality>3861332</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3342686</v>
+                    <v>3305037</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3740175</v>
+                    <v>3698049</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26669,12 +27492,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3281209</v>
+                                    <v>3244252</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1706</b>
-                                    <v>61477</v>
+                                    <v>60785</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26690,12 +27513,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3575031</v>
+                                    <v>3534766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165143</v>
+                                    <v>163283</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26705,15 +27528,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9634075</cardinality>
+            <cardinality>9637003</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9633970</v>
+                    <v>9636897</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9634075</v>
+                    <v>9637003</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26727,7 +27550,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9633864</v>
+                                    <v>9636792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26748,7 +27571,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9634075</v>
+                                    <v>9637003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26758,30 +27581,30 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9923218</cardinality>
+            <cardinality>9885625</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9923218</v>
+                    <v>9885625</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1666585</cardinality>
+            <cardinality>1661392</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1241154</v>
+                    <v>1237287</v>
                 </e>
                 <e>
                     <k>i</k>
-                    <v>386</v>
+                    <v>384</v>
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1666585</v>
+                    <v>1661392</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26795,17 +27618,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>826149</v>
+                                    <v>823575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408226</v>
+                                    <v>406955</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6778</v>
+                                    <v>6757</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26821,17 +27644,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>826149</v>
+                                    <v>823575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408226</v>
+                                    <v>406955</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6778</v>
+                                    <v>6757</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26979,7 +27802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1666585</v>
+                                    <v>1661392</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26995,7 +27818,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1666585</v>
+                                    <v>1661392</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27005,15 +27828,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>8615</cardinality>
+            <cardinality>8586</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8615</v>
+                    <v>8586</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>4554</v>
+                    <v>4539</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27027,7 +27850,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8615</v>
+                                    <v>8586</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27043,17 +27866,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3723</v>
+                                    <v>3711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>525</v>
+                                    <v>524</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>149</b>
-                                    <v>305</v>
+                                    <v>304</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27063,26 +27886,26 @@
         </relation>
         <relation>
             <name>namespace_inline</name>
-            <cardinality>497</cardinality>
+            <cardinality>492</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>497</v>
+                    <v>492</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2110397</cardinality>
+            <cardinality>2483823</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>3982</v>
+                    <v>3937</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2110397</v>
+                    <v>2483823</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27096,67 +27919,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>497</v>
+                                    <v>492</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>497</v>
+                                    <v>492</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>622</v>
+                                    <v>615</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>18</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>21</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>24</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>29</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>83</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
-                                    <a>165</a>
-                                    <b>170</b>
-                                    <v>248</v>
+                                    <a>169</a>
+                                    <b>182</b>
+                                    <v>246</v>
                                 </b>
                                 <b>
-                                    <a>16228</a>
-                                    <b>16229</b>
-                                    <v>124</v>
+                                    <a>19440</a>
+                                    <b>19441</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27172,7 +27995,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2110397</v>
+                                    <v>2483823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27182,19 +28005,19 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19456298</cardinality>
+            <cardinality>19462195</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19456298</v>
+                    <v>19462195</v>
                 </e>
                 <e>
                     <k>child_index</k>
-                    <v>20037</v>
+                    <v>20043</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12941382</v>
+                    <v>12945304</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27208,7 +28031,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19456298</v>
+                                    <v>19462195</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27224,7 +28047,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19456298</v>
+                                    <v>19462195</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27240,12 +28063,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3855</v>
+                                    <v>3856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1519</v>
+                                    <v>1520</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27255,7 +28078,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8977</v>
+                                    <v>8980</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27270,7 +28093,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>53</b>
-                                    <v>1519</v>
+                                    <v>1520</v>
                                 </b>
                                 <b>
                                     <a>56</a>
@@ -27291,12 +28114,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3855</v>
+                                    <v>3856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1519</v>
+                                    <v>1520</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27306,7 +28129,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8977</v>
+                                    <v>8980</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27321,7 +28144,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>53</b>
-                                    <v>1519</v>
+                                    <v>1520</v>
                                 </b>
                                 <b>
                                     <a>56</a>
@@ -27342,17 +28165,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7395566</v>
+                                    <v>7397807</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5083216</v>
+                                    <v>5084757</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>462599</v>
+                                    <v>462739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27368,17 +28191,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7395566</v>
+                                    <v>7397807</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5083216</v>
+                                    <v>5084757</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>462599</v>
+                                    <v>462739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27388,22 +28211,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6897613</cardinality>
+            <cardinality>6919045</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6897613</v>
+                    <v>6919045</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6051176</cardinality>
+            <cardinality>6052846</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6051176</v>
+                    <v>6052846</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27421,7 +28244,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6051176</v>
+                                    <v>6052846</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27445,28 +28268,28 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>7371</a>
-                                    <b>7372</b>
+                                    <a>7370</a>
+                                    <b>7371</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>40984</a>
-                                    <b>40985</b>
+                                    <a>40990</a>
+                                    <b>40991</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>71408</a>
-                                    <b>71409</b>
+                                    <a>71404</a>
+                                    <b>71405</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>93454</a>
-                                    <b>93455</b>
+                                    <a>93465</a>
+                                    <b>93466</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5832066</a>
-                                    <b>5832067</b>
+                                    <a>5833724</a>
+                                    <b>5833725</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -27477,11 +28300,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5790597</cardinality>
+            <cardinality>5772727</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5790597</v>
+                    <v>5772727</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27499,7 +28322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5790597</v>
+                                    <v>5772727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27518,13 +28341,13 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>1409</a>
-                                    <b>1410</b>
+                                    <a>1484</a>
+                                    <b>1485</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>268311</a>
-                                    <b>268312</b>
+                                    <a>268244</a>
+                                    <b>268245</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -27535,15 +28358,15 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>640909</cardinality>
+            <cardinality>730405</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>640909</v>
+                    <v>730405</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>995</v>
+                    <v>984</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27557,7 +28380,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>640909</v>
+                                    <v>730405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27573,37 +28396,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>28</a>
-                                    <b>29</b>
-                                    <v>248</v>
+                                    <a>27</a>
+                                    <b>28</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>61</a>
-                                    <b>62</b>
-                                    <v>124</v>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>219</a>
-                                    <b>220</b>
-                                    <v>124</v>
+                                    <a>68</a>
+                                    <b>69</b>
+                                    <v>123</v>
+                                </b>
+                                <b>
+                                    <a>404</a>
+                                    <b>405</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>1573</a>
-                                    <b>1574</b>
-                                    <v>124</v>
+                                    <a>1998</a>
+                                    <b>1999</b>
+                                    <v>123</v>
                                 </b>
                                 <b>
-                                    <a>3234</a>
-                                    <b>3235</b>
-                                    <v>124</v>
+                                    <a>3393</a>
+                                    <b>3394</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27613,15 +28441,15 @@
         </relation>
         <relation>
             <name>specialnamequalifyingelements</name>
-            <cardinality>124</cardinality>
+            <cardinality>123</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>124</v>
+                    <v>123</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>124</v>
+                    <v>123</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27635,7 +28463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27651,7 +28479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27661,23 +28489,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3042471</cardinality>
+            <cardinality>3051489</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3042471</v>
+                    <v>3051489</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3042471</v>
+                    <v>3051489</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>47727</v>
+                    <v>54656</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>554584</v>
+                    <v>558951</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27691,7 +28519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042471</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27707,7 +28535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042471</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27723,7 +28551,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042471</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27739,7 +28567,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042471</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27755,7 +28583,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042471</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27771,7 +28599,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042471</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27787,27 +28615,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31446</v>
+                                    <v>37827</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8172</v>
+                                    <v>8275</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4139</v>
+                                    <v>4212</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>86</b>
-                                    <v>3582</v>
+                                    <b>209</b>
+                                    <v>4105</v>
                                 </b>
                                 <b>
-                                    <a>88</a>
+                                    <a>234</a>
                                     <b>41956</b>
-                                    <v>386</v>
+                                    <v>235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27823,27 +28651,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31446</v>
+                                    <v>37827</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8172</v>
+                                    <v>8275</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4139</v>
+                                    <v>4212</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>86</b>
-                                    <v>3582</v>
+                                    <b>209</b>
+                                    <v>4105</v>
                                 </b>
                                 <b>
-                                    <a>88</a>
+                                    <a>234</a>
                                     <b>41956</b>
-                                    <v>386</v>
+                                    <v>235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27859,22 +28687,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34664</v>
+                                    <v>41441</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7336</v>
+                                    <v>7420</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>3582</v>
+                                    <b>7</b>
+                                    <v>4148</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>20057</b>
-                                    <v>2145</v>
+                                    <a>7</a>
+                                    <b>20059</b>
+                                    <v>1646</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27890,22 +28718,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79410</v>
+                                    <v>83268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>41013</v>
+                                    <v>42275</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>397780</v>
+                                    <v>396712</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36380</v>
+                                    <v>36694</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27921,22 +28749,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79410</v>
+                                    <v>83268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>41013</v>
+                                    <v>42275</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>397780</v>
+                                    <v>396712</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36380</v>
+                                    <v>36694</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27952,22 +28780,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114953</v>
+                                    <v>119492</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>13320</v>
+                                    <v>14070</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>414040</v>
+                                    <v>412921</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>33</b>
-                                    <v>12269</v>
+                                    <b>60</b>
+                                    <v>12466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27977,15 +28805,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8255503</cardinality>
+            <cardinality>8258005</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8255503</v>
+                    <v>8258005</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>1050487</v>
+                    <v>1050805</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27999,7 +28827,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8255503</v>
+                                    <v>8258005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28015,52 +28843,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171554</v>
+                                    <v>171606</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>188720</v>
+                                    <v>188777</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>145663</v>
+                                    <v>145707</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>116648</v>
+                                    <v>116684</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>83159</v>
+                                    <v>83185</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>65824</v>
+                                    <v>65844</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>80824</v>
+                                    <v>80848</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>81583</v>
+                                    <v>81608</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>27</b>
-                                    <v>79135</v>
+                                    <v>79159</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>5137</b>
-                                    <v>37372</v>
+                                    <v>37383</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28070,15 +28898,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5805870</cardinality>
+            <cardinality>5787737</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5803403</v>
+                    <v>5785278</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>275275</v>
+                    <v>274929</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28092,12 +28920,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5800937</v>
+                                    <v>5782819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2466</v>
+                                    <v>2459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28113,27 +28941,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>181064</v>
+                                    <v>180670</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38310</v>
+                                    <v>38212</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>16903</v>
+                                    <v>16743</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>22930</v>
+                                    <v>23308</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>37798</b>
-                                    <v>16066</v>
+                                    <v>15994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28143,19 +28971,19 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>44949</cardinality>
+            <cardinality>44756</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>44949</v>
+                    <v>44756</v>
                 </e>
                 <e>
                     <k>func</k>
-                    <v>101</v>
+                    <v>64</v>
                 </e>
                 <e>
                     <k>form</k>
-                    <v>33</v>
+                    <v>21</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28169,7 +28997,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44949</v>
+                                    <v>44756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28185,7 +29013,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44949</v>
+                                    <v>44756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28199,19 +29027,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>33</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>591</a>
-                                    <b>592</b>
-                                    <v>33</v>
+                                    <a>369</a>
+                                    <b>370</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>736</a>
-                                    <b>737</b>
-                                    <v>33</v>
+                                    <a>1722</a>
+                                    <b>1723</b>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28227,7 +29055,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>101</v>
+                                    <v>64</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28241,9 +29069,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1328</a>
-                                    <b>1329</b>
-                                    <v>33</v>
+                                    <a>2093</a>
+                                    <b>2094</b>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28259,7 +29087,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>33</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28269,15 +29097,15 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>53478</cardinality>
+            <cardinality>52976</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>53478</v>
+                    <v>52976</v>
                 </e>
                 <e>
                     <k>func</k>
-                    <v>101</v>
+                    <v>100</v>
                 </e>
                 <e>
                     <k>form</k>
@@ -28295,7 +29123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53478</v>
+                                    <v>52976</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28311,7 +29139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53478</v>
+                                    <v>52976</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28353,7 +29181,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>101</v>
+                                    <v>100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28416,15 +29244,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>897972</cardinality>
+            <cardinality>898245</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897972</v>
+                    <v>898245</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>897972</v>
+                    <v>898245</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28438,7 +29266,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897972</v>
+                                    <v>898245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28454,7 +29282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897972</v>
+                                    <v>898245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28464,15 +29292,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>897968</cardinality>
+            <cardinality>898241</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897968</v>
+                    <v>898241</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>897968</v>
+                    <v>898241</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28486,7 +29314,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897968</v>
+                                    <v>898241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28502,7 +29330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897968</v>
+                                    <v>898241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28512,15 +29340,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>897972</cardinality>
+            <cardinality>898245</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897972</v>
+                    <v>898245</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>897972</v>
+                    <v>898245</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28534,7 +29362,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897972</v>
+                                    <v>898245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28550,7 +29378,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897972</v>
+                                    <v>898245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28560,15 +29388,15 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13541565</cardinality>
+            <cardinality>13547187</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13541565</v>
+                    <v>13547187</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>113909</v>
+                    <v>113976</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28582,7 +29410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13541565</v>
+                                    <v>13547187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28598,12 +29426,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77855</v>
+                                    <v>77901</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15207</v>
+                                    <v>15222</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28613,12 +29441,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>52</b>
-                                    <v>8579</v>
+                                    <v>8584</v>
                                 </b>
                                 <b>
                                     <a>52</a>
-                                    <b>682255</b>
-                                    <v>3429</v>
+                                    <b>682207</b>
+                                    <v>3431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28628,15 +29456,15 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6637657</cardinality>
+            <cardinality>6648929</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6637657</v>
+                    <v>6648929</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>1095316</v>
+                    <v>1095328</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28650,7 +29478,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6637657</v>
+                                    <v>6648929</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28666,22 +29494,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>833959</v>
+                                    <v>833960</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>146911</v>
+                                    <v>146908</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>86574</v>
+                                    <v>86573</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>593719</b>
-                                    <v>27872</v>
+                                    <b>593781</b>
+                                    <v>27887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28691,15 +29519,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13649715</cardinality>
+            <cardinality>13655401</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13541565</v>
+                    <v>13547187</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13649715</v>
+                    <v>13655401</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28713,12 +29541,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13451407</v>
+                                    <v>13456977</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>90157</v>
+                                    <v>90210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28734,7 +29562,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13649715</v>
+                                    <v>13655401</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28744,15 +29572,15 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1502766</cardinality>
+            <cardinality>1503222</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1502766</v>
+                    <v>1503222</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
-                    <v>31367</v>
+                    <v>31377</v>
                 </e>
                 <e>
                     <k>bitoffset</k>
@@ -28770,7 +29598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1502766</v>
+                                    <v>1503222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28786,7 +29614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1502766</v>
+                                    <v>1503222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28802,22 +29630,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17698</v>
+                                    <v>17704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2450</v>
+                                    <v>2451</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2668</v>
+                                    <v>2669</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>2613</v>
+                                    <v>2614</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -28848,12 +29676,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30333</v>
+                                    <v>30342</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>1034</v>
+                                    <v>1035</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28950,19 +29778,19 @@
         </relation>
         <relation>
             <name>bitfield</name>
-            <cardinality>30240</cardinality>
+            <cardinality>29900</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30240</v>
+                    <v>29900</v>
                 </e>
                 <e>
                     <k>bits</k>
-                    <v>3484</v>
+                    <v>3445</v>
                 </e>
                 <e>
                     <k>declared_bits</k>
-                    <v>3484</v>
+                    <v>3445</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28976,7 +29804,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30240</v>
+                                    <v>29900</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28992,7 +29820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30240</v>
+                                    <v>29900</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29008,42 +29836,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>995</v>
+                                    <v>984</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>746</v>
+                                    <v>738</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>497</v>
+                                    <v>492</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>11</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>143</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29059,7 +29887,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3484</v>
+                                    <v>3445</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29075,42 +29903,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>995</v>
+                                    <v>984</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>746</v>
+                                    <v>738</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>497</v>
+                                    <v>492</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>11</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>143</b>
-                                    <v>248</v>
+                                    <v>246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29126,7 +29954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3484</v>
+                                    <v>3445</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29136,23 +29964,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2245206</cardinality>
+            <cardinality>2245054</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2245206</v>
+                    <v>2245054</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>979091</v>
+                    <v>979258</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2245206</v>
+                    <v>2245054</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>515984</v>
+                    <v>515871</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29166,7 +29994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245206</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29182,7 +30010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245206</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29198,7 +30026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245206</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29214,17 +30042,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869052</v>
+                                    <v>869246</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>37306</v>
+                                    <v>37296</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72733</v>
+                                    <v>72715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29240,17 +30068,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869052</v>
+                                    <v>869246</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>37306</v>
+                                    <v>37296</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72733</v>
+                                    <v>72715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29266,7 +30094,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>979083</v>
+                                    <v>979250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29287,7 +30115,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245206</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29303,7 +30131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245206</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29319,7 +30147,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245206</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29335,22 +30163,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414456</v>
+                                    <v>414351</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33500</v>
+                                    <v>33491</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>41937</v>
+                                    <v>41935</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>111939</b>
-                                    <v>26090</v>
+                                    <v>26092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29366,17 +30194,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>443688</v>
+                                    <v>443577</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34407</v>
+                                    <v>34398</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>12248</b>
-                                    <v>37889</v>
+                                    <v>37895</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29392,22 +30220,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414456</v>
+                                    <v>414351</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33500</v>
+                                    <v>33491</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>41937</v>
+                                    <v>41935</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>111939</b>
-                                    <v>26090</v>
+                                    <v>26092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29417,26 +30245,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>67650</cardinality>
+            <cardinality>67182</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>67650</v>
+                    <v>67182</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1672548</cardinality>
+            <cardinality>1667337</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1672548</v>
+                    <v>1667337</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>837089</v>
+                    <v>834481</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29450,7 +30278,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1672548</v>
+                                    <v>1667337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29466,17 +30294,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17031</v>
+                                    <v>16978</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>810018</v>
+                                    <v>807494</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>10038</v>
+                                    <v>10007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29486,19 +30314,19 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25213265</cardinality>
+            <cardinality>25220907</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25213265</v>
+                    <v>25220907</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1450</v>
+                    <v>1451</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10586812</v>
+                    <v>10590021</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29512,7 +30340,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213265</v>
+                                    <v>25220907</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29528,7 +30356,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213265</v>
+                                    <v>25220907</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29706,22 +30534,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8904645</v>
+                                    <v>8907344</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>820704</v>
+                                    <v>820953</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>16</b>
-                                    <v>797292</v>
+                                    <v>797534</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>71733</b>
-                                    <v>64169</v>
+                                    <v>64188</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29737,17 +30565,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9044064</v>
+                                    <v>9046805</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>774363</v>
+                                    <v>774598</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>768384</v>
+                                    <v>768617</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29757,15 +30585,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>844446</cardinality>
+            <cardinality>841815</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>844446</v>
+                    <v>841815</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>844446</v>
+                    <v>841815</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -29783,7 +30611,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844446</v>
+                                    <v>841815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29799,7 +30627,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844446</v>
+                                    <v>841815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29815,7 +30643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844446</v>
+                                    <v>841815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29831,7 +30659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844446</v>
+                                    <v>841815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29883,15 +30711,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25213265</cardinality>
+            <cardinality>25220907</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25213265</v>
+                    <v>25220907</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>214227</v>
+                    <v>214292</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -29909,7 +30737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213265</v>
+                                    <v>25220907</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29925,7 +30753,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213265</v>
+                                    <v>25220907</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29941,52 +30769,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52518</v>
+                                    <v>52534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>35195</v>
+                                    <v>35206</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>14509</v>
+                                    <v>14513</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14531</v>
+                                    <v>14535</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>17564</v>
+                                    <v>17570</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>17388</v>
+                                    <v>17394</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>24</b>
-                                    <v>16443</v>
+                                    <v>16448</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>49</b>
-                                    <v>16069</v>
+                                    <v>16074</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>134</b>
-                                    <v>16179</v>
+                                    <v>16184</v>
                                 </b>
                                 <b>
                                     <a>134</a>
                                     <b>441492</b>
-                                    <v>13827</v>
+                                    <v>13831</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30002,12 +30830,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>185935</v>
+                                    <v>185991</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>28292</v>
+                                    <v>28301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30070,15 +30898,15 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>45896</cardinality>
+            <cardinality>45504</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>45896</v>
+                    <v>45504</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>27213</v>
+                    <v>38362</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30092,7 +30920,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45896</v>
+                                    <v>45504</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30108,17 +30936,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11440</v>
+                                    <v>36886</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>14385</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
                                     <b>19</b>
-                                    <v>1387</v>
+                                    <v>1475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30128,15 +30951,15 @@
         </relation>
         <relation>
             <name>new_array_allocated_type</name>
-            <cardinality>6632</cardinality>
+            <cardinality>6630</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6632</v>
+                    <v>6630</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2834</v>
+                    <v>2833</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30150,7 +30973,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6632</v>
+                                    <v>6630</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30171,7 +30994,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2502</v>
+                                    <v>2501</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30191,11 +31014,11 @@
         </relation>
         <relation>
             <name>param_ref_to_this</name>
-            <cardinality>24951</cardinality>
+            <cardinality>24973</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>24951</v>
+                    <v>24973</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -31538,15 +32361,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>407669</cardinality>
+            <cardinality>406399</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>407669</v>
+                    <v>406399</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>407669</v>
+                    <v>406399</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31560,7 +32383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407669</v>
+                                    <v>406399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31576,7 +32399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407669</v>
+                                    <v>406399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31586,15 +32409,15 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>47589</cardinality>
+            <cardinality>47141</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47589</v>
+                    <v>47141</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>15840</v>
+                    <v>15691</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31608,7 +32431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47589</v>
+                                    <v>47141</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31624,17 +32447,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2944</v>
+                                    <v>2917</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12489</v>
+                                    <v>12372</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>328</b>
-                                    <v>406</v>
+                                    <v>402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31644,15 +32467,15 @@
         </relation>
         <relation>
             <name>uuidof_bind</name>
-            <cardinality>26787</cardinality>
+            <cardinality>26780</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>26787</v>
+                    <v>26780</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>26536</v>
+                    <v>26529</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31666,7 +32489,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26787</v>
+                                    <v>26780</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31682,7 +32505,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26325</v>
+                                    <v>26318</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31697,15 +32520,15 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>241830</cardinality>
+            <cardinality>241971</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>241830</v>
+                    <v>241971</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>11145</v>
+                    <v>11151</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31719,7 +32542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241830</v>
+                                    <v>241971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31735,27 +32558,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3855</v>
+                                    <v>3857</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2750</v>
+                                    <v>2751</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1018</v>
+                                    <v>1019</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>281</v>
+                                    <v>282</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31765,7 +32588,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>42</b>
-                                    <v>851</v>
+                                    <v>852</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -31828,11 +32651,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>18997</cardinality>
+            <cardinality>18992</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>18997</v>
+                    <v>18992</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -31858,7 +32681,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18997</v>
+                                    <v>18992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31874,7 +32697,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18997</v>
+                                    <v>18992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31890,7 +32713,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18997</v>
+                                    <v>18992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32074,15 +32897,15 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>31864</cardinality>
+            <cardinality>31856</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>31864</v>
+                    <v>31856</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>15442</v>
+                    <v>15438</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -32090,7 +32913,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>31864</v>
+                    <v>31856</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -32102,7 +32925,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>17887</v>
+                    <v>17883</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32116,7 +32939,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32132,7 +32955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32148,7 +32971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32164,7 +32987,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32180,7 +33003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32196,7 +33019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32212,12 +33035,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8186</v>
+                                    <v>8184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3530</v>
+                                    <v>3529</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32227,7 +33050,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1255</v>
+                                    <v>1254</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -32248,12 +33071,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8186</v>
+                                    <v>8184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3530</v>
+                                    <v>3529</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32263,7 +33086,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1255</v>
+                                    <v>1254</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -32284,12 +33107,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8186</v>
+                                    <v>8184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3530</v>
+                                    <v>3529</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32299,7 +33122,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1255</v>
+                                    <v>1254</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -32320,7 +33143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14203</v>
+                                    <v>14199</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32341,7 +33164,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15320</v>
+                                    <v>15316</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32362,12 +33185,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8777</v>
+                                    <v>8775</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3684</v>
+                                    <v>3683</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32824,7 +33647,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32840,7 +33663,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32856,7 +33679,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32872,7 +33695,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32888,7 +33711,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32904,7 +33727,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31864</v>
+                                    <v>31856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33162,12 +33985,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15644</v>
+                                    <v>15640</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1433</v>
+                                    <v>1432</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -33188,7 +34011,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16219</v>
+                                    <v>16215</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33214,7 +34037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17199</v>
+                                    <v>17195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33235,12 +34058,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15644</v>
+                                    <v>15640</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1433</v>
+                                    <v>1432</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -33261,7 +34084,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17863</v>
+                                    <v>17859</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33282,7 +34105,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17887</v>
+                                    <v>17883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33292,11 +34115,11 @@
         </relation>
         <relation>
             <name>fold</name>
-            <cardinality>1244</cardinality>
+            <cardinality>1261</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>1244</v>
+                    <v>1261</v>
                 </e>
                 <e>
                     <k>operator</k>
@@ -33318,7 +34141,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1244</v>
+                                    <v>1261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33334,7 +34157,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1244</v>
+                                    <v>1261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33358,8 +34181,8 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>54</a>
-                                    <b>55</b>
+                                    <a>55</a>
+                                    <b>56</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -33390,8 +34213,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>58</a>
-                                    <b>59</b>
+                                    <a>59</a>
+                                    <b>60</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -33418,11 +34241,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6349367</cardinality>
+            <cardinality>6347771</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6349367</v>
+                    <v>6347771</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -33430,7 +34253,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2676092</v>
+                    <v>2675419</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33444,7 +34267,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349367</v>
+                                    <v>6347771</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33460,7 +34283,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349367</v>
+                                    <v>6347771</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33698,22 +34521,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2218046</v>
+                                    <v>2217489</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>181655</v>
+                                    <v>181609</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>201535</v>
+                                    <v>201484</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>1789</b>
-                                    <v>74855</v>
+                                    <v>74836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33729,12 +34552,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2593391</v>
+                                    <v>2592739</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>82701</v>
+                                    <v>82680</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33899,15 +34722,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>990319</cardinality>
+            <cardinality>990619</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>990319</v>
+                    <v>990619</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>990319</v>
+                    <v>990619</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33921,7 +34744,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990319</v>
+                                    <v>990619</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33937,7 +34760,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990319</v>
+                                    <v>990619</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33947,15 +34770,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>435769</cardinality>
+            <cardinality>434390</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>435769</v>
+                    <v>434390</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>435769</v>
+                    <v>434390</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33969,7 +34792,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435769</v>
+                                    <v>434390</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33985,7 +34808,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435769</v>
+                                    <v>434390</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34043,15 +34866,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>105781</cardinality>
+            <cardinality>103482</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>105781</v>
+                    <v>103482</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>105781</v>
+                    <v>103482</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34065,7 +34888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105781</v>
+                                    <v>103482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34081,7 +34904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105781</v>
+                                    <v>103482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34091,15 +34914,15 @@
         </relation>
         <relation>
             <name>constexpr_if_else</name>
-            <cardinality>75913</cardinality>
+            <cardinality>74197</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>75913</v>
+                    <v>74197</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>75913</v>
+                    <v>74197</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34113,7 +34936,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>75913</v>
+                                    <v>74197</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34129,7 +34952,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>75913</v>
+                                    <v>74197</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34235,15 +35058,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>39652</cardinality>
+            <cardinality>39664</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>39652</v>
+                    <v>39664</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>39652</v>
+                    <v>39664</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34257,7 +35080,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39652</v>
+                                    <v>39664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34273,7 +35096,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39652</v>
+                                    <v>39664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34283,15 +35106,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>232290</cardinality>
+            <cardinality>232426</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>232290</v>
+                    <v>232426</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>232290</v>
+                    <v>232426</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34305,7 +35128,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232290</v>
+                                    <v>232426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34321,7 +35144,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232290</v>
+                                    <v>232426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34379,19 +35202,19 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>833592</cardinality>
+            <cardinality>830953</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>410607</v>
+                    <v>409307</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>386</v>
+                    <v>384</v>
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>833592</v>
+                    <v>830953</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34410,12 +35233,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407733</v>
+                                    <v>406441</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>2852</v>
+                                    <v>2844</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34436,12 +35259,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407733</v>
+                                    <v>406441</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>2852</v>
+                                    <v>2844</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34457,7 +35280,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>150</v>
+                                    <v>149</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -34505,13 +35328,13 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>19141</a>
-                                    <b>19142</b>
+                                    <a>19140</a>
+                                    <b>19141</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>19142</a>
-                                    <b>19143</b>
+                                    <a>19141</a>
+                                    <b>19142</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -34528,7 +35351,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>150</v>
+                                    <v>149</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -34576,13 +35399,13 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>19141</a>
-                                    <b>19142</b>
+                                    <a>19140</a>
+                                    <b>19141</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>19142</a>
-                                    <b>19143</b>
+                                    <a>19141</a>
+                                    <b>19142</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -34599,7 +35422,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>833592</v>
+                                    <v>830953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34615,7 +35438,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>833592</v>
+                                    <v>830953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34625,15 +35448,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>410607</cardinality>
+            <cardinality>409307</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>410607</v>
+                    <v>409307</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>410607</v>
+                    <v>409307</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34647,7 +35470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>410607</v>
+                                    <v>409307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34663,7 +35486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>410607</v>
+                                    <v>409307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34673,15 +35496,15 @@
         </relation>
         <relation>
             <name>for_initialization</name>
-            <cardinality>73253</cardinality>
+            <cardinality>73276</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>73253</v>
+                    <v>73276</v>
                 </e>
                 <e>
                     <k>init_id</k>
-                    <v>73253</v>
+                    <v>73276</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34695,7 +35518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73253</v>
+                                    <v>73276</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34711,7 +35534,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73253</v>
+                                    <v>73276</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34721,15 +35544,15 @@
         </relation>
         <relation>
             <name>for_condition</name>
-            <cardinality>76349</cardinality>
+            <cardinality>76372</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>76349</v>
+                    <v>76372</v>
                 </e>
                 <e>
                     <k>condition_id</k>
-                    <v>76349</v>
+                    <v>76372</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34743,7 +35566,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76349</v>
+                                    <v>76372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34759,7 +35582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76349</v>
+                                    <v>76372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34769,15 +35592,15 @@
         </relation>
         <relation>
             <name>for_update</name>
-            <cardinality>73394</cardinality>
+            <cardinality>73416</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>73394</v>
+                    <v>73416</v>
                 </e>
                 <e>
                     <k>update_id</k>
-                    <v>73394</v>
+                    <v>73416</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34791,7 +35614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73394</v>
+                                    <v>73416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34807,7 +35630,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73394</v>
+                                    <v>73416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34817,15 +35640,15 @@
         </relation>
         <relation>
             <name>for_body</name>
-            <cardinality>84398</cardinality>
+            <cardinality>84423</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>84398</v>
+                    <v>84423</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>84398</v>
+                    <v>84423</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34839,7 +35662,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84398</v>
+                                    <v>84423</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34855,7 +35678,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84398</v>
+                                    <v>84423</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34865,19 +35688,19 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5610809</cardinality>
+            <cardinality>5609399</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5610809</v>
+                    <v>5609399</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>15725</v>
+                    <v>15721</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2374243</v>
+                    <v>2373646</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34891,7 +35714,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5610809</v>
+                                    <v>5609399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34907,7 +35730,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5610809</v>
+                                    <v>5609399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34923,7 +35746,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5166</v>
+                                    <v>5165</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34938,7 +35761,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2000</v>
+                                    <v>1999</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -34958,7 +35781,7 @@
                                 <b>
                                     <a>29</a>
                                     <b>39</b>
-                                    <v>1182</v>
+                                    <v>1181</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -34984,7 +35807,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5166</v>
+                                    <v>5165</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34999,7 +35822,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2000</v>
+                                    <v>1999</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -35019,7 +35842,7 @@
                                 <b>
                                     <a>29</a>
                                     <b>39</b>
-                                    <v>1182</v>
+                                    <v>1181</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -35045,32 +35868,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1355019</v>
+                                    <v>1354678</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515733</v>
+                                    <v>515604</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151038</v>
+                                    <v>151000</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155232</v>
+                                    <v>155193</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178303</v>
+                                    <v>178258</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>1943</b>
-                                    <v>18916</v>
+                                    <v>18911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35086,32 +35909,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1355019</v>
+                                    <v>1354678</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515733</v>
+                                    <v>515604</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151038</v>
+                                    <v>151000</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155232</v>
+                                    <v>155193</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178303</v>
+                                    <v>178258</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>1943</b>
-                                    <v>18916</v>
+                                    <v>18911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35121,22 +35944,22 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>43224</cardinality>
+            <cardinality>43039</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>43224</v>
+                    <v>43039</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>723577</cardinality>
+            <cardinality>723395</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>713042</v>
+                    <v>712862</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35144,7 +35967,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>723577</v>
+                    <v>723395</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35158,12 +35981,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705600</v>
+                                    <v>705423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>7441</v>
+                                    <v>7439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35179,12 +36002,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705600</v>
+                                    <v>705423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>7441</v>
+                                    <v>7439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35312,7 +36135,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723577</v>
+                                    <v>723395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35328,7 +36151,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723577</v>
+                                    <v>723395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35338,11 +36161,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>723577</cardinality>
+            <cardinality>723395</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>713042</v>
+                    <v>712862</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35350,7 +36173,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>723577</v>
+                    <v>723395</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35364,12 +36187,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705600</v>
+                                    <v>705423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>7441</v>
+                                    <v>7439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35385,12 +36208,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705600</v>
+                                    <v>705423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>7441</v>
+                                    <v>7439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35518,7 +36341,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723577</v>
+                                    <v>723395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35534,7 +36357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723577</v>
+                                    <v>723395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35544,15 +36367,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1640355</cardinality>
+            <cardinality>1618065</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1640355</v>
+                    <v>1618065</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1423690</v>
+                    <v>1404210</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35566,7 +36389,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1640355</v>
+                                    <v>1618065</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35582,17 +36405,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1291402</v>
+                                    <v>1273657</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>116981</v>
+                                    <v>115417</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>29</b>
-                                    <v>15307</v>
+                                    <v>15134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35602,19 +36425,19 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>348211</cardinality>
+            <cardinality>348317</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>348211</v>
+                    <v>348317</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>28939</v>
+                    <v>28948</v>
                 </e>
                 <e>
                     <k>target</k>
-                    <v>72683</v>
+                    <v>72705</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35628,7 +36451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348211</v>
+                                    <v>348317</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35644,7 +36467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348211</v>
+                                    <v>348317</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35660,17 +36483,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13592</v>
+                                    <v>13596</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6056</v>
+                                    <v>6058</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2013</v>
+                                    <v>2014</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -35685,7 +36508,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>25</b>
-                                    <v>2188</v>
+                                    <v>2189</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -35706,17 +36529,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23183</v>
+                                    <v>23190</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3625</v>
+                                    <v>3626</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>3321</b>
-                                    <v>2130</v>
+                                    <v>2131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35737,27 +36560,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36199</v>
+                                    <v>36210</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17627</v>
+                                    <v>17633</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7376</v>
+                                    <v>7379</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>6416</v>
+                                    <v>6418</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>2124</b>
-                                    <v>5029</v>
+                                    <v>5030</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35773,7 +36596,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72683</v>
+                                    <v>72705</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35783,19 +36606,19 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5395215</cardinality>
+            <cardinality>5334448</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5395215</v>
+                    <v>5334448</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1368</v>
+                    <v>1353</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5392104</v>
+                    <v>5331372</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35809,7 +36632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5395215</v>
+                                    <v>5334448</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35825,7 +36648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5395215</v>
+                                    <v>5334448</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35841,57 +36664,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>140</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>805</a>
                                     <b>806</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>880</a>
                                     <b>881</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>973</a>
                                     <b>974</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1509</a>
                                     <b>1510</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1883</a>
                                     <b>1884</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>3256</a>
                                     <b>3257</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>4737</a>
                                     <b>4738</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>7126</a>
                                     <b>7127</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>22044</a>
                                     <b>22045</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35907,57 +36730,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>140</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>805</a>
                                     <b>806</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>880</a>
                                     <b>881</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>973</a>
                                     <b>974</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1509</a>
                                     <b>1510</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>1883</a>
                                     <b>1884</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>3256</a>
                                     <b>3257</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>4737</a>
                                     <b>4738</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>7126</a>
                                     <b>7127</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                                 <b>
                                     <a>22019</a>
                                     <b>22020</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35973,12 +36796,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5391979</v>
+                                    <v>5331249</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>27</b>
-                                    <v>124</v>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35994,7 +36817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5392104</v>
+                                    <v>5331372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36004,15 +36827,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1138454</cardinality>
+            <cardinality>1125632</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>886819</v>
+                    <v>876831</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1138454</v>
+                    <v>1125632</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36026,17 +36849,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>648003</v>
+                                    <v>640704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>229856</v>
+                                    <v>227267</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>8960</v>
+                                    <v>8859</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36052,7 +36875,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1138454</v>
+                                    <v>1125632</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36062,41 +36885,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>438183</cardinality>
+            <cardinality>433247</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>438183</v>
+                    <v>433247</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>284613</cardinality>
+            <cardinality>281408</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>284613</v>
+                    <v>281408</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4341759</cardinality>
+            <cardinality>4292857</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4341759</v>
+                    <v>4292857</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2947935</v>
+                    <v>2914733</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1679307</v>
+                    <v>1660393</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36110,7 +36933,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4341759</v>
+                                    <v>4292857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36126,7 +36949,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4341759</v>
+                                    <v>4292857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36142,12 +36965,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2749813</v>
+                                    <v>2718842</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>798</b>
-                                    <v>198122</v>
+                                    <v>195890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36163,12 +36986,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2866919</v>
+                                    <v>2834629</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>81015</v>
+                                    <v>80103</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36184,17 +37007,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1531463</v>
+                                    <v>1514214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>126937</v>
+                                    <v>125507</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>13605</b>
-                                    <v>20907</v>
+                                    <v>20671</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36210,17 +37033,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1535694</v>
+                                    <v>1518397</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>126564</v>
+                                    <v>125138</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>3246</b>
-                                    <v>17049</v>
+                                    <v>16857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36230,15 +37053,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>317338</cardinality>
+            <cardinality>316291</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>317338</v>
+                    <v>316291</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58456</v>
+                    <v>58263</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36252,7 +37075,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317338</v>
+                                    <v>316291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36268,37 +37091,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28928</v>
+                                    <v>28832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9404</v>
+                                    <v>9373</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4933</v>
+                                    <v>4917</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>5333</v>
+                                    <v>5315</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>4502</v>
+                                    <v>4487</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>47</b>
-                                    <v>4386</v>
+                                    <v>4372</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>793</b>
-                                    <v>967</v>
+                                    <v>964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36356,15 +37179,15 @@
         </relation>
         <relation>
             <name>link_targets</name>
-            <cardinality>816</cardinality>
+            <cardinality>817</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>816</v>
+                    <v>817</v>
                 </e>
                 <e>
                     <k>binary</k>
-                    <v>816</v>
+                    <v>817</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36378,7 +37201,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>816</v>
+                                    <v>817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36394,7 +37217,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>816</v>
+                                    <v>817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36404,15 +37227,15 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30225171</cardinality>
+            <cardinality>30703622</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3843767</v>
+                    <v>3901314</v>
                 </e>
                 <e>
                     <k>link_target</k>
-                    <v>338</v>
+                    <v>335</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36426,17 +37249,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527070</v>
+                                    <v>531771</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>26773</v>
+                                    <v>26990</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3289924</v>
+                                    <v>3342551</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36455,48 +37278,48 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>97457</a>
-                                    <b>97458</b>
+                                    <a>99949</a>
+                                    <b>99950</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>97576</a>
-                                    <b>97577</b>
+                                    <a>100069</a>
+                                    <b>100070</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>97629</a>
-                                    <b>97630</b>
+                                    <a>100127</a>
+                                    <b>100128</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>97656</a>
-                                    <b>97657</b>
+                                    <a>100148</a>
+                                    <b>100149</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>97678</a>
-                                    <b>97679</b>
+                                    <a>100170</a>
+                                    <b>100171</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>97710</a>
-                                    <b>97711</b>
+                                    <a>100212</a>
+                                    <b>100213</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>99717</a>
-                                    <b>99718</b>
+                                    <a>102215</a>
+                                    <b>102216</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>103097</a>
-                                    <b>103098</b>
+                                    <a>105685</a>
+                                    <b>105686</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>104463</a>
-                                    <b>104464</b>
+                                    <a>107152</a>
+                                    <b>107153</b>
                                     <v>33</v>
                                 </b>
                             </bs>
diff --git a/cpp/ql/lib/upgrades/770002bb02322e04fa25345838ce6e82af285a0b/old.dbscheme b/cpp/ql/lib/upgrades/770002bb02322e04fa25345838ce6e82af285a0b/old.dbscheme
new file mode 100644
index 000000000000..770002bb0232
--- /dev/null
+++ b/cpp/ql/lib/upgrades/770002bb02322e04fa25345838ce6e82af285a0b/old.dbscheme
@@ -0,0 +1,2545 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+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
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/770002bb02322e04fa25345838ce6e82af285a0b/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/770002bb02322e04fa25345838ce6e82af285a0b/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..837c4e02326a
--- /dev/null
+++ b/cpp/ql/lib/upgrades/770002bb02322e04fa25345838ce6e82af285a0b/semmlecode.cpp.dbscheme
@@ -0,0 +1,2561 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+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
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int variable_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int variable_id: @usertype 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
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/770002bb02322e04fa25345838ce6e82af285a0b/upgrade.properties b/cpp/ql/lib/upgrades/770002bb02322e04fa25345838ce6e82af285a0b/upgrade.properties
new file mode 100644
index 000000000000..dca5d95a2eec
--- /dev/null
+++ b/cpp/ql/lib/upgrades/770002bb02322e04fa25345838ce6e82af285a0b/upgrade.properties
@@ -0,0 +1,2 @@
+description: Support alias templates
+compatibility: backwards
diff --git a/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/old.dbscheme b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/old.dbscheme
new file mode 100644
index 000000000000..837c4e02326a
--- /dev/null
+++ b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/old.dbscheme
@@ -0,0 +1,2561 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+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
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int variable_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int variable_id: @usertype 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
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..ef8d209a22e2
--- /dev/null
+++ b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/semmlecode.cpp.dbscheme
@@ -0,0 +1,2577 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/upgrade.properties b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/upgrade.properties
new file mode 100644
index 000000000000..4cda5136f03d
--- /dev/null
+++ b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/upgrade.properties
@@ -0,0 +1,2 @@
+description: Capture information about one template being generated from another
+compatibility: backwards
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 901d20922831..e8a2af1383cc 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6.4
+
+No user-facing changes.
+
 ## 1.6.3
 
 ### Minor Analysis Improvements
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll b/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll
index f0876800874c..f98b295cb74e 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll
@@ -44,10 +44,7 @@ class ExternalApiDataNode extends DataFlow::Node {
 /** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
 private module UntrustedDataToExternalApiConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    exists(RemoteFlowSourceFunction remoteFlow |
-      remoteFlow = source.asExpr().(Call).getTarget() and
-      remoteFlow.hasRemoteFlowSource(_, _)
-    )
+    any(RemoteFlowSourceFunction remoteFlow).hasRemoteFlowSource(source.asExpr(), _, _)
   }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
diff --git a/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql b/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql
index 392650022e20..207aec189b2e 100644
--- a/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql
+++ b/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql
@@ -94,9 +94,8 @@ class Recv extends SendRecv instanceof RemoteFlowSourceFunction {
   }
 
   override Expr getDataExpr(Call call) {
-    call.getTarget() = this and
     exists(FunctionOutput output, int arg |
-      super.hasRemoteFlowSource(output, _) and
+      super.hasRemoteFlowSource(call, output, _) and
       output.isParameterDeref(arg) and
       result = call.getArgument(arg)
     )
diff --git a/cpp/ql/src/change-notes/released/1.6.4.md b/cpp/ql/src/change-notes/released/1.6.4.md
new file mode 100644
index 000000000000..5c811dc46384
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.6.4.md
@@ -0,0 +1,3 @@
+## 1.6.4
+
+No user-facing changes.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index 00b51441d882..1910e09d6a6a 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.3
+lastReleaseVersion: 1.6.4
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index a57263b53fc5..7f3df37c30a1 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.6.3
+version: 1.6.5-dev
 groups:
   - cpp
   - queries
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected
index a9927b510930..a4c154c06940 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected
@@ -21,11 +21,7 @@ edges
 | test.cpp:85:21:85:36 | buf | test.cpp:87:5:87:31 | access to array | provenance | Config |
 | test.cpp:85:21:85:36 | buf | test.cpp:88:5:88:27 | access to array | provenance | Config |
 | test.cpp:85:34:85:36 | buf | test.cpp:85:21:85:36 | buf | provenance |  |
-| test.cpp:92:9:92:11 | definition of arr | test.cpp:96:13:96:18 | access to array | provenance | Config |
 | test.cpp:96:13:96:15 | arr | test.cpp:96:13:96:18 | access to array | provenance | Config |
-| test.cpp:102:9:102:11 | definition of arr | test.cpp:111:17:111:22 | access to array | provenance | Config |
-| test.cpp:102:9:102:11 | definition of arr | test.cpp:115:35:115:40 | access to array | provenance | Config |
-| test.cpp:102:9:102:11 | definition of arr | test.cpp:119:17:119:22 | access to array | provenance | Config |
 | test.cpp:111:17:111:19 | arr | test.cpp:111:17:111:22 | access to array | provenance | Config |
 | test.cpp:111:17:111:19 | arr | test.cpp:115:35:115:40 | access to array | provenance | Config |
 | test.cpp:111:17:111:19 | arr | test.cpp:119:17:119:22 | access to array | provenance | Config |
@@ -35,55 +31,41 @@ edges
 | test.cpp:119:17:119:19 | arr | test.cpp:111:17:111:22 | access to array | provenance | Config |
 | test.cpp:119:17:119:19 | arr | test.cpp:115:35:115:40 | access to array | provenance | Config |
 | test.cpp:119:17:119:19 | arr | test.cpp:119:17:119:22 | access to array | provenance | Config |
-| test.cpp:125:11:125:13 | definition of arr | test.cpp:128:9:128:14 | access to array | provenance | Config |
 | test.cpp:128:9:128:11 | arr | test.cpp:128:9:128:14 | access to array | provenance | Config |
 | test.cpp:134:25:134:27 | arr | test.cpp:136:9:136:16 | ... += ... | provenance | Config |
 | test.cpp:136:9:136:16 | ... += ... | test.cpp:136:9:136:16 | ... += ... | provenance |  |
 | test.cpp:136:9:136:16 | ... += ... | test.cpp:138:13:138:15 | arr | provenance |  |
-| test.cpp:142:10:142:13 | definition of asdf | test.cpp:143:18:143:21 | asdf | provenance |  |
 | test.cpp:143:18:143:21 | asdf | test.cpp:134:25:134:27 | arr | provenance |  |
 | test.cpp:143:18:143:21 | asdf | test.cpp:143:18:143:21 | asdf | provenance |  |
 | test.cpp:146:26:146:26 | *p | test.cpp:147:4:147:9 | -- ... | provenance |  |
 | test.cpp:146:26:146:26 | *p | test.cpp:147:4:147:9 | -- ... | provenance |  |
-| test.cpp:154:7:154:9 | definition of buf | test.cpp:156:12:156:18 | ... + ... | provenance | Config |
 | test.cpp:156:12:156:14 | buf | test.cpp:156:12:156:18 | ... + ... | provenance | Config |
 | test.cpp:156:12:156:18 | ... + ... | test.cpp:156:12:156:18 | ... + ... | provenance |  |
 | test.cpp:156:12:156:18 | ... + ... | test.cpp:158:17:158:18 | *& ... | provenance |  |
 | test.cpp:158:17:158:18 | *& ... | test.cpp:146:26:146:26 | *p | provenance |  |
-| test.cpp:217:19:217:24 | definition of buffer | test.cpp:218:16:218:28 | buffer | provenance |  |
 | test.cpp:218:16:218:28 | buffer | test.cpp:220:5:220:11 | access to array | provenance | Config |
 | test.cpp:218:16:218:28 | buffer | test.cpp:221:5:221:11 | access to array | provenance | Config |
 | test.cpp:218:23:218:28 | buffer | test.cpp:218:16:218:28 | buffer | provenance |  |
-| test.cpp:228:10:228:14 | definition of array | test.cpp:229:17:229:29 | array | provenance |  |
 | test.cpp:229:17:229:29 | array | test.cpp:231:5:231:10 | access to array | provenance | Config |
 | test.cpp:229:17:229:29 | array | test.cpp:232:5:232:10 | access to array | provenance | Config |
 | test.cpp:229:25:229:29 | array | test.cpp:229:17:229:29 | array | provenance |  |
 | test.cpp:245:30:245:30 | p | test.cpp:261:27:261:30 | access to array | provenance | Config |
 | test.cpp:245:30:245:30 | p | test.cpp:261:27:261:30 | access to array | provenance | Config |
-| test.cpp:273:19:273:25 | definition of buffer3 | test.cpp:274:14:274:20 | buffer3 | provenance |  |
 | test.cpp:274:14:274:20 | buffer3 | test.cpp:245:30:245:30 | p | provenance |  |
 | test.cpp:274:14:274:20 | buffer3 | test.cpp:274:14:274:20 | buffer3 | provenance |  |
 | test.cpp:277:35:277:35 | p | test.cpp:278:14:278:14 | p | provenance |  |
 | test.cpp:278:14:278:14 | p | test.cpp:245:30:245:30 | p | provenance |  |
-| test.cpp:282:19:282:25 | definition of buffer1 | test.cpp:283:19:283:25 | buffer1 | provenance |  |
 | test.cpp:283:19:283:25 | buffer1 | test.cpp:277:35:277:35 | p | provenance |  |
 | test.cpp:283:19:283:25 | buffer1 | test.cpp:283:19:283:25 | buffer1 | provenance |  |
-| test.cpp:285:19:285:25 | definition of buffer2 | test.cpp:286:19:286:25 | buffer2 | provenance |  |
 | test.cpp:286:19:286:25 | buffer2 | test.cpp:277:35:277:35 | p | provenance |  |
 | test.cpp:286:19:286:25 | buffer2 | test.cpp:286:19:286:25 | buffer2 | provenance |  |
-| test.cpp:288:19:288:25 | definition of buffer3 | test.cpp:289:19:289:25 | buffer3 | provenance |  |
 | test.cpp:289:19:289:25 | buffer3 | test.cpp:277:35:277:35 | p | provenance |  |
 | test.cpp:289:19:289:25 | buffer3 | test.cpp:289:19:289:25 | buffer3 | provenance |  |
 | test.cpp:292:25:292:27 | arr | test.cpp:299:16:299:21 | access to array | provenance | Config |
-| test.cpp:305:9:305:12 | definition of arr1 | test.cpp:306:20:306:23 | arr1 | provenance |  |
 | test.cpp:306:20:306:23 | arr1 | test.cpp:292:25:292:27 | arr | provenance |  |
 | test.cpp:306:20:306:23 | arr1 | test.cpp:306:20:306:23 | arr1 | provenance |  |
-| test.cpp:308:9:308:12 | definition of arr2 | test.cpp:309:20:309:23 | arr2 | provenance |  |
 | test.cpp:309:20:309:23 | arr2 | test.cpp:292:25:292:27 | arr | provenance |  |
 | test.cpp:309:20:309:23 | arr2 | test.cpp:309:20:309:23 | arr2 | provenance |  |
-| test.cpp:314:10:314:13 | definition of temp | test.cpp:319:19:319:27 | ... + ... | provenance | Config |
-| test.cpp:314:10:314:13 | definition of temp | test.cpp:322:19:322:27 | ... + ... | provenance | Config |
-| test.cpp:314:10:314:13 | definition of temp | test.cpp:324:23:324:32 | ... + ... | provenance | Config |
 | test.cpp:319:13:319:27 | ... = ... | test.cpp:325:24:325:26 | end | provenance |  |
 | test.cpp:319:19:319:22 | temp | test.cpp:319:19:319:27 | ... + ... | provenance | Config |
 | test.cpp:319:19:319:22 | temp | test.cpp:324:23:324:32 | ... + ... | provenance | Config |
@@ -133,40 +115,33 @@ nodes
 | test.cpp:85:34:85:36 | buf | semmle.label | buf |
 | test.cpp:87:5:87:31 | access to array | semmle.label | access to array |
 | test.cpp:88:5:88:27 | access to array | semmle.label | access to array |
-| test.cpp:92:9:92:11 | definition of arr | semmle.label | definition of arr |
 | test.cpp:96:13:96:15 | arr | semmle.label | arr |
 | test.cpp:96:13:96:18 | access to array | semmle.label | access to array |
-| test.cpp:102:9:102:11 | definition of arr | semmle.label | definition of arr |
 | test.cpp:111:17:111:19 | arr | semmle.label | arr |
 | test.cpp:111:17:111:22 | access to array | semmle.label | access to array |
 | test.cpp:115:35:115:37 | arr | semmle.label | arr |
 | test.cpp:115:35:115:40 | access to array | semmle.label | access to array |
 | test.cpp:119:17:119:19 | arr | semmle.label | arr |
 | test.cpp:119:17:119:22 | access to array | semmle.label | access to array |
-| test.cpp:125:11:125:13 | definition of arr | semmle.label | definition of arr |
 | test.cpp:128:9:128:11 | arr | semmle.label | arr |
 | test.cpp:128:9:128:14 | access to array | semmle.label | access to array |
 | test.cpp:134:25:134:27 | arr | semmle.label | arr |
 | test.cpp:136:9:136:16 | ... += ... | semmle.label | ... += ... |
 | test.cpp:136:9:136:16 | ... += ... | semmle.label | ... += ... |
 | test.cpp:138:13:138:15 | arr | semmle.label | arr |
-| test.cpp:142:10:142:13 | definition of asdf | semmle.label | definition of asdf |
 | test.cpp:143:18:143:21 | asdf | semmle.label | asdf |
 | test.cpp:143:18:143:21 | asdf | semmle.label | asdf |
 | test.cpp:146:26:146:26 | *p | semmle.label | *p |
 | test.cpp:147:4:147:9 | -- ... | semmle.label | -- ... |
 | test.cpp:147:4:147:9 | -- ... | semmle.label | -- ... |
-| test.cpp:154:7:154:9 | definition of buf | semmle.label | definition of buf |
 | test.cpp:156:12:156:14 | buf | semmle.label | buf |
 | test.cpp:156:12:156:18 | ... + ... | semmle.label | ... + ... |
 | test.cpp:156:12:156:18 | ... + ... | semmle.label | ... + ... |
 | test.cpp:158:17:158:18 | *& ... | semmle.label | *& ... |
-| test.cpp:217:19:217:24 | definition of buffer | semmle.label | definition of buffer |
 | test.cpp:218:16:218:28 | buffer | semmle.label | buffer |
 | test.cpp:218:23:218:28 | buffer | semmle.label | buffer |
 | test.cpp:220:5:220:11 | access to array | semmle.label | access to array |
 | test.cpp:221:5:221:11 | access to array | semmle.label | access to array |
-| test.cpp:228:10:228:14 | definition of array | semmle.label | definition of array |
 | test.cpp:229:17:229:29 | array | semmle.label | array |
 | test.cpp:229:25:229:29 | array | semmle.label | array |
 | test.cpp:231:5:231:10 | access to array | semmle.label | access to array |
@@ -174,29 +149,22 @@ nodes
 | test.cpp:245:30:245:30 | p | semmle.label | p |
 | test.cpp:245:30:245:30 | p | semmle.label | p |
 | test.cpp:261:27:261:30 | access to array | semmle.label | access to array |
-| test.cpp:273:19:273:25 | definition of buffer3 | semmle.label | definition of buffer3 |
 | test.cpp:274:14:274:20 | buffer3 | semmle.label | buffer3 |
 | test.cpp:274:14:274:20 | buffer3 | semmle.label | buffer3 |
 | test.cpp:277:35:277:35 | p | semmle.label | p |
 | test.cpp:278:14:278:14 | p | semmle.label | p |
-| test.cpp:282:19:282:25 | definition of buffer1 | semmle.label | definition of buffer1 |
 | test.cpp:283:19:283:25 | buffer1 | semmle.label | buffer1 |
 | test.cpp:283:19:283:25 | buffer1 | semmle.label | buffer1 |
-| test.cpp:285:19:285:25 | definition of buffer2 | semmle.label | definition of buffer2 |
 | test.cpp:286:19:286:25 | buffer2 | semmle.label | buffer2 |
 | test.cpp:286:19:286:25 | buffer2 | semmle.label | buffer2 |
-| test.cpp:288:19:288:25 | definition of buffer3 | semmle.label | definition of buffer3 |
 | test.cpp:289:19:289:25 | buffer3 | semmle.label | buffer3 |
 | test.cpp:289:19:289:25 | buffer3 | semmle.label | buffer3 |
 | test.cpp:292:25:292:27 | arr | semmle.label | arr |
 | test.cpp:299:16:299:21 | access to array | semmle.label | access to array |
-| test.cpp:305:9:305:12 | definition of arr1 | semmle.label | definition of arr1 |
 | test.cpp:306:20:306:23 | arr1 | semmle.label | arr1 |
 | test.cpp:306:20:306:23 | arr1 | semmle.label | arr1 |
-| test.cpp:308:9:308:12 | definition of arr2 | semmle.label | definition of arr2 |
 | test.cpp:309:20:309:23 | arr2 | semmle.label | arr2 |
 | test.cpp:309:20:309:23 | arr2 | semmle.label | arr2 |
-| test.cpp:314:10:314:13 | definition of temp | semmle.label | definition of temp |
 | test.cpp:319:13:319:27 | ... = ... | semmle.label | ... = ... |
 | test.cpp:319:19:319:22 | temp | semmle.label | temp |
 | test.cpp:319:19:319:27 | ... + ... | semmle.label | ... + ... |
@@ -221,25 +189,14 @@ subpaths
 | test.cpp:72:5:72:15 | PointerAdd: access to array | test.cpp:79:32:79:34 | buf | test.cpp:72:5:72:15 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:15:9:15:11 | buf | buf | test.cpp:72:5:72:19 | Store: ... = ... | write |
 | test.cpp:77:27:77:44 | PointerAdd: access to array | test.cpp:77:32:77:34 | buf | test.cpp:66:32:66:32 | p | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:15:9:15:11 | buf | buf | test.cpp:67:5:67:10 | Store: ... = ... | write |
 | test.cpp:88:5:88:27 | PointerAdd: access to array | test.cpp:85:34:85:36 | buf | test.cpp:88:5:88:27 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:15:9:15:11 | buf | buf | test.cpp:88:5:88:31 | Store: ... = ... | write |
-| test.cpp:128:9:128:14 | PointerAdd: access to array | test.cpp:125:11:125:13 | definition of arr | test.cpp:128:9:128:14 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:125:11:125:13 | arr | arr | test.cpp:128:9:128:18 | Store: ... = ... | write |
 | test.cpp:128:9:128:14 | PointerAdd: access to array | test.cpp:128:9:128:11 | arr | test.cpp:128:9:128:14 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:125:11:125:13 | arr | arr | test.cpp:128:9:128:18 | Store: ... = ... | write |
-| test.cpp:136:9:136:16 | PointerAdd: ... += ... | test.cpp:142:10:142:13 | definition of asdf | test.cpp:138:13:138:15 | arr | This pointer arithmetic may have an off-by-2 error allowing it to overrun $@ at this $@. | test.cpp:142:10:142:13 | asdf | asdf | test.cpp:138:12:138:15 | Load: * ... | read |
 | test.cpp:136:9:136:16 | PointerAdd: ... += ... | test.cpp:143:18:143:21 | asdf | test.cpp:138:13:138:15 | arr | This pointer arithmetic may have an off-by-2 error allowing it to overrun $@ at this $@. | test.cpp:142:10:142:13 | asdf | asdf | test.cpp:138:12:138:15 | Load: * ... | read |
-| test.cpp:156:12:156:18 | PointerAdd: ... + ... | test.cpp:154:7:154:9 | definition of buf | test.cpp:147:4:147:9 | -- ... | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:154:7:154:9 | buf | buf | test.cpp:147:3:147:13 | Store: ... = ... | write |
-| test.cpp:156:12:156:18 | PointerAdd: ... + ... | test.cpp:154:7:154:9 | definition of buf | test.cpp:147:4:147:9 | -- ... | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:154:7:154:9 | buf | buf | test.cpp:147:3:147:13 | Store: ... = ... | write |
 | test.cpp:156:12:156:18 | PointerAdd: ... + ... | test.cpp:156:12:156:14 | buf | test.cpp:147:4:147:9 | -- ... | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:154:7:154:9 | buf | buf | test.cpp:147:3:147:13 | Store: ... = ... | write |
 | test.cpp:156:12:156:18 | PointerAdd: ... + ... | test.cpp:156:12:156:14 | buf | test.cpp:147:4:147:9 | -- ... | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:154:7:154:9 | buf | buf | test.cpp:147:3:147:13 | Store: ... = ... | write |
-| test.cpp:221:5:221:11 | PointerAdd: access to array | test.cpp:217:19:217:24 | definition of buffer | test.cpp:221:5:221:11 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:217:19:217:24 | buffer | buffer | test.cpp:221:5:221:15 | Store: ... = ... | write |
 | test.cpp:221:5:221:11 | PointerAdd: access to array | test.cpp:218:23:218:28 | buffer | test.cpp:221:5:221:11 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:217:19:217:24 | buffer | buffer | test.cpp:221:5:221:15 | Store: ... = ... | write |
-| test.cpp:232:5:232:10 | PointerAdd: access to array | test.cpp:228:10:228:14 | definition of array | test.cpp:232:5:232:10 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:228:10:228:14 | array | array | test.cpp:232:5:232:19 | Store: ... = ... | write |
 | test.cpp:232:5:232:10 | PointerAdd: access to array | test.cpp:229:25:229:29 | array | test.cpp:232:5:232:10 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:228:10:228:14 | array | array | test.cpp:232:5:232:19 | Store: ... = ... | write |
-| test.cpp:261:27:261:30 | PointerAdd: access to array | test.cpp:285:19:285:25 | definition of buffer2 | test.cpp:261:27:261:30 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:285:19:285:25 | buffer2 | buffer2 | test.cpp:261:27:261:30 | Load: access to array | read |
 | test.cpp:261:27:261:30 | PointerAdd: access to array | test.cpp:286:19:286:25 | buffer2 | test.cpp:261:27:261:30 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:285:19:285:25 | buffer2 | buffer2 | test.cpp:261:27:261:30 | Load: access to array | read |
-| test.cpp:299:16:299:21 | PointerAdd: access to array | test.cpp:308:9:308:12 | definition of arr2 | test.cpp:299:16:299:21 | access to array | This pointer arithmetic may have an off-by-1014 error allowing it to overrun $@ at this $@. | test.cpp:308:9:308:12 | arr2 | arr2 | test.cpp:299:16:299:21 | Load: access to array | read |
 | test.cpp:299:16:299:21 | PointerAdd: access to array | test.cpp:309:20:309:23 | arr2 | test.cpp:299:16:299:21 | access to array | This pointer arithmetic may have an off-by-1014 error allowing it to overrun $@ at this $@. | test.cpp:308:9:308:12 | arr2 | arr2 | test.cpp:299:16:299:21 | Load: access to array | read |
-| test.cpp:322:19:322:27 | PointerAdd: ... + ... | test.cpp:314:10:314:13 | definition of temp | test.cpp:325:24:325:26 | end | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:314:10:314:13 | temp | temp | test.cpp:330:13:330:24 | Store: ... = ... | write |
-| test.cpp:322:19:322:27 | PointerAdd: ... + ... | test.cpp:314:10:314:13 | definition of temp | test.cpp:325:24:325:26 | end | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:314:10:314:13 | temp | temp | test.cpp:331:13:331:24 | Store: ... = ... | write |
-| test.cpp:322:19:322:27 | PointerAdd: ... + ... | test.cpp:314:10:314:13 | definition of temp | test.cpp:325:24:325:26 | end | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:314:10:314:13 | temp | temp | test.cpp:333:13:333:24 | Store: ... = ... | write |
 | test.cpp:322:19:322:27 | PointerAdd: ... + ... | test.cpp:322:19:322:22 | temp | test.cpp:325:24:325:26 | end | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:314:10:314:13 | temp | temp | test.cpp:330:13:330:24 | Store: ... = ... | write |
 | test.cpp:322:19:322:27 | PointerAdd: ... + ... | test.cpp:322:19:322:22 | temp | test.cpp:325:24:325:26 | end | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:314:10:314:13 | temp | temp | test.cpp:331:13:331:24 | Store: ... = ... | write |
 | test.cpp:322:19:322:27 | PointerAdd: ... + ... | test.cpp:322:19:322:22 | temp | test.cpp:325:24:325:26 | end | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:314:10:314:13 | temp | temp | test.cpp:333:13:333:24 | Store: ... = ... | write |
diff --git a/cpp/ql/test/library-tests/dataflow/certain/test.cpp b/cpp/ql/test/library-tests/dataflow/certain/test.cpp
new file mode 100644
index 000000000000..029c329a36dc
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/certain/test.cpp
@@ -0,0 +1,82 @@
+void use(...);
+
+void test1() {
+  int x = 0; // $ certain="SSA def(&x)" certain="SSA def(x)"
+  use(x);
+
+  x = 1; // $ certain="SSA def(x)"
+  use(x);
+
+  int* p = &x; // $ certain="SSA def(&p)" certain="SSA def(p)" certain="SSA def(*p)"
+  use(p);
+
+  *p = 2; // $ certain="SSA def(*p)"
+  use(p);
+
+  p = nullptr; // $ certain="SSA def(p)" certain="SSA def(*p)"
+  use(p);
+
+  *p = 2; // $ uncertain="SSA def(*p)"
+  use(p);
+}
+
+void test2(bool b) { // $ certain="SSA def(&b)" certain="SSA def(b)"
+  {
+  int x; // $ certain="SSA def(&x)" 
+  if(b) {
+    x = 0; // $ certain="SSA def(x)"
+  } else {
+    x = 1; // $ certain="SSA def(x)"
+  }
+  use(x); // $ certain="SSA phi(x)"
+  }
+
+  {
+  int x; // $ certain="SSA def(&x)" certain="SSA def(x)"
+  if(b) {
+    x = 0; // $ certain="SSA def(x)"
+  } else {
+  
+  }
+  use(x); // $ certain="SSA phi(x)"
+  }
+
+  {
+  int x; // $ certain="SSA def(&x)" certain="SSA def(x)"
+  int* p = &x; // $ certain="SSA def(&p)" certain="SSA def(p)" certain="SSA def(*p)"
+  if(b) {
+    *p = 0; // $ certain="SSA def(*p)"
+  } else {
+    *(p + 1) = 1; // $ uncertain="SSA def(*p)"
+  }
+  use(p); // $ uncertain="SSA phi(*p)"
+  }
+  
+}
+
+void test3(bool b) { // $ certain="SSA def(&b)" certain="SSA def(b)"
+  for(int i = 0; i < 10;) { // $ certain="SSA def(&i)" certain="SSA def(i)" certain="SSA phi(i)"
+    if(b) {
+      ++i; // $ certain="SSA def(i)"
+    }
+    use(i); // $ certain="SSA phi(i)"
+  }
+}
+
+void test(int x, bool b1, bool b2) { // $ certain="SSA def(&x)" certain="SSA def(x)" certain="SSA def(&b1)" certain="SSA def(b1)" certain="SSA def(&b2)" certain="SSA def(b2)"
+  int* p = &x; // $ certain="SSA def(&p)" certain="SSA def(p)" certain="SSA def(*p)" 
+  int i = 0; // $ certain="SSA def(&i)" certain="SSA def(i)"
+  int j = 0; // $ certain="SSA def(&j)" certain="SSA def(j)"
+  while (i < 10) { // $ certain="SSA phi(i)" certain="SSA phi(*p)"
+  if (b1) {
+    *p = 0; // $ certain="SSA def(*p)" 
+  }
+  ++i; // $ certain="SSA def(i)" certain="SSA phi(*p)"
+  }
+  while (j < 10) { // $ uncertain="SSA phi(*p)" certain="SSA phi(j)"
+    if (b2) {
+      *(p + j) = 0; // $ uncertain="SSA def(*p)"
+    }
+    ++j; // $ certain="SSA def(j)" uncertain="SSA phi(*p)"
+  }
+}
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/certain/test.expected b/cpp/ql/test/library-tests/dataflow/certain/test.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/cpp/ql/test/library-tests/dataflow/certain/test.ql b/cpp/ql/test/library-tests/dataflow/certain/test.ql
new file mode 100644
index 000000000000..231e3c31663e
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/certain/test.ql
@@ -0,0 +1,22 @@
+import cpp
+import utils.test.InlineExpectationsTest
+import semmle.code.cpp.dataflow.new.DataFlow::DataFlow
+
+bindingset[s]
+string quote(string s) { if s.matches("% %") then result = "\"" + s + "\"" else result = s }
+
+module AsDefinitionTest implements TestSig {
+  string getARelevantTag() { result = ["certain", "uncertain"] }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(Ssa::Definition d |
+      location = d.getLocation() and
+      element = d.toString() and
+      value = quote(d.toString())
+    |
+      if d.isCertain() then tag = "certain" else tag = "uncertain"
+    )
+  }
+}
+
+import MakeTest<AsDefinitionTest>
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
index 4e145427a362..77ee5c4abb6c 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
@@ -143,6 +143,7 @@ postWithInFlow
 | test.cpp:1153:5:1153:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1165:5:1165:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1195:5:1195:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
+| test.cpp:1337:5:1337:13 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
 viableImplInCallContextTooLarge
 uniqueParameterNodeAtPosition
 uniqueParameterNodePosition
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected
index f41def013155..3aa5b3c30e02 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected
@@ -65,52 +65,52 @@
 | test.cpp:8:8:8:9 | t1 | test.cpp:9:8:9:9 | t1 |
 | test.cpp:9:8:9:9 | t1 | test.cpp:11:7:11:8 | t1 |
 | test.cpp:9:8:9:9 | t1 | test.cpp:11:7:11:8 | t1 |
-| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | [input] SSA phi read(t2) |
-| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | [input] SSA phi(*t2) |
+| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | [input] SSA phi read(&t2) |
+| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | [input] SSA phi(t2) |
 | test.cpp:10:8:10:9 | t2 | test.cpp:13:10:13:11 | t2 |
-| test.cpp:11:7:11:8 | [input] SSA phi read(t2) | test.cpp:15:8:15:9 | t2 |
-| test.cpp:11:7:11:8 | [input] SSA phi(*t2) | test.cpp:15:8:15:9 | t2 |
+| test.cpp:11:7:11:8 | [input] SSA phi read(&t2) | test.cpp:15:8:15:9 | t2 |
+| test.cpp:11:7:11:8 | [input] SSA phi(t2) | test.cpp:15:8:15:9 | t2 |
 | test.cpp:11:7:11:8 | t1 | test.cpp:21:8:21:9 | t1 |
 | test.cpp:12:5:12:10 | ... = ... | test.cpp:13:10:13:11 | t2 |
 | test.cpp:12:10:12:10 | 0 | test.cpp:12:5:12:10 | ... = ... |
 | test.cpp:13:10:13:11 | t2 | test.cpp:15:8:15:9 | t2 |
 | test.cpp:13:10:13:11 | t2 | test.cpp:15:8:15:9 | t2 |
-| test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | [input] SSA phi read(*t2) |
+| test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | [input] SSA phi read(&t2) |
 | test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | [input] SSA phi read(t2) |
 | test.cpp:17:3:17:8 | ... = ... | test.cpp:21:8:21:9 | t1 |
 | test.cpp:17:8:17:8 | 0 | test.cpp:17:3:17:8 | ... = ... |
-| test.cpp:21:8:21:9 | t1 | test.cpp:23:19:23:19 | SSA phi read(t1) |
-| test.cpp:21:8:21:9 | t1 | test.cpp:23:19:23:19 | SSA phi(*t1) |
+| test.cpp:21:8:21:9 | t1 | test.cpp:23:19:23:19 | SSA phi read(&t1) |
+| test.cpp:21:8:21:9 | t1 | test.cpp:23:19:23:19 | SSA phi(t1) |
 | test.cpp:23:15:23:16 | 0 | test.cpp:23:15:23:16 | 0 |
-| test.cpp:23:15:23:16 | 0 | test.cpp:23:19:23:19 | SSA phi(*i) |
-| test.cpp:23:15:23:16 | [input] SSA phi read(*t2) | test.cpp:23:19:23:19 | SSA phi read(*t2) |
+| test.cpp:23:15:23:16 | 0 | test.cpp:23:19:23:19 | SSA phi(i) |
+| test.cpp:23:15:23:16 | [input] SSA phi read(&t2) | test.cpp:23:19:23:19 | SSA phi read(&t2) |
 | test.cpp:23:15:23:16 | [input] SSA phi read(t2) | test.cpp:23:19:23:19 | SSA phi read(t2) |
-| test.cpp:23:19:23:19 | SSA phi read(*t2) | test.cpp:24:10:24:11 | t2 |
-| test.cpp:23:19:23:19 | SSA phi read(i) | test.cpp:23:19:23:19 | i |
-| test.cpp:23:19:23:19 | SSA phi read(t1) | test.cpp:23:23:23:24 | t1 |
+| test.cpp:23:19:23:19 | SSA phi read(&i) | test.cpp:23:19:23:19 | i |
+| test.cpp:23:19:23:19 | SSA phi read(&t1) | test.cpp:23:23:23:24 | t1 |
+| test.cpp:23:19:23:19 | SSA phi read(&t2) | test.cpp:24:10:24:11 | t2 |
 | test.cpp:23:19:23:19 | SSA phi read(t2) | test.cpp:24:10:24:11 | t2 |
-| test.cpp:23:19:23:19 | SSA phi(*i) | test.cpp:23:19:23:19 | i |
-| test.cpp:23:19:23:19 | SSA phi(*t1) | test.cpp:23:23:23:24 | t1 |
+| test.cpp:23:19:23:19 | SSA phi(i) | test.cpp:23:19:23:19 | i |
+| test.cpp:23:19:23:19 | SSA phi(t1) | test.cpp:23:23:23:24 | t1 |
 | test.cpp:23:19:23:19 | i | test.cpp:23:27:23:27 | i |
 | test.cpp:23:19:23:19 | i | test.cpp:23:27:23:27 | i |
-| test.cpp:23:23:23:24 | t1 | test.cpp:23:27:23:29 | [input] SSA phi read(t1) |
+| test.cpp:23:23:23:24 | t1 | test.cpp:23:27:23:29 | [input] SSA phi read(&t1) |
 | test.cpp:23:23:23:24 | t1 | test.cpp:26:8:26:9 | t1 |
 | test.cpp:23:23:23:24 | t1 | test.cpp:26:8:26:9 | t1 |
 | test.cpp:23:27:23:27 | *i | test.cpp:23:27:23:27 | *i |
 | test.cpp:23:27:23:27 | *i | test.cpp:23:27:23:27 | i |
 | test.cpp:23:27:23:27 | i | test.cpp:23:27:23:27 | i |
 | test.cpp:23:27:23:27 | i | test.cpp:23:27:23:27 | i |
-| test.cpp:23:27:23:27 | i | test.cpp:23:27:23:29 | [input] SSA phi read(i) |
+| test.cpp:23:27:23:27 | i | test.cpp:23:27:23:29 | [input] SSA phi read(&i) |
 | test.cpp:23:27:23:29 | ... ++ | test.cpp:23:27:23:29 | ... ++ |
-| test.cpp:23:27:23:29 | ... ++ | test.cpp:23:27:23:29 | [input] SSA phi(*i) |
-| test.cpp:23:27:23:29 | [input] SSA phi read(*t2) | test.cpp:23:19:23:19 | SSA phi read(*t2) |
-| test.cpp:23:27:23:29 | [input] SSA phi read(i) | test.cpp:23:19:23:19 | SSA phi read(i) |
-| test.cpp:23:27:23:29 | [input] SSA phi read(t1) | test.cpp:23:19:23:19 | SSA phi read(t1) |
+| test.cpp:23:27:23:29 | ... ++ | test.cpp:23:27:23:29 | [input] SSA phi(i) |
+| test.cpp:23:27:23:29 | [input] SSA phi read(&i) | test.cpp:23:19:23:19 | SSA phi read(&i) |
+| test.cpp:23:27:23:29 | [input] SSA phi read(&t1) | test.cpp:23:19:23:19 | SSA phi read(&t1) |
+| test.cpp:23:27:23:29 | [input] SSA phi read(&t2) | test.cpp:23:19:23:19 | SSA phi read(&t2) |
 | test.cpp:23:27:23:29 | [input] SSA phi read(t2) | test.cpp:23:19:23:19 | SSA phi read(t2) |
-| test.cpp:23:27:23:29 | [input] SSA phi(*i) | test.cpp:23:19:23:19 | SSA phi(*i) |
-| test.cpp:23:27:23:29 | [input] SSA phi(*t1) | test.cpp:23:19:23:19 | SSA phi(*t1) |
-| test.cpp:24:5:24:11 | ... = ... | test.cpp:23:27:23:29 | [input] SSA phi(*t1) |
-| test.cpp:24:10:24:11 | t2 | test.cpp:23:27:23:29 | [input] SSA phi read(*t2) |
+| test.cpp:23:27:23:29 | [input] SSA phi(i) | test.cpp:23:19:23:19 | SSA phi(i) |
+| test.cpp:23:27:23:29 | [input] SSA phi(t1) | test.cpp:23:19:23:19 | SSA phi(t1) |
+| test.cpp:24:5:24:11 | ... = ... | test.cpp:23:27:23:29 | [input] SSA phi(t1) |
+| test.cpp:24:10:24:11 | t2 | test.cpp:23:27:23:29 | [input] SSA phi read(&t2) |
 | test.cpp:24:10:24:11 | t2 | test.cpp:23:27:23:29 | [input] SSA phi read(t2) |
 | test.cpp:24:10:24:11 | t2 | test.cpp:24:5:24:11 | ... = ... |
 | test.cpp:382:48:382:54 | source1 | test.cpp:384:16:384:23 | *& ... |
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
index 5ee2ca86cbcf..2ead5d7b23a2 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
@@ -171,6 +171,7 @@ astFlow
 | test.cpp:1312:7:1312:12 | call to source | test.cpp:1313:8:1313:24 | ... ? ... : ... |
 | test.cpp:1312:7:1312:12 | call to source | test.cpp:1314:8:1314:8 | x |
 | test.cpp:1329:11:1329:16 | call to source | test.cpp:1330:10:1330:10 | i |
+| test.cpp:1335:10:1335:15 | buffer | test.cpp:1336:10:1336:18 | access to array |
 | true_upon_entry.cpp:17:11:17:16 | call to source | true_upon_entry.cpp:21:8:21:8 | x |
 | true_upon_entry.cpp:27:9:27:14 | call to source | true_upon_entry.cpp:29:8:29:8 | x |
 | true_upon_entry.cpp:33:11:33:16 | call to source | true_upon_entry.cpp:39:8:39:8 | x |
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
index 892d49b00855..6e80fa75aa02 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
@@ -1329,3 +1329,11 @@ void nsdmi_test() {
   nsdmi y(source());
   sink(y.i); // $ ir ast
 }
+
+void certain_def_uninitialized_instruction_test() {
+  for(int i = 0; i < 10; i++) {
+    char buffer[10];
+    sink(buffer[0]); // $ SPURIOUS: ast
+    buffer[0] = source();
+  }
+}
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/uninitialized.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/uninitialized.expected
index 52bbcabb1e3e..0850b577dcb7 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/uninitialized.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/uninitialized.expected
@@ -59,3 +59,5 @@
 | test.cpp:1137:7:1137:10 | data | test.cpp:1138:5:1138:8 | data |
 | test.cpp:1137:7:1137:10 | data | test.cpp:1139:4:1139:7 | data |
 | test.cpp:1137:7:1137:10 | data | test.cpp:1140:10:1140:13 | data |
+| test.cpp:1335:10:1335:15 | buffer | test.cpp:1336:10:1336:15 | buffer |
+| test.cpp:1335:10:1335:15 | buffer | test.cpp:1337:5:1337:10 | buffer |
diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/sources-and-sinks.cpp b/cpp/ql/test/library-tests/dataflow/source-sink-tests/sources-and-sinks.cpp
index e4947a112f8d..7edd46344382 100644
--- a/cpp/ql/test/library-tests/dataflow/source-sink-tests/sources-and-sinks.cpp
+++ b/cpp/ql/test/library-tests/dataflow/source-sink-tests/sources-and-sinks.cpp
@@ -131,3 +131,112 @@ void test_strsafe_gets() {
 		StringCchGetsExA(dest, sizeof(dest), &end, &remaining, 0); // $ local_source
 	}
 }
+
+int scanf_s(const char *format, ...);
+int fscanf_s(FILE *stream, const char *format, ...);
+
+void test_scanf_s(FILE *stream) {
+  {
+  int n1, n2;
+  scanf_s(
+    "%d %d",
+    &n1, // $ local_source
+    &n2); // $ local_source
+  }
+
+  {
+  int n;
+  fscanf_s(stream, "%d", &n); // $ remote_source
+  }
+
+  {
+  int n1, n2;
+  char buf[256];
+  scanf_s("%d %s %d",
+    &n1, // $ local_source
+    buf, // $ local_source
+    256,
+    &n2); // $ local_source
+  }
+
+  {
+  int n1, n2;
+  char buf[256];
+  fscanf_s(stream, "%d %s %d",
+    &n1, // $ remote_source
+    buf, // $ remote_source
+    256,
+    &n2); // $ remote_source
+  }
+}
+
+typedef void *locale_t;
+
+int wscanf_s(const wchar_t *format, ...);
+int _scanf_s_l(const char *format, locale_t locale, ...);
+int _wscanf_s_l(const wchar_t *format, locale_t locale, ...);
+int fwscanf_s(FILE *stream, const wchar_t *format, ...);
+int _fscanf_s_l(FILE *stream, const char *format, locale_t locale, ...);
+int _fwscanf_s_l(FILE *stream, const wchar_t *format, locale_t locale, ...);
+
+void test_additional_scanf_s_variants(FILE *stream, locale_t locale) {
+  {
+  int n1, n2;
+  wchar_t buf[256];
+  wscanf_s(L"%d %s %d",
+    &n1, // $ local_source
+    buf, // $ local_source
+    256,
+    &n2); // $ local_source
+  }
+
+  {
+  int n1, n2;
+  char buf[256];
+  _scanf_s_l("%d %s %d", locale,
+    &n1, // $ local_source
+    buf, // $ local_source
+    256,
+    &n2); // $ local_source
+  }
+
+  {
+  int n1, n2;
+  wchar_t buf[256];
+  _wscanf_s_l(L"%d %s %d", locale,
+    &n1, // $ local_source
+    buf, // $ local_source
+    256,
+    &n2); // $ local_source
+  }
+
+  {
+  int n1, n2;
+  wchar_t buf[256];
+  fwscanf_s(stream, L"%d %s %d",
+    &n1, // $ remote_source
+    buf, // $ remote_source
+    256,
+    &n2); // $ remote_source
+  }
+
+  {
+  int n1, n2;
+  char buf[256];
+  _fscanf_s_l(stream, "%d %s %d", locale,
+    &n1, // $ remote_source
+    buf, // $ remote_source
+    256,
+    &n2); // $ remote_source
+  }
+
+  {
+  int n1, n2;
+  wchar_t buf[256];
+  _fwscanf_s_l(stream, L"%d %s %d", locale,
+    &n1, // $ remote_source
+    buf, // $ remote_source
+    256,
+    &n2); // $ remote_source
+  }
+}
diff --git a/cpp/ql/test/library-tests/friends/loop/friends.expected b/cpp/ql/test/library-tests/friends/loop/friends.expected
index a59c1f0c65cd..50030ed70bcd 100644
--- a/cpp/ql/test/library-tests/friends/loop/friends.expected
+++ b/cpp/ql/test/library-tests/friends/loop/friends.expected
@@ -1,14 +1,14 @@
-| file://:0:0:0:0 | E<C>'s friend | loop.cpp:5:26:5:26 | E<D> |
 | file://:0:0:0:0 | E<C>'s friend | loop.cpp:5:26:5:26 | E<T> |
-| file://:0:0:0:0 | E<C>'s friend | loop.cpp:10:26:10:26 | F<D> |
+| file://:0:0:0:0 | E<C>'s friend | loop.cpp:5:26:5:29 | E<D> |
 | file://:0:0:0:0 | E<C>'s friend | loop.cpp:10:26:10:26 | F<T> |
-| file://:0:0:0:0 | E<D>'s friend | loop.cpp:5:26:5:26 | E<C> |
+| file://:0:0:0:0 | E<C>'s friend | loop.cpp:10:26:10:29 | F<D> |
 | file://:0:0:0:0 | E<D>'s friend | loop.cpp:5:26:5:26 | E<T> |
-| file://:0:0:0:0 | E<D>'s friend | loop.cpp:10:26:10:26 | F<D> |
+| file://:0:0:0:0 | E<D>'s friend | loop.cpp:5:26:5:29 | E<C> |
 | file://:0:0:0:0 | E<D>'s friend | loop.cpp:10:26:10:26 | F<T> |
-| file://:0:0:0:0 | F<D>'s friend | loop.cpp:5:26:5:26 | E<C> |
-| file://:0:0:0:0 | F<D>'s friend | loop.cpp:5:26:5:26 | E<D> |
+| file://:0:0:0:0 | E<D>'s friend | loop.cpp:10:26:10:29 | F<D> |
 | file://:0:0:0:0 | F<D>'s friend | loop.cpp:5:26:5:26 | E<T> |
+| file://:0:0:0:0 | F<D>'s friend | loop.cpp:5:26:5:29 | E<C> |
+| file://:0:0:0:0 | F<D>'s friend | loop.cpp:5:26:5:29 | E<D> |
 | loop.cpp:6:5:6:5 | E<T>'s friend | loop.cpp:5:26:5:26 | E<T> |
 | loop.cpp:7:5:7:5 | E<T>'s friend | loop.cpp:7:36:7:36 | F<U> |
 | loop.cpp:11:5:11:5 | F<T>'s friend | loop.cpp:11:36:11:36 | E<U> |
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 59b5f6214f3d..f8a9e70fec7c 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -1859,7 +1859,7 @@ coroutines.cpp:
 #   13| [Constructor] void std::coroutine_handle<Promise>::coroutine_handle(std::nullptr_t)
 #   13|   <params>: 
 #   13|     getParameter(0): [Parameter] (unnamed parameter 0)
-#   13|         Type = [UsingAliasTypedefType] nullptr_t
+#   13|         Type = [TypeAliasType] nullptr_t
 #   14| [CopyConstructor] void std::coroutine_handle<Promise>::coroutine_handle(std::coroutine_handle<Promise> const&)
 #   14|   <params>: 
 #   14|     getParameter(0): [Parameter] (unnamed parameter 0)
@@ -1883,7 +1883,7 @@ coroutines.cpp:
 #   18| [MemberFunction] std::coroutine_handle<Promise>& std::coroutine_handle<Promise>::operator=(std::nullptr_t)
 #   18|   <params>: 
 #   18|     getParameter(0): [Parameter] (unnamed parameter 0)
-#   18|         Type = [UsingAliasTypedefType] nullptr_t
+#   18|         Type = [TypeAliasType] nullptr_t
 #   19| [CopyAssignmentOperator] std::coroutine_handle<Promise>& std::coroutine_handle<Promise>::operator=(std::coroutine_handle<Promise> const&)
 #   19|   <params>: 
 #   19|     getParameter(0): [Parameter] (unnamed parameter 0)
@@ -2025,7 +2025,7 @@ coroutines.cpp:
 #   87|   getEntryPoint(): [BlockStmt] { ... }
 #-----|     getStmt(0): [DeclStmt] declaration
 #   87|       getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (unnamed local variable)
-#   87|           Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   87|           Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|     getStmt(1): [TryStmt] try { ... }
 #-----|       getStmt(): [BlockStmt] { ... }
 #-----|         getStmt(0): [ExprStmt] ExprStmt
@@ -2036,7 +2036,7 @@ coroutines.cpp:
 #   87|                 Type = [Struct] suspend_always
 #   87|                 ValueCategory = prvalue
 #   87|               getQualifier(): [VariableAccess] (unnamed local variable)
-#   87|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   87|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #   87|                   ValueCategory = lvalue
 #   87|             getChild(1): [FunctionCall] call to await_ready
 #   87|                 Type = [BoolType] bool
@@ -2051,7 +2051,7 @@ coroutines.cpp:
 #   87|                       Type = [Struct] suspend_always
 #   87|                       ValueCategory = prvalue
 #   87|                     getQualifier(): [VariableAccess] (unnamed local variable)
-#   87|                         Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   87|                         Type = [NestedTypedefType,TypeAliasType] promise_type
 #   87|                         ValueCategory = lvalue
 #   87|                   getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #   87|                       Type = [Struct] suspend_always
@@ -2123,7 +2123,7 @@ coroutines.cpp:
 #-----|               Type = [VoidType] void
 #-----|               ValueCategory = prvalue
 #-----|             getQualifier(): [VariableAccess] (unnamed local variable)
-#-----|                 Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#-----|                 Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|                 ValueCategory = lvalue
 #-----|         getStmt(2): [GotoStmt] goto ...
 #-----|       getChild(1): [Handler] <handler>
@@ -2144,7 +2144,7 @@ coroutines.cpp:
 #   87|                 Type = [VoidType] void
 #   87|                 ValueCategory = prvalue
 #   87|               getQualifier(): [VariableAccess] (unnamed local variable)
-#   87|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   87|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #   87|                   ValueCategory = lvalue
 #-----|     getStmt(2): [LabelStmt] label ...:
 #-----|     getStmt(3): [ExprStmt] ExprStmt
@@ -2155,7 +2155,7 @@ coroutines.cpp:
 #   87|             Type = [Struct] suspend_always
 #   87|             ValueCategory = prvalue
 #   87|           getQualifier(): [VariableAccess] (unnamed local variable)
-#   87|               Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   87|               Type = [NestedTypedefType,TypeAliasType] promise_type
 #   87|               ValueCategory = lvalue
 #   87|         getChild(1): [FunctionCall] call to await_ready
 #   87|             Type = [BoolType] bool
@@ -2170,7 +2170,7 @@ coroutines.cpp:
 #   87|                   Type = [Struct] suspend_always
 #   87|                   ValueCategory = prvalue
 #   87|                 getQualifier(): [VariableAccess] (unnamed local variable)
-#   87|                     Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   87|                     Type = [NestedTypedefType,TypeAliasType] promise_type
 #   87|                     ValueCategory = lvalue
 #   87|               getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #   87|                   Type = [Struct] suspend_always
@@ -2238,7 +2238,7 @@ coroutines.cpp:
 #-----|               ValueCategory = prvalue(load)
 #-----|     getStmt(1): [DeclStmt] declaration
 #   91|       getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (unnamed local variable)
-#   91|           Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   91|           Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|     getStmt(2): [TryStmt] try { ... }
 #-----|       getStmt(): [BlockStmt] { ... }
 #-----|         getStmt(0): [ExprStmt] ExprStmt
@@ -2249,7 +2249,7 @@ coroutines.cpp:
 #   91|                 Type = [Struct] suspend_always
 #   91|                 ValueCategory = prvalue
 #   91|               getQualifier(): [VariableAccess] (unnamed local variable)
-#   91|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   91|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #   91|                   ValueCategory = lvalue
 #   91|             getChild(1): [FunctionCall] call to await_ready
 #   91|                 Type = [BoolType] bool
@@ -2264,7 +2264,7 @@ coroutines.cpp:
 #   91|                       Type = [Struct] suspend_always
 #   91|                       ValueCategory = prvalue
 #   91|                     getQualifier(): [VariableAccess] (unnamed local variable)
-#   91|                         Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   91|                         Type = [NestedTypedefType,TypeAliasType] promise_type
 #   91|                         ValueCategory = lvalue
 #   91|                   getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #   91|                       Type = [Struct] suspend_always
@@ -2336,7 +2336,7 @@ coroutines.cpp:
 #-----|               Type = [VoidType] void
 #-----|               ValueCategory = prvalue
 #-----|             getQualifier(): [VariableAccess] (unnamed local variable)
-#-----|                 Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#-----|                 Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|                 ValueCategory = lvalue
 #   92|             getArgument(0): [VariableAccess] i
 #   92|                 Type = [IntType] int
@@ -2360,7 +2360,7 @@ coroutines.cpp:
 #   91|                 Type = [VoidType] void
 #   91|                 ValueCategory = prvalue
 #   91|               getQualifier(): [VariableAccess] (unnamed local variable)
-#   91|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   91|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #   91|                   ValueCategory = lvalue
 #-----|     getStmt(3): [LabelStmt] label ...:
 #-----|     getStmt(4): [ExprStmt] ExprStmt
@@ -2371,7 +2371,7 @@ coroutines.cpp:
 #   91|             Type = [Struct] suspend_always
 #   91|             ValueCategory = prvalue
 #   91|           getQualifier(): [VariableAccess] (unnamed local variable)
-#   91|               Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   91|               Type = [NestedTypedefType,TypeAliasType] promise_type
 #   91|               ValueCategory = lvalue
 #   91|         getChild(1): [FunctionCall] call to await_ready
 #   91|             Type = [BoolType] bool
@@ -2386,7 +2386,7 @@ coroutines.cpp:
 #   91|                   Type = [Struct] suspend_always
 #   91|                   ValueCategory = prvalue
 #   91|                 getQualifier(): [VariableAccess] (unnamed local variable)
-#   91|                     Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   91|                     Type = [NestedTypedefType,TypeAliasType] promise_type
 #   91|                     ValueCategory = lvalue
 #   91|               getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #   91|                   Type = [Struct] suspend_always
@@ -2454,7 +2454,7 @@ coroutines.cpp:
 #-----|               ValueCategory = prvalue(load)
 #-----|     getStmt(1): [DeclStmt] declaration
 #   95|       getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (unnamed local variable)
-#   95|           Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   95|           Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|     getStmt(2): [TryStmt] try { ... }
 #-----|       getStmt(): [BlockStmt] { ... }
 #-----|         getStmt(0): [ExprStmt] ExprStmt
@@ -2465,7 +2465,7 @@ coroutines.cpp:
 #   95|                 Type = [Struct] suspend_always
 #   95|                 ValueCategory = prvalue
 #   95|               getQualifier(): [VariableAccess] (unnamed local variable)
-#   95|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   95|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #   95|                   ValueCategory = lvalue
 #   95|             getChild(1): [FunctionCall] call to await_ready
 #   95|                 Type = [BoolType] bool
@@ -2480,7 +2480,7 @@ coroutines.cpp:
 #   95|                       Type = [Struct] suspend_always
 #   95|                       ValueCategory = prvalue
 #   95|                     getQualifier(): [VariableAccess] (unnamed local variable)
-#   95|                         Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   95|                         Type = [NestedTypedefType,TypeAliasType] promise_type
 #   95|                         ValueCategory = lvalue
 #   95|                   getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #   95|                       Type = [Struct] suspend_always
@@ -2555,7 +2555,7 @@ coroutines.cpp:
 #   96|                 Type = [Struct] suspend_always
 #   96|                 ValueCategory = prvalue
 #   96|               getQualifier(): [VariableAccess] (unnamed local variable)
-#   96|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   96|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #   96|                   ValueCategory = lvalue
 #   96|               getArgument(0): [VariableAccess] i
 #   96|                   Type = [IntType] int
@@ -2573,7 +2573,7 @@ coroutines.cpp:
 #   96|                       Type = [Struct] suspend_always
 #   96|                       ValueCategory = prvalue
 #   96|                     getQualifier(): [VariableAccess] (unnamed local variable)
-#   96|                         Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   96|                         Type = [NestedTypedefType,TypeAliasType] promise_type
 #   96|                         ValueCategory = lvalue
 #   96|                     getArgument(0): [VariableAccess] i
 #   96|                         Type = [IntType] int
@@ -2635,7 +2635,7 @@ coroutines.cpp:
 #-----|               Type = [VoidType] void
 #-----|               ValueCategory = prvalue
 #-----|             getQualifier(): [VariableAccess] (unnamed local variable)
-#-----|                 Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#-----|                 Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|                 ValueCategory = lvalue
 #-----|         getStmt(3): [GotoStmt] goto ...
 #-----|       getChild(1): [Handler] <handler>
@@ -2656,7 +2656,7 @@ coroutines.cpp:
 #   95|                 Type = [VoidType] void
 #   95|                 ValueCategory = prvalue
 #   95|               getQualifier(): [VariableAccess] (unnamed local variable)
-#   95|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   95|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #   95|                   ValueCategory = lvalue
 #-----|     getStmt(3): [LabelStmt] label ...:
 #-----|     getStmt(4): [ExprStmt] ExprStmt
@@ -2667,7 +2667,7 @@ coroutines.cpp:
 #   95|             Type = [Struct] suspend_always
 #   95|             ValueCategory = prvalue
 #   95|           getQualifier(): [VariableAccess] (unnamed local variable)
-#   95|               Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   95|               Type = [NestedTypedefType,TypeAliasType] promise_type
 #   95|               ValueCategory = lvalue
 #   95|         getChild(1): [FunctionCall] call to await_ready
 #   95|             Type = [BoolType] bool
@@ -2682,7 +2682,7 @@ coroutines.cpp:
 #   95|                   Type = [Struct] suspend_always
 #   95|                   ValueCategory = prvalue
 #   95|                 getQualifier(): [VariableAccess] (unnamed local variable)
-#   95|                     Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   95|                     Type = [NestedTypedefType,TypeAliasType] promise_type
 #   95|                     ValueCategory = lvalue
 #   95|               getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #   95|                   Type = [Struct] suspend_always
@@ -2750,7 +2750,7 @@ coroutines.cpp:
 #-----|               ValueCategory = prvalue(load)
 #-----|     getStmt(1): [DeclStmt] declaration
 #   99|       getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (unnamed local variable)
-#   99|           Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   99|           Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|     getStmt(2): [TryStmt] try { ... }
 #-----|       getStmt(): [BlockStmt] { ... }
 #-----|         getStmt(0): [ExprStmt] ExprStmt
@@ -2761,7 +2761,7 @@ coroutines.cpp:
 #   99|                 Type = [Struct] suspend_always
 #   99|                 ValueCategory = prvalue
 #   99|               getQualifier(): [VariableAccess] (unnamed local variable)
-#   99|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   99|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #   99|                   ValueCategory = lvalue
 #   99|             getChild(1): [FunctionCall] call to await_ready
 #   99|                 Type = [BoolType] bool
@@ -2776,7 +2776,7 @@ coroutines.cpp:
 #   99|                       Type = [Struct] suspend_always
 #   99|                       ValueCategory = prvalue
 #   99|                     getQualifier(): [VariableAccess] (unnamed local variable)
-#   99|                         Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   99|                         Type = [NestedTypedefType,TypeAliasType] promise_type
 #   99|                         ValueCategory = lvalue
 #   99|                   getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #   99|                       Type = [Struct] suspend_always
@@ -2851,7 +2851,7 @@ coroutines.cpp:
 #  100|                 Type = [Struct] suspend_always
 #  100|                 ValueCategory = prvalue
 #  100|               getQualifier(): [VariableAccess] (unnamed local variable)
-#  100|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  100|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #  100|                   ValueCategory = lvalue
 #  100|               getArgument(0): [VariableAccess] i
 #  100|                   Type = [IntType] int
@@ -2869,7 +2869,7 @@ coroutines.cpp:
 #  100|                       Type = [Struct] suspend_always
 #  100|                       ValueCategory = prvalue
 #  100|                     getQualifier(): [VariableAccess] (unnamed local variable)
-#  100|                         Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  100|                         Type = [NestedTypedefType,TypeAliasType] promise_type
 #  100|                         ValueCategory = lvalue
 #  100|                     getArgument(0): [VariableAccess] i
 #  100|                         Type = [IntType] int
@@ -2944,7 +2944,7 @@ coroutines.cpp:
 #   99|                 Type = [VoidType] void
 #   99|                 ValueCategory = prvalue
 #   99|               getQualifier(): [VariableAccess] (unnamed local variable)
-#   99|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   99|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #   99|                   ValueCategory = lvalue
 #-----|     getStmt(3): [LabelStmt] label ...:
 #-----|     getStmt(4): [ExprStmt] ExprStmt
@@ -2955,7 +2955,7 @@ coroutines.cpp:
 #   99|             Type = [Struct] suspend_always
 #   99|             ValueCategory = prvalue
 #   99|           getQualifier(): [VariableAccess] (unnamed local variable)
-#   99|               Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   99|               Type = [NestedTypedefType,TypeAliasType] promise_type
 #   99|               ValueCategory = lvalue
 #   99|         getChild(1): [FunctionCall] call to await_ready
 #   99|             Type = [BoolType] bool
@@ -2970,7 +2970,7 @@ coroutines.cpp:
 #   99|                   Type = [Struct] suspend_always
 #   99|                   ValueCategory = prvalue
 #   99|                 getQualifier(): [VariableAccess] (unnamed local variable)
-#   99|                     Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#   99|                     Type = [NestedTypedefType,TypeAliasType] promise_type
 #   99|                     ValueCategory = lvalue
 #   99|               getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #   99|                   Type = [Struct] suspend_always
@@ -3038,7 +3038,7 @@ coroutines.cpp:
 #-----|               ValueCategory = prvalue(load)
 #-----|     getStmt(1): [DeclStmt] declaration
 #  103|       getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (unnamed local variable)
-#  103|           Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  103|           Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|     getStmt(2): [TryStmt] try { ... }
 #-----|       getStmt(): [BlockStmt] { ... }
 #-----|         getStmt(0): [ExprStmt] ExprStmt
@@ -3049,7 +3049,7 @@ coroutines.cpp:
 #  103|                 Type = [Struct] suspend_always
 #  103|                 ValueCategory = prvalue
 #  103|               getQualifier(): [VariableAccess] (unnamed local variable)
-#  103|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  103|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #  103|                   ValueCategory = lvalue
 #  103|             getChild(1): [FunctionCall] call to await_ready
 #  103|                 Type = [BoolType] bool
@@ -3064,7 +3064,7 @@ coroutines.cpp:
 #  103|                       Type = [Struct] suspend_always
 #  103|                       ValueCategory = prvalue
 #  103|                     getQualifier(): [VariableAccess] (unnamed local variable)
-#  103|                         Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  103|                         Type = [NestedTypedefType,TypeAliasType] promise_type
 #  103|                         ValueCategory = lvalue
 #  103|                   getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #  103|                       Type = [Struct] suspend_always
@@ -3139,7 +3139,7 @@ coroutines.cpp:
 #  104|                 Type = [Struct] suspend_always
 #  104|                 ValueCategory = prvalue
 #  104|               getQualifier(): [VariableAccess] (unnamed local variable)
-#  104|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  104|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #  104|                   ValueCategory = lvalue
 #  104|               getArgument(0): [VariableAccess] i
 #  104|                   Type = [IntType] int
@@ -3157,7 +3157,7 @@ coroutines.cpp:
 #  104|                       Type = [Struct] suspend_always
 #  104|                       ValueCategory = prvalue
 #  104|                     getQualifier(): [VariableAccess] (unnamed local variable)
-#  104|                         Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  104|                         Type = [NestedTypedefType,TypeAliasType] promise_type
 #  104|                         ValueCategory = lvalue
 #  104|                     getArgument(0): [VariableAccess] i
 #  104|                         Type = [IntType] int
@@ -3219,7 +3219,7 @@ coroutines.cpp:
 #-----|               Type = [VoidType] void
 #-----|               ValueCategory = prvalue
 #-----|             getQualifier(): [VariableAccess] (unnamed local variable)
-#-----|                 Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#-----|                 Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|                 ValueCategory = lvalue
 #-----|         getStmt(3): [GotoStmt] goto ...
 #-----|       getChild(1): [Handler] <handler>
@@ -3240,7 +3240,7 @@ coroutines.cpp:
 #  103|                 Type = [VoidType] void
 #  103|                 ValueCategory = prvalue
 #  103|               getQualifier(): [VariableAccess] (unnamed local variable)
-#  103|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  103|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #  103|                   ValueCategory = lvalue
 #-----|     getStmt(3): [LabelStmt] label ...:
 #-----|     getStmt(4): [ExprStmt] ExprStmt
@@ -3251,7 +3251,7 @@ coroutines.cpp:
 #  103|             Type = [Struct] suspend_always
 #  103|             ValueCategory = prvalue
 #  103|           getQualifier(): [VariableAccess] (unnamed local variable)
-#  103|               Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  103|               Type = [NestedTypedefType,TypeAliasType] promise_type
 #  103|               ValueCategory = lvalue
 #  103|         getChild(1): [FunctionCall] call to await_ready
 #  103|             Type = [BoolType] bool
@@ -3266,7 +3266,7 @@ coroutines.cpp:
 #  103|                   Type = [Struct] suspend_always
 #  103|                   ValueCategory = prvalue
 #  103|                 getQualifier(): [VariableAccess] (unnamed local variable)
-#  103|                     Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  103|                     Type = [NestedTypedefType,TypeAliasType] promise_type
 #  103|                     ValueCategory = lvalue
 #  103|               getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #  103|                   Type = [Struct] suspend_always
@@ -3334,7 +3334,7 @@ coroutines.cpp:
 #-----|               ValueCategory = prvalue(load)
 #-----|     getStmt(1): [DeclStmt] declaration
 #  108|       getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (unnamed local variable)
-#  108|           Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  108|           Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|     getStmt(2): [TryStmt] try { ... }
 #-----|       getStmt(): [BlockStmt] { ... }
 #-----|         getStmt(0): [ExprStmt] ExprStmt
@@ -3345,7 +3345,7 @@ coroutines.cpp:
 #  108|                 Type = [Struct] suspend_always
 #  108|                 ValueCategory = prvalue
 #  108|               getQualifier(): [VariableAccess] (unnamed local variable)
-#  108|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  108|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #  108|                   ValueCategory = lvalue
 #  108|             getChild(1): [FunctionCall] call to await_ready
 #  108|                 Type = [BoolType] bool
@@ -3360,7 +3360,7 @@ coroutines.cpp:
 #  108|                       Type = [Struct] suspend_always
 #  108|                       ValueCategory = prvalue
 #  108|                     getQualifier(): [VariableAccess] (unnamed local variable)
-#  108|                         Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  108|                         Type = [NestedTypedefType,TypeAliasType] promise_type
 #  108|                         ValueCategory = lvalue
 #  108|                   getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #  108|                       Type = [Struct] suspend_always
@@ -3435,7 +3435,7 @@ coroutines.cpp:
 #  109|                 Type = [Struct] suspend_always
 #  109|                 ValueCategory = prvalue
 #  109|               getQualifier(): [VariableAccess] (unnamed local variable)
-#  109|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  109|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #  109|                   ValueCategory = lvalue
 #  109|               getArgument(0): [VariableAccess] i
 #  109|                   Type = [IntType] int
@@ -3453,7 +3453,7 @@ coroutines.cpp:
 #  109|                       Type = [Struct] suspend_always
 #  109|                       ValueCategory = prvalue
 #  109|                     getQualifier(): [VariableAccess] (unnamed local variable)
-#  109|                         Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  109|                         Type = [NestedTypedefType,TypeAliasType] promise_type
 #  109|                         ValueCategory = lvalue
 #  109|                     getArgument(0): [VariableAccess] i
 #  109|                         Type = [IntType] int
@@ -3515,7 +3515,7 @@ coroutines.cpp:
 #-----|               Type = [VoidType] void
 #-----|               ValueCategory = prvalue
 #-----|             getQualifier(): [VariableAccess] (unnamed local variable)
-#-----|                 Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#-----|                 Type = [NestedTypedefType,TypeAliasType] promise_type
 #-----|                 ValueCategory = lvalue
 #  110|             getArgument(0): [AddExpr] ... + ...
 #  110|                 Type = [IntType] int
@@ -3549,7 +3549,7 @@ coroutines.cpp:
 #  108|                 Type = [VoidType] void
 #  108|                 ValueCategory = prvalue
 #  108|               getQualifier(): [VariableAccess] (unnamed local variable)
-#  108|                   Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  108|                   Type = [NestedTypedefType,TypeAliasType] promise_type
 #  108|                   ValueCategory = lvalue
 #-----|     getStmt(3): [LabelStmt] label ...:
 #-----|     getStmt(4): [ExprStmt] ExprStmt
@@ -3560,7 +3560,7 @@ coroutines.cpp:
 #  108|             Type = [Struct] suspend_always
 #  108|             ValueCategory = prvalue
 #  108|           getQualifier(): [VariableAccess] (unnamed local variable)
-#  108|               Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  108|               Type = [NestedTypedefType,TypeAliasType] promise_type
 #  108|               ValueCategory = lvalue
 #  108|         getChild(1): [FunctionCall] call to await_ready
 #  108|             Type = [BoolType] bool
@@ -3575,7 +3575,7 @@ coroutines.cpp:
 #  108|                   Type = [Struct] suspend_always
 #  108|                   ValueCategory = prvalue
 #  108|                 getQualifier(): [VariableAccess] (unnamed local variable)
-#  108|                     Type = [NestedTypedefType,UsingAliasTypedefType] promise_type
+#  108|                     Type = [NestedTypedefType,TypeAliasType] promise_type
 #  108|                     ValueCategory = lvalue
 #  108|               getOperand().getFullyConverted(): [TemporaryObjectExpr] temporary object
 #  108|                   Type = [Struct] suspend_always
@@ -12796,10 +12796,10 @@ ir.cpp:
 # 1127|                   ValueCategory = lvalue
 # 1127|       getBeginEndDeclaration(): [DeclStmt] declaration
 # 1127|         getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (__begin)
-# 1127|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1127|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__begin)
 # 1127|             getExpr(): [FunctionCall] call to begin
-# 1127|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1127|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 1127|                 ValueCategory = prvalue
 # 1127|               getQualifier(): [VariableAccess] (__range)
 # 1127|                   Type = [LValueReferenceType] const vector<int> &
@@ -12808,10 +12808,10 @@ ir.cpp:
 #-----|                   Type = [SpecifiedType] const vector<int>
 #-----|                   ValueCategory = lvalue
 # 1127|         getDeclarationEntry(1): [VariableDeclarationEntry] declaration of (__end)
-# 1127|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1127|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__end)
 # 1127|             getExpr(): [FunctionCall] call to end
-# 1127|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1127|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 1127|                 ValueCategory = prvalue
 # 1127|               getQualifier(): [VariableAccess] (__range)
 # 1127|                   Type = [LValueReferenceType] const vector<int> &
@@ -12823,13 +12823,13 @@ ir.cpp:
 # 1127|           Type = [BoolType] bool
 # 1127|           ValueCategory = prvalue
 # 1127|         getQualifier(): [VariableAccess] (__begin)
-# 1127|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1127|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 1127|             ValueCategory = lvalue
 # 1127|         getArgument(0): [ConstructorCall] call to iterator
 # 1127|             Type = [VoidType] void
 # 1127|             ValueCategory = prvalue
 # 1127|           getArgument(0): [VariableAccess] (__end)
-# 1127|               Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1127|               Type = [NestedTypedefType,TypeAliasType] iterator
 # 1127|               ValueCategory = lvalue
 #-----|           getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
 #-----|               Type = [LValueReferenceType] const iterator<random_access_iterator_tag, int, ptrdiff_t, int *, int &> &
@@ -12849,7 +12849,7 @@ ir.cpp:
 # 1127|           Type = [LValueReferenceType] iterator<random_access_iterator_tag, int, ptrdiff_t, int *, int &> &
 # 1127|           ValueCategory = prvalue
 # 1127|         getQualifier(): [VariableAccess] (__begin)
-# 1127|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1127|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 1127|             ValueCategory = lvalue
 # 1127|       getChild(5): [DeclStmt] declaration
 # 1127|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of e
@@ -12859,7 +12859,7 @@ ir.cpp:
 # 1127|                 Type = [LValueReferenceType] int &
 # 1127|                 ValueCategory = prvalue
 # 1127|               getQualifier(): [VariableAccess] (__begin)
-# 1127|                   Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1127|                   Type = [NestedTypedefType,TypeAliasType] iterator
 # 1127|                   ValueCategory = lvalue
 #-----|               getQualifier().getFullyConverted(): [CStyleCast] (const iterator<random_access_iterator_tag, int, ptrdiff_t, int *, int &>)...
 #-----|                   Conversion = [GlvalueConversion] glvalue conversion
@@ -12902,10 +12902,10 @@ ir.cpp:
 # 1133|                   ValueCategory = lvalue
 # 1133|       getBeginEndDeclaration(): [DeclStmt] declaration
 # 1133|         getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (__begin)
-# 1133|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1133|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__begin)
 # 1133|             getExpr(): [FunctionCall] call to begin
-# 1133|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1133|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 1133|                 ValueCategory = prvalue
 # 1133|               getQualifier(): [VariableAccess] (__range)
 # 1133|                   Type = [LValueReferenceType] const vector<int> &
@@ -12914,10 +12914,10 @@ ir.cpp:
 #-----|                   Type = [SpecifiedType] const vector<int>
 #-----|                   ValueCategory = lvalue
 # 1133|         getDeclarationEntry(1): [VariableDeclarationEntry] declaration of (__end)
-# 1133|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1133|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__end)
 # 1133|             getExpr(): [FunctionCall] call to end
-# 1133|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1133|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 1133|                 ValueCategory = prvalue
 # 1133|               getQualifier(): [VariableAccess] (__range)
 # 1133|                   Type = [LValueReferenceType] const vector<int> &
@@ -12929,13 +12929,13 @@ ir.cpp:
 # 1133|           Type = [BoolType] bool
 # 1133|           ValueCategory = prvalue
 # 1133|         getQualifier(): [VariableAccess] (__begin)
-# 1133|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1133|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 1133|             ValueCategory = lvalue
 # 1133|         getArgument(0): [ConstructorCall] call to iterator
 # 1133|             Type = [VoidType] void
 # 1133|             ValueCategory = prvalue
 # 1133|           getArgument(0): [VariableAccess] (__end)
-# 1133|               Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1133|               Type = [NestedTypedefType,TypeAliasType] iterator
 # 1133|               ValueCategory = lvalue
 #-----|           getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
 #-----|               Type = [LValueReferenceType] const iterator<random_access_iterator_tag, int, ptrdiff_t, int *, int &> &
@@ -12955,7 +12955,7 @@ ir.cpp:
 # 1133|           Type = [LValueReferenceType] iterator<random_access_iterator_tag, int, ptrdiff_t, int *, int &> &
 # 1133|           ValueCategory = prvalue
 # 1133|         getQualifier(): [VariableAccess] (__begin)
-# 1133|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1133|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 1133|             ValueCategory = lvalue
 # 1133|       getChild(5): [DeclStmt] declaration
 # 1133|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of e
@@ -12965,7 +12965,7 @@ ir.cpp:
 # 1133|                 Type = [LValueReferenceType] int &
 # 1133|                 ValueCategory = prvalue
 # 1133|               getQualifier(): [VariableAccess] (__begin)
-# 1133|                   Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 1133|                   Type = [NestedTypedefType,TypeAliasType] iterator
 # 1133|                   ValueCategory = lvalue
 #-----|               getQualifier().getFullyConverted(): [CStyleCast] (const iterator<random_access_iterator_tag, int, ptrdiff_t, int *, int &>)...
 #-----|                   Conversion = [GlvalueConversion] glvalue conversion
@@ -16083,7 +16083,7 @@ ir.cpp:
 # 1634|                 Type = [LValueReferenceType] type &
 # 1634|                 ValueCategory = prvalue
 # 1634|               getExpr(): [ReferenceDereferenceExpr] (reference dereference)
-# 1634|                   Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1634|                   Type = [NestedTypedefType,TypeAliasType] type
 # 1634|                   ValueCategory = lvalue
 # 1634|         getDeclarationEntry(2): [VariableDeclarationEntry] definition of d
 # 1634|             Type = [LValueReferenceType] type &
@@ -16098,13 +16098,13 @@ ir.cpp:
 # 1634|                 Type = [LValueReferenceType] type &
 # 1634|                 ValueCategory = prvalue
 # 1634|               getExpr(): [ReferenceDereferenceExpr] (reference dereference)
-# 1634|                   Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1634|                   Type = [NestedTypedefType,TypeAliasType] type
 # 1634|                   ValueCategory = lvalue
 # 1634|         getDeclarationEntry(3): [VariableDeclarationEntry] definition of r
-# 1634|             Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1634|             Type = [NestedTypedefType,TypeAliasType] type
 #-----|           getVariable().getInitializer(): [Initializer] initializer for r
 # 1634|             getExpr(): [FunctionCall] call to get
-# 1634|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1634|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1634|                 ValueCategory = prvalue
 # 1634|               getQualifier(): [VariableAccess] (unnamed local variable)
 # 1634|                   Type = [Struct] StructuredBindingTupleRefGet
@@ -16117,17 +16117,17 @@ ir.cpp:
 # 1634|                   ValueCategory = lvalue
 # 1635|       getStmt(1): [ExprStmt] ExprStmt
 # 1635|         getExpr(): [AssignExpr] ... = ...
-# 1635|             Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1635|             Type = [NestedTypedefType,TypeAliasType] type
 # 1635|             ValueCategory = lvalue
 # 1635|           getLValue(): [VariableAccess] d
 # 1635|               Type = [LValueReferenceType] type &
 # 1635|               ValueCategory = prvalue(load)
 # 1635|           getRValue(): [Literal] 4.0
-# 1635|               Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1635|               Type = [NestedTypedefType,TypeAliasType] type
 # 1635|               Value = [Literal] 4.0
 # 1635|               ValueCategory = prvalue
 # 1635|           getLValue().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
-# 1635|               Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1635|               Type = [NestedTypedefType,TypeAliasType] type
 # 1635|               ValueCategory = lvalue
 # 1636|       getStmt(2): [DeclStmt] declaration
 # 1636|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of rd
@@ -16140,7 +16140,7 @@ ir.cpp:
 # 1636|                 Type = [LValueReferenceType] type &
 # 1636|                 ValueCategory = prvalue
 # 1636|               getExpr(): [ReferenceDereferenceExpr] (reference dereference)
-# 1636|                   Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1636|                   Type = [NestedTypedefType,TypeAliasType] type
 # 1636|                   ValueCategory = lvalue
 # 1637|       getStmt(3): [DeclStmt] declaration
 # 1637|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of v
@@ -16150,14 +16150,14 @@ ir.cpp:
 # 1637|                 Type = [LValueReferenceType] type &
 # 1637|                 ValueCategory = prvalue(load)
 # 1637|             getExpr().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
-# 1637|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1637|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1637|                 ValueCategory = prvalue(load)
 # 1638|       getStmt(4): [ExprStmt] ExprStmt
 # 1638|         getExpr(): [AssignExpr] ... = ...
 # 1638|             Type = [IntType] int
 # 1638|             ValueCategory = lvalue
 # 1638|           getLValue(): [VariableAccess] r
-# 1638|               Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1638|               Type = [NestedTypedefType,TypeAliasType] type
 # 1638|               ValueCategory = prvalue(load)
 # 1638|           getRValue(): [Literal] 5
 # 1638|               Type = [IntType] int
@@ -16171,7 +16171,7 @@ ir.cpp:
 # 1639|             Type = [LValueReferenceType] int &
 # 1639|           getVariable().getInitializer(): [Initializer] initializer for rr
 # 1639|             getExpr(): [VariableAccess] r
-# 1639|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1639|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1639|                 ValueCategory = prvalue(load)
 # 1639|             getExpr().getFullyConverted(): [ReferenceToExpr] (reference to)
 # 1639|                 Type = [LValueReferenceType] int &
@@ -16184,7 +16184,7 @@ ir.cpp:
 # 1640|             Type = [IntType] int
 # 1640|           getVariable().getInitializer(): [Initializer] initializer for w
 # 1640|             getExpr(): [VariableAccess] r
-# 1640|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1640|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1640|                 ValueCategory = prvalue(load)
 # 1640|             getExpr().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
 # 1640|                 Type = [IntType] int
@@ -16211,7 +16211,7 @@ ir.cpp:
 # 1645|                 Type = [LValueReferenceType] type &
 # 1645|                 ValueCategory = prvalue
 # 1645|               getExpr(): [ReferenceDereferenceExpr] (reference dereference)
-# 1645|                   Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1645|                   Type = [NestedTypedefType,TypeAliasType] type
 # 1645|                   ValueCategory = lvalue
 # 1646|       getStmt(2): [DeclStmt] declaration
 # 1646|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of d
@@ -16227,14 +16227,14 @@ ir.cpp:
 # 1646|                 Type = [LValueReferenceType] type &
 # 1646|                 ValueCategory = prvalue
 # 1646|               getExpr(): [ReferenceDereferenceExpr] (reference dereference)
-# 1646|                   Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1646|                   Type = [NestedTypedefType,TypeAliasType] type
 # 1646|                   ValueCategory = lvalue
 # 1647|       getStmt(3): [DeclStmt] declaration
 # 1647|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of r
 # 1647|             Type = [LValueReferenceType] int &
 # 1647|           getVariable().getInitializer(): [Initializer] initializer for r
 # 1647|             getExpr(): [FunctionCall] call to get
-# 1647|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1647|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1647|                 ValueCategory = prvalue
 # 1647|               getQualifier(): [VariableAccess] unnamed_local_variable
 # 1647|                   Type = [Struct] StructuredBindingTupleRefGet
@@ -16247,17 +16247,17 @@ ir.cpp:
 # 1647|                   ValueCategory = lvalue
 # 1648|       getStmt(4): [ExprStmt] ExprStmt
 # 1648|         getExpr(): [AssignExpr] ... = ...
-# 1648|             Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1648|             Type = [NestedTypedefType,TypeAliasType] type
 # 1648|             ValueCategory = lvalue
 # 1648|           getLValue(): [VariableAccess] d
 # 1648|               Type = [LValueReferenceType] type &
 # 1648|               ValueCategory = prvalue(load)
 # 1648|           getRValue(): [Literal] 4.0
-# 1648|               Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1648|               Type = [NestedTypedefType,TypeAliasType] type
 # 1648|               Value = [Literal] 4.0
 # 1648|               ValueCategory = prvalue
 # 1648|           getLValue().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
-# 1648|               Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1648|               Type = [NestedTypedefType,TypeAliasType] type
 # 1648|               ValueCategory = lvalue
 # 1649|       getStmt(5): [DeclStmt] declaration
 # 1649|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of rd
@@ -16270,7 +16270,7 @@ ir.cpp:
 # 1649|                 Type = [LValueReferenceType] type &
 # 1649|                 ValueCategory = prvalue
 # 1649|               getExpr(): [ReferenceDereferenceExpr] (reference dereference)
-# 1649|                   Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1649|                   Type = [NestedTypedefType,TypeAliasType] type
 # 1649|                   ValueCategory = lvalue
 # 1650|       getStmt(6): [DeclStmt] declaration
 # 1650|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of v
@@ -16280,7 +16280,7 @@ ir.cpp:
 # 1650|                 Type = [LValueReferenceType] type &
 # 1650|                 ValueCategory = prvalue(load)
 # 1650|             getExpr().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
-# 1650|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1650|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1650|                 ValueCategory = prvalue(load)
 # 1651|       getStmt(7): [ExprStmt] ExprStmt
 # 1651|         getExpr(): [AssignExpr] ... = ...
@@ -16442,7 +16442,7 @@ ir.cpp:
 # 1700|             Type = [RValueReferenceType] type &&
 #-----|           getVariable().getInitializer(): [Initializer] initializer for i
 # 1700|             getExpr(): [FunctionCall] call to get
-# 1700|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1700|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1700|                 ValueCategory = prvalue
 # 1700|               getQualifier(): [VariableAccess] (unnamed local variable)
 # 1700|                   Type = [LValueReferenceType] StructuredBindingTupleNoRefGet &
@@ -16454,13 +16454,13 @@ ir.cpp:
 # 1700|                 Type = [LValueReferenceType] type &
 # 1700|                 ValueCategory = prvalue
 # 1700|               getExpr(): [TemporaryObjectExpr] temporary object
-# 1700|                   Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1700|                   Type = [NestedTypedefType,TypeAliasType] type
 # 1700|                   ValueCategory = lvalue
 # 1700|         getDeclarationEntry(2): [VariableDeclarationEntry] definition of r
-# 1700|             Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1700|             Type = [NestedTypedefType,TypeAliasType] type
 #-----|           getVariable().getInitializer(): [Initializer] initializer for r
 # 1700|             getExpr(): [FunctionCall] call to get
-# 1700|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1700|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1700|                 ValueCategory = prvalue
 # 1700|               getQualifier(): [VariableAccess] (unnamed local variable)
 # 1700|                   Type = [LValueReferenceType] StructuredBindingTupleNoRefGet &
@@ -16475,10 +16475,10 @@ ir.cpp:
 # 1700|                   Type = [IntType] int
 # 1700|                   ValueCategory = lvalue
 # 1700|         getDeclarationEntry(3): [VariableDeclarationEntry] definition of rv
-# 1700|             Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1700|             Type = [NestedTypedefType,TypeAliasType] type
 #-----|           getVariable().getInitializer(): [Initializer] initializer for rv
 # 1700|             getExpr(): [FunctionCall] call to get
-# 1700|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1700|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1700|                 ValueCategory = prvalue
 # 1700|               getQualifier(): [VariableAccess] (unnamed local variable)
 # 1700|                   Type = [LValueReferenceType] StructuredBindingTupleNoRefGet &
@@ -16494,17 +16494,17 @@ ir.cpp:
 # 1700|                   ValueCategory = xvalue
 # 1701|       getStmt(1): [ExprStmt] ExprStmt
 # 1701|         getExpr(): [AssignExpr] ... = ...
-# 1701|             Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1701|             Type = [NestedTypedefType,TypeAliasType] type
 # 1701|             ValueCategory = lvalue
 # 1701|           getLValue(): [VariableAccess] i
 # 1701|               Type = [RValueReferenceType] type &&
 # 1701|               ValueCategory = prvalue(load)
 # 1701|           getRValue(): [Literal] 4
-# 1701|               Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1701|               Type = [NestedTypedefType,TypeAliasType] type
 # 1701|               Value = [Literal] 4
 # 1701|               ValueCategory = prvalue
 # 1701|           getLValue().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
-# 1701|               Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1701|               Type = [NestedTypedefType,TypeAliasType] type
 # 1701|               ValueCategory = lvalue
 # 1702|       getStmt(2): [DeclStmt] declaration
 # 1702|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of ri
@@ -16517,7 +16517,7 @@ ir.cpp:
 # 1702|                 Type = [LValueReferenceType] type &
 # 1702|                 ValueCategory = prvalue
 # 1702|               getExpr(): [ReferenceDereferenceExpr] (reference dereference)
-# 1702|                   Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1702|                   Type = [NestedTypedefType,TypeAliasType] type
 # 1702|                   ValueCategory = lvalue
 # 1703|       getStmt(3): [DeclStmt] declaration
 # 1703|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of v
@@ -16527,14 +16527,14 @@ ir.cpp:
 # 1703|                 Type = [RValueReferenceType] type &&
 # 1703|                 ValueCategory = prvalue(load)
 # 1703|             getExpr().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
-# 1703|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1703|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1703|                 ValueCategory = prvalue(load)
 # 1704|       getStmt(4): [ExprStmt] ExprStmt
 # 1704|         getExpr(): [AssignExpr] ... = ...
 # 1704|             Type = [IntType] int
 # 1704|             ValueCategory = lvalue
 # 1704|           getLValue(): [VariableAccess] r
-# 1704|               Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1704|               Type = [NestedTypedefType,TypeAliasType] type
 # 1704|               ValueCategory = prvalue(load)
 # 1704|           getRValue(): [Literal] 5
 # 1704|               Type = [IntType] int
@@ -16548,7 +16548,7 @@ ir.cpp:
 # 1705|             Type = [LValueReferenceType] int &
 # 1705|           getVariable().getInitializer(): [Initializer] initializer for rr
 # 1705|             getExpr(): [VariableAccess] r
-# 1705|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1705|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1705|                 ValueCategory = prvalue(load)
 # 1705|             getExpr().getFullyConverted(): [ReferenceToExpr] (reference to)
 # 1705|                 Type = [LValueReferenceType] int &
@@ -16561,7 +16561,7 @@ ir.cpp:
 # 1706|             Type = [IntType] int
 # 1706|           getVariable().getInitializer(): [Initializer] initializer for w
 # 1706|             getExpr(): [VariableAccess] r
-# 1706|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1706|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1706|                 ValueCategory = prvalue(load)
 # 1706|             getExpr().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
 # 1706|                 Type = [IntType] int
@@ -16582,7 +16582,7 @@ ir.cpp:
 # 1711|             Type = [RValueReferenceType] type &&
 # 1711|           getVariable().getInitializer(): [Initializer] initializer for i
 # 1711|             getExpr(): [FunctionCall] call to get
-# 1711|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1711|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1711|                 ValueCategory = prvalue
 # 1711|               getQualifier(): [VariableAccess] unnamed_local_variable
 # 1711|                   Type = [LValueReferenceType] StructuredBindingTupleNoRefGet &
@@ -16594,14 +16594,14 @@ ir.cpp:
 # 1711|                 Type = [LValueReferenceType] type &
 # 1711|                 ValueCategory = prvalue
 # 1711|               getExpr(): [TemporaryObjectExpr] temporary object
-# 1711|                   Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1711|                   Type = [NestedTypedefType,TypeAliasType] type
 # 1711|                   ValueCategory = lvalue
 # 1712|       getStmt(2): [DeclStmt] declaration
 # 1712|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of r
 # 1712|             Type = [LValueReferenceType] int &
 # 1712|           getVariable().getInitializer(): [Initializer] initializer for r
 # 1712|             getExpr(): [FunctionCall] call to get
-# 1712|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1712|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1712|                 ValueCategory = prvalue
 # 1712|               getQualifier(): [VariableAccess] unnamed_local_variable
 # 1712|                   Type = [LValueReferenceType] StructuredBindingTupleNoRefGet &
@@ -16620,7 +16620,7 @@ ir.cpp:
 # 1713|             Type = [RValueReferenceType] int &&
 # 1713|           getVariable().getInitializer(): [Initializer] initializer for rv
 # 1713|             getExpr(): [FunctionCall] call to get
-# 1713|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1713|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1713|                 ValueCategory = prvalue
 # 1713|               getQualifier(): [VariableAccess] unnamed_local_variable
 # 1713|                   Type = [LValueReferenceType] StructuredBindingTupleNoRefGet &
@@ -16636,17 +16636,17 @@ ir.cpp:
 # 1713|                   ValueCategory = xvalue
 # 1714|       getStmt(4): [ExprStmt] ExprStmt
 # 1714|         getExpr(): [AssignExpr] ... = ...
-# 1714|             Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1714|             Type = [NestedTypedefType,TypeAliasType] type
 # 1714|             ValueCategory = lvalue
 # 1714|           getLValue(): [VariableAccess] i
 # 1714|               Type = [RValueReferenceType] type &&
 # 1714|               ValueCategory = prvalue(load)
 # 1714|           getRValue(): [Literal] 4
-# 1714|               Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1714|               Type = [NestedTypedefType,TypeAliasType] type
 # 1714|               Value = [Literal] 4
 # 1714|               ValueCategory = prvalue
 # 1714|           getLValue().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
-# 1714|               Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1714|               Type = [NestedTypedefType,TypeAliasType] type
 # 1714|               ValueCategory = lvalue
 # 1715|       getStmt(5): [DeclStmt] declaration
 # 1715|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of ri
@@ -16659,7 +16659,7 @@ ir.cpp:
 # 1715|                 Type = [LValueReferenceType] type &
 # 1715|                 ValueCategory = prvalue
 # 1715|               getExpr(): [ReferenceDereferenceExpr] (reference dereference)
-# 1715|                   Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1715|                   Type = [NestedTypedefType,TypeAliasType] type
 # 1715|                   ValueCategory = lvalue
 # 1716|       getStmt(6): [DeclStmt] declaration
 # 1716|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of v
@@ -16669,7 +16669,7 @@ ir.cpp:
 # 1716|                 Type = [RValueReferenceType] type &&
 # 1716|                 ValueCategory = prvalue(load)
 # 1716|             getExpr().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
-# 1716|                 Type = [NestedTypedefType,UsingAliasTypedefType] type
+# 1716|                 Type = [NestedTypedefType,TypeAliasType] type
 # 1716|                 ValueCategory = prvalue(load)
 # 1717|       getStmt(7): [ExprStmt] ExprStmt
 # 1717|         getExpr(): [AssignExpr] ... = ...
@@ -20080,10 +20080,10 @@ ir.cpp:
 # 2218|                 ValueCategory = prvalue
 # 2218|       getBeginEndDeclaration(): [DeclStmt] declaration
 # 2218|         getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (__begin)
-# 2218|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2218|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__begin)
 # 2218|             getExpr(): [FunctionCall] call to begin
-# 2218|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2218|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2218|                 ValueCategory = prvalue
 # 2218|               getQualifier(): [VariableAccess] (__range)
 # 2218|                   Type = [LValueReferenceType] vector<ClassWithDestructor> &
@@ -20096,10 +20096,10 @@ ir.cpp:
 #-----|                     Type = [ClassTemplateInstantiation,Struct] vector<ClassWithDestructor>
 #-----|                     ValueCategory = lvalue
 # 2218|         getDeclarationEntry(1): [VariableDeclarationEntry] declaration of (__end)
-# 2218|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2218|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__end)
 # 2218|             getExpr(): [FunctionCall] call to end
-# 2218|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2218|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2218|                 ValueCategory = prvalue
 # 2218|               getQualifier(): [VariableAccess] (__range)
 # 2218|                   Type = [LValueReferenceType] vector<ClassWithDestructor> &
@@ -20115,13 +20115,13 @@ ir.cpp:
 # 2218|           Type = [BoolType] bool
 # 2218|           ValueCategory = prvalue
 # 2218|         getQualifier(): [VariableAccess] (__begin)
-# 2218|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2218|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2218|             ValueCategory = lvalue
 # 2218|         getArgument(0): [ConstructorCall] call to iterator
 # 2218|             Type = [VoidType] void
 # 2218|             ValueCategory = prvalue
 # 2218|           getArgument(0): [VariableAccess] (__end)
-# 2218|               Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2218|               Type = [NestedTypedefType,TypeAliasType] iterator
 # 2218|               ValueCategory = lvalue
 #-----|           getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
 #-----|               Type = [LValueReferenceType] const iterator<random_access_iterator_tag, ClassWithDestructor, ptrdiff_t, ClassWithDestructor *, ClassWithDestructor &> &
@@ -20141,7 +20141,7 @@ ir.cpp:
 # 2218|           Type = [LValueReferenceType] iterator<random_access_iterator_tag, ClassWithDestructor, ptrdiff_t, ClassWithDestructor *, ClassWithDestructor &> &
 # 2218|           ValueCategory = prvalue
 # 2218|         getQualifier(): [VariableAccess] (__begin)
-# 2218|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2218|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2218|             ValueCategory = lvalue
 # 2218|       getChild(5): [DeclStmt] declaration
 # 2218|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
@@ -20151,7 +20151,7 @@ ir.cpp:
 # 2218|                 Type = [LValueReferenceType] ClassWithDestructor &
 # 2218|                 ValueCategory = prvalue
 # 2218|               getQualifier(): [VariableAccess] (__begin)
-# 2218|                   Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2218|                   Type = [NestedTypedefType,TypeAliasType] iterator
 # 2218|                   ValueCategory = lvalue
 #-----|               getQualifier().getFullyConverted(): [CStyleCast] (const iterator<random_access_iterator_tag, ClassWithDestructor, ptrdiff_t, ClassWithDestructor *, ClassWithDestructor &>)...
 #-----|                   Conversion = [GlvalueConversion] glvalue conversion
@@ -20218,10 +20218,10 @@ ir.cpp:
 # 2221|                 ValueCategory = prvalue
 # 2221|       getBeginEndDeclaration(): [DeclStmt] declaration
 # 2221|         getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (__begin)
-# 2221|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2221|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__begin)
 # 2221|             getExpr(): [FunctionCall] call to begin
-# 2221|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2221|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2221|                 ValueCategory = prvalue
 # 2221|               getQualifier(): [VariableAccess] (__range)
 # 2221|                   Type = [LValueReferenceType] vector<ClassWithDestructor> &
@@ -20234,10 +20234,10 @@ ir.cpp:
 #-----|                     Type = [ClassTemplateInstantiation,Struct] vector<ClassWithDestructor>
 #-----|                     ValueCategory = lvalue
 # 2221|         getDeclarationEntry(1): [VariableDeclarationEntry] declaration of (__end)
-# 2221|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2221|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__end)
 # 2221|             getExpr(): [FunctionCall] call to end
-# 2221|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2221|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2221|                 ValueCategory = prvalue
 # 2221|               getQualifier(): [VariableAccess] (__range)
 # 2221|                   Type = [LValueReferenceType] vector<ClassWithDestructor> &
@@ -20253,13 +20253,13 @@ ir.cpp:
 # 2221|           Type = [BoolType] bool
 # 2221|           ValueCategory = prvalue
 # 2221|         getQualifier(): [VariableAccess] (__begin)
-# 2221|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2221|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2221|             ValueCategory = lvalue
 # 2221|         getArgument(0): [ConstructorCall] call to iterator
 # 2221|             Type = [VoidType] void
 # 2221|             ValueCategory = prvalue
 # 2221|           getArgument(0): [VariableAccess] (__end)
-# 2221|               Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2221|               Type = [NestedTypedefType,TypeAliasType] iterator
 # 2221|               ValueCategory = lvalue
 #-----|           getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
 #-----|               Type = [LValueReferenceType] const iterator<random_access_iterator_tag, ClassWithDestructor, ptrdiff_t, ClassWithDestructor *, ClassWithDestructor &> &
@@ -20279,7 +20279,7 @@ ir.cpp:
 # 2221|           Type = [LValueReferenceType] iterator<random_access_iterator_tag, ClassWithDestructor, ptrdiff_t, ClassWithDestructor *, ClassWithDestructor &> &
 # 2221|           ValueCategory = prvalue
 # 2221|         getQualifier(): [VariableAccess] (__begin)
-# 2221|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2221|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2221|             ValueCategory = lvalue
 # 2221|       getChild(5): [DeclStmt] declaration
 # 2221|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
@@ -20289,7 +20289,7 @@ ir.cpp:
 # 2221|                 Type = [LValueReferenceType] ClassWithDestructor &
 # 2221|                 ValueCategory = prvalue
 # 2221|               getQualifier(): [VariableAccess] (__begin)
-# 2221|                   Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2221|                   Type = [NestedTypedefType,TypeAliasType] iterator
 # 2221|                   ValueCategory = lvalue
 #-----|               getQualifier().getFullyConverted(): [CStyleCast] (const iterator<random_access_iterator_tag, ClassWithDestructor, ptrdiff_t, ClassWithDestructor *, ClassWithDestructor &>)...
 #-----|                   Conversion = [GlvalueConversion] glvalue conversion
@@ -20391,10 +20391,10 @@ ir.cpp:
 # 2227|                 ValueCategory = prvalue
 # 2227|       getBeginEndDeclaration(): [DeclStmt] declaration
 # 2227|         getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (__begin)
-# 2227|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2227|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__begin)
 # 2227|             getExpr(): [FunctionCall] call to begin
-# 2227|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2227|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2227|                 ValueCategory = prvalue
 # 2227|               getQualifier(): [VariableAccess] (__range)
 # 2227|                   Type = [LValueReferenceType] vector<int> &
@@ -20407,10 +20407,10 @@ ir.cpp:
 #-----|                     Type = [ClassTemplateInstantiation,Struct] vector<int>
 #-----|                     ValueCategory = lvalue
 # 2227|         getDeclarationEntry(1): [VariableDeclarationEntry] declaration of (__end)
-# 2227|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2227|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__end)
 # 2227|             getExpr(): [FunctionCall] call to end
-# 2227|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2227|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2227|                 ValueCategory = prvalue
 # 2227|               getQualifier(): [VariableAccess] (__range)
 # 2227|                   Type = [LValueReferenceType] vector<int> &
@@ -20426,13 +20426,13 @@ ir.cpp:
 # 2227|           Type = [BoolType] bool
 # 2227|           ValueCategory = prvalue
 # 2227|         getQualifier(): [VariableAccess] (__begin)
-# 2227|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2227|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2227|             ValueCategory = lvalue
 # 2227|         getArgument(0): [ConstructorCall] call to iterator
 # 2227|             Type = [VoidType] void
 # 2227|             ValueCategory = prvalue
 # 2227|           getArgument(0): [VariableAccess] (__end)
-# 2227|               Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2227|               Type = [NestedTypedefType,TypeAliasType] iterator
 # 2227|               ValueCategory = lvalue
 #-----|           getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
 #-----|               Type = [LValueReferenceType] const iterator<random_access_iterator_tag, int, ptrdiff_t, int *, int &> &
@@ -20452,7 +20452,7 @@ ir.cpp:
 # 2227|           Type = [LValueReferenceType] iterator<random_access_iterator_tag, int, ptrdiff_t, int *, int &> &
 # 2227|           ValueCategory = prvalue
 # 2227|         getQualifier(): [VariableAccess] (__begin)
-# 2227|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2227|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2227|             ValueCategory = lvalue
 # 2227|       getChild(5): [DeclStmt] declaration
 # 2227|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
@@ -20462,7 +20462,7 @@ ir.cpp:
 # 2227|                 Type = [LValueReferenceType] int &
 # 2227|                 ValueCategory = prvalue
 # 2227|               getQualifier(): [VariableAccess] (__begin)
-# 2227|                   Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2227|                   Type = [NestedTypedefType,TypeAliasType] iterator
 # 2227|                   ValueCategory = lvalue
 #-----|               getQualifier().getFullyConverted(): [CStyleCast] (const iterator<random_access_iterator_tag, int, ptrdiff_t, int *, int &>)...
 #-----|                   Conversion = [GlvalueConversion] glvalue conversion
@@ -20537,10 +20537,10 @@ ir.cpp:
 # 2232|                 ValueCategory = prvalue
 # 2232|       getBeginEndDeclaration(): [DeclStmt] declaration
 # 2232|         getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (__begin)
-# 2232|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2232|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__begin)
 # 2232|             getExpr(): [FunctionCall] call to begin
-# 2232|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2232|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2232|                 ValueCategory = prvalue
 # 2232|               getQualifier(): [VariableAccess] (__range)
 # 2232|                   Type = [LValueReferenceType] vector<ClassWithDestructor> &
@@ -20553,10 +20553,10 @@ ir.cpp:
 #-----|                     Type = [ClassTemplateInstantiation,Struct] vector<ClassWithDestructor>
 #-----|                     ValueCategory = lvalue
 # 2232|         getDeclarationEntry(1): [VariableDeclarationEntry] declaration of (__end)
-# 2232|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2232|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__end)
 # 2232|             getExpr(): [FunctionCall] call to end
-# 2232|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2232|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2232|                 ValueCategory = prvalue
 # 2232|               getQualifier(): [VariableAccess] (__range)
 # 2232|                   Type = [LValueReferenceType] vector<ClassWithDestructor> &
@@ -20572,13 +20572,13 @@ ir.cpp:
 # 2232|           Type = [BoolType] bool
 # 2232|           ValueCategory = prvalue
 # 2232|         getQualifier(): [VariableAccess] (__begin)
-# 2232|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2232|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2232|             ValueCategory = lvalue
 # 2232|         getArgument(0): [ConstructorCall] call to iterator
 # 2232|             Type = [VoidType] void
 # 2232|             ValueCategory = prvalue
 # 2232|           getArgument(0): [VariableAccess] (__end)
-# 2232|               Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2232|               Type = [NestedTypedefType,TypeAliasType] iterator
 # 2232|               ValueCategory = lvalue
 #-----|           getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
 #-----|               Type = [LValueReferenceType] const iterator<random_access_iterator_tag, ClassWithDestructor, ptrdiff_t, ClassWithDestructor *, ClassWithDestructor &> &
@@ -20598,7 +20598,7 @@ ir.cpp:
 # 2232|           Type = [LValueReferenceType] iterator<random_access_iterator_tag, ClassWithDestructor, ptrdiff_t, ClassWithDestructor *, ClassWithDestructor &> &
 # 2232|           ValueCategory = prvalue
 # 2232|         getQualifier(): [VariableAccess] (__begin)
-# 2232|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2232|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2232|             ValueCategory = lvalue
 # 2232|       getChild(5): [DeclStmt] declaration
 # 2232|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
@@ -20608,7 +20608,7 @@ ir.cpp:
 # 2232|                 Type = [LValueReferenceType] ClassWithDestructor &
 # 2232|                 ValueCategory = prvalue
 # 2232|               getQualifier(): [VariableAccess] (__begin)
-# 2232|                   Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2232|                   Type = [NestedTypedefType,TypeAliasType] iterator
 # 2232|                   ValueCategory = lvalue
 #-----|               getQualifier().getFullyConverted(): [CStyleCast] (const iterator<random_access_iterator_tag, ClassWithDestructor, ptrdiff_t, ClassWithDestructor *, ClassWithDestructor &>)...
 #-----|                   Conversion = [GlvalueConversion] glvalue conversion
@@ -21168,10 +21168,10 @@ ir.cpp:
 # 2310|                       ValueCategory = xvalue
 # 2310|       getBeginEndDeclaration(): [DeclStmt] declaration
 # 2310|         getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (__begin)
-# 2310|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2310|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__begin)
 # 2310|             getExpr(): [FunctionCall] call to begin
-# 2310|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2310|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2310|                 ValueCategory = prvalue
 # 2310|               getQualifier(): [VariableAccess] (__range)
 # 2310|                   Type = [RValueReferenceType] vector<String> &&
@@ -21184,10 +21184,10 @@ ir.cpp:
 #-----|                     Type = [ClassTemplateInstantiation,Struct] vector<String>
 #-----|                     ValueCategory = lvalue
 # 2310|         getDeclarationEntry(1): [VariableDeclarationEntry] declaration of (__end)
-# 2310|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2310|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__end)
 # 2310|             getExpr(): [FunctionCall] call to end
-# 2310|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2310|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2310|                 ValueCategory = prvalue
 # 2310|               getQualifier(): [VariableAccess] (__range)
 # 2310|                   Type = [RValueReferenceType] vector<String> &&
@@ -21203,13 +21203,13 @@ ir.cpp:
 # 2310|           Type = [BoolType] bool
 # 2310|           ValueCategory = prvalue
 # 2310|         getQualifier(): [VariableAccess] (__begin)
-# 2310|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2310|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2310|             ValueCategory = lvalue
 # 2310|         getArgument(0): [ConstructorCall] call to iterator
 # 2310|             Type = [VoidType] void
 # 2310|             ValueCategory = prvalue
 # 2310|           getArgument(0): [VariableAccess] (__end)
-# 2310|               Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2310|               Type = [NestedTypedefType,TypeAliasType] iterator
 # 2310|               ValueCategory = lvalue
 #-----|           getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
 #-----|               Type = [LValueReferenceType] const iterator<random_access_iterator_tag, String, ptrdiff_t, String *, String &> &
@@ -21229,7 +21229,7 @@ ir.cpp:
 # 2310|           Type = [LValueReferenceType] iterator<random_access_iterator_tag, String, ptrdiff_t, String *, String &> &
 # 2310|           ValueCategory = prvalue
 # 2310|         getQualifier(): [VariableAccess] (__begin)
-# 2310|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2310|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2310|             ValueCategory = lvalue
 # 2310|       getChild(5): [DeclStmt] declaration
 # 2310|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of s
@@ -21242,7 +21242,7 @@ ir.cpp:
 # 2310|                   Type = [LValueReferenceType] String &
 # 2310|                   ValueCategory = prvalue
 # 2310|                 getQualifier(): [VariableAccess] (__begin)
-# 2310|                     Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2310|                     Type = [NestedTypedefType,TypeAliasType] iterator
 # 2310|                     ValueCategory = lvalue
 #-----|                 getQualifier().getFullyConverted(): [CStyleCast] (const iterator<random_access_iterator_tag, String, ptrdiff_t, String *, String &>)...
 #-----|                     Conversion = [GlvalueConversion] glvalue conversion
@@ -22708,10 +22708,10 @@ ir.cpp:
 # 2433|                   ValueCategory = xvalue
 # 2433|       getBeginEndDeclaration(): [DeclStmt] declaration
 # 2433|         getDeclarationEntry(0): [VariableDeclarationEntry] declaration of (__begin)
-# 2433|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2433|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__begin)
 # 2433|             getExpr(): [FunctionCall] call to begin
-# 2433|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2433|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2433|                 ValueCategory = prvalue
 # 2433|               getQualifier(): [VariableAccess] (__range)
 # 2433|                   Type = [RValueReferenceType] vector<char> &&
@@ -22724,10 +22724,10 @@ ir.cpp:
 #-----|                     Type = [ClassTemplateInstantiation,Struct] vector<char>
 #-----|                     ValueCategory = lvalue
 # 2433|         getDeclarationEntry(1): [VariableDeclarationEntry] declaration of (__end)
-# 2433|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2433|             Type = [NestedTypedefType,TypeAliasType] iterator
 #-----|           getVariable().getInitializer(): [Initializer] initializer for (__end)
 # 2433|             getExpr(): [FunctionCall] call to end
-# 2433|                 Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2433|                 Type = [NestedTypedefType,TypeAliasType] iterator
 # 2433|                 ValueCategory = prvalue
 # 2433|               getQualifier(): [VariableAccess] (__range)
 # 2433|                   Type = [RValueReferenceType] vector<char> &&
@@ -22743,13 +22743,13 @@ ir.cpp:
 # 2433|           Type = [BoolType] bool
 # 2433|           ValueCategory = prvalue
 # 2433|         getQualifier(): [VariableAccess] (__begin)
-# 2433|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2433|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2433|             ValueCategory = lvalue
 # 2433|         getArgument(0): [ConstructorCall] call to iterator
 # 2433|             Type = [VoidType] void
 # 2433|             ValueCategory = prvalue
 # 2433|           getArgument(0): [VariableAccess] (__end)
-# 2433|               Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2433|               Type = [NestedTypedefType,TypeAliasType] iterator
 # 2433|               ValueCategory = lvalue
 #-----|           getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
 #-----|               Type = [LValueReferenceType] const iterator<random_access_iterator_tag, char, ptrdiff_t, char *, char &> &
@@ -22769,7 +22769,7 @@ ir.cpp:
 # 2433|           Type = [LValueReferenceType] iterator<random_access_iterator_tag, char, ptrdiff_t, char *, char &> &
 # 2433|           ValueCategory = prvalue
 # 2433|         getQualifier(): [VariableAccess] (__begin)
-# 2433|             Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2433|             Type = [NestedTypedefType,TypeAliasType] iterator
 # 2433|             ValueCategory = lvalue
 # 2433|       getChild(5): [DeclStmt] declaration
 # 2433|         getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
@@ -22779,7 +22779,7 @@ ir.cpp:
 # 2433|                 Type = [LValueReferenceType] char &
 # 2433|                 ValueCategory = prvalue
 # 2433|               getQualifier(): [VariableAccess] (__begin)
-# 2433|                   Type = [NestedTypedefType,UsingAliasTypedefType] iterator
+# 2433|                   Type = [NestedTypedefType,TypeAliasType] iterator
 # 2433|                   ValueCategory = lvalue
 #-----|               getQualifier().getFullyConverted(): [CStyleCast] (const iterator<random_access_iterator_tag, char, ptrdiff_t, char *, char &>)...
 #-----|                   Conversion = [GlvalueConversion] glvalue conversion
diff --git a/cpp/ql/test/library-tests/scanf/scanfFormatLiteral.expected b/cpp/ql/test/library-tests/scanf/scanfFormatLiteral.expected
index 263ea54b8cd3..f6fc707b4945 100644
--- a/cpp/ql/test/library-tests/scanf/scanfFormatLiteral.expected
+++ b/cpp/ql/test/library-tests/scanf/scanfFormatLiteral.expected
@@ -1,5 +1,8 @@
-| test.c:18:2:18:6 | call to scanf | 0 | s | 0 | 0 |
-| test.c:19:2:19:7 | call to fscanf | 0 | s | 10 | 10 |
-| test.c:19:2:19:7 | call to fscanf | 1 | i | 0 | 0 |
-| test.c:20:2:20:7 | call to sscanf | 0 | s | 0 | 0 |
-| test.c:21:2:21:8 | call to swscanf | 0 | s | 10 | 10 |
+| test.c:19:2:19:6 | call to scanf | 0 | s | 0 | 0 |
+| test.c:20:2:20:7 | call to fscanf | 0 | s | 10 | 10 |
+| test.c:20:2:20:7 | call to fscanf | 1 | i | 0 | 0 |
+| test.c:21:2:21:7 | call to sscanf | 0 | s | 0 | 0 |
+| test.c:22:2:22:8 | call to swscanf | 0 | s | 10 | 10 |
+| test.c:23:2:23:8 | call to scanf_s | 0 | d | 0 | 0 |
+| test.c:23:2:23:8 | call to scanf_s | 1 | s | 0 | 0 |
+| test.c:23:2:23:8 | call to scanf_s | 2 | d | 0 | 0 |
diff --git a/cpp/ql/test/library-tests/scanf/scanfFunctionCall.expected b/cpp/ql/test/library-tests/scanf/scanfFunctionCall.expected
index b0dce385b7bb..ba658bd6d2f5 100644
--- a/cpp/ql/test/library-tests/scanf/scanfFunctionCall.expected
+++ b/cpp/ql/test/library-tests/scanf/scanfFunctionCall.expected
@@ -1,5 +1,6 @@
 | ms.cpp:17:3:17:8 | call to sscanf | 0 | 1 | ms.cpp:17:24:17:30 | %I64i | non-wide |
-| test.c:18:2:18:6 | call to scanf | 0 | 0 | test.c:18:8:18:11 | %s | non-wide |
-| test.c:19:2:19:7 | call to fscanf | 0 | 1 | test.c:19:15:19:23 | %10s %i | non-wide |
-| test.c:20:2:20:7 | call to sscanf | 0 | 1 | test.c:20:19:20:28 | %*i%s%*s | non-wide |
-| test.c:21:2:21:8 | call to swscanf | 0 | 1 | test.c:21:21:21:26 | %10s | wide |
+| test.c:19:2:19:6 | call to scanf | 0 | 0 | test.c:19:8:19:11 | %s | non-wide |
+| test.c:20:2:20:7 | call to fscanf | 0 | 1 | test.c:20:15:20:23 | %10s %i | non-wide |
+| test.c:21:2:21:7 | call to sscanf | 0 | 1 | test.c:21:19:21:28 | %*i%s%*s | non-wide |
+| test.c:22:2:22:8 | call to swscanf | 0 | 1 | test.c:22:21:22:26 | %10s | wide |
+| test.c:23:2:23:8 | call to scanf_s | 0 | 0 | test.c:23:10:23:19 | %d %s %d | non-wide |
diff --git a/cpp/ql/test/library-tests/scanf/scanfFunctionCallOutput.expected b/cpp/ql/test/library-tests/scanf/scanfFunctionCallOutput.expected
new file mode 100644
index 000000000000..87998b4c367b
--- /dev/null
+++ b/cpp/ql/test/library-tests/scanf/scanfFunctionCallOutput.expected
@@ -0,0 +1,9 @@
+| ms.cpp:17:3:17:8 | call to sscanf | ms.cpp:17:33:17:36 | & ... | 0 |
+| test.c:19:2:19:6 | call to scanf | test.c:19:14:19:19 | buffer | 0 |
+| test.c:20:2:20:7 | call to fscanf | test.c:20:26:20:31 | buffer | 0 |
+| test.c:20:2:20:7 | call to fscanf | test.c:20:34:20:34 | i | 1 |
+| test.c:21:2:21:7 | call to sscanf | test.c:21:31:21:36 | buffer | 0 |
+| test.c:22:2:22:8 | call to swscanf | test.c:22:29:22:35 | wbuffer | 0 |
+| test.c:23:2:23:8 | call to scanf_s | test.c:23:22:23:23 | & ... | 0 |
+| test.c:23:2:23:8 | call to scanf_s | test.c:23:26:23:31 | buffer | 1 |
+| test.c:23:2:23:8 | call to scanf_s | test.c:23:38:23:40 | & ... | 2 |
diff --git a/cpp/ql/test/library-tests/scanf/scanfFunctionCallOutput.ql b/cpp/ql/test/library-tests/scanf/scanfFunctionCallOutput.ql
new file mode 100644
index 000000000000..a3d40604cfa8
--- /dev/null
+++ b/cpp/ql/test/library-tests/scanf/scanfFunctionCallOutput.ql
@@ -0,0 +1,5 @@
+import semmle.code.cpp.commons.Scanf
+
+from ScanfFunctionCall sfc, Expr e, int n
+where e = sfc.getOutputArgument(n)
+select sfc, e, n
diff --git a/cpp/ql/test/library-tests/scanf/test.c b/cpp/ql/test/library-tests/scanf/test.c
index c378eec72220..eb99bbec7adf 100644
--- a/cpp/ql/test/library-tests/scanf/test.c
+++ b/cpp/ql/test/library-tests/scanf/test.c
@@ -7,18 +7,20 @@ int scanf(const char *format, ...);
 int fscanf(FILE *stream, const char *format, ...);
 int sscanf(const char *s, const char *format, ...);
 int swscanf(const wchar_t* ws, const wchar_t* format, ...);
+int scanf_s(const char *format, ...);
 
 int main(int argc, char *argv[])
 {
 	char buffer[256];
 	wchar_t wbuffer[256];
 	FILE *file;
-	int i;
+	int i, i2;
 
 	scanf("%s", buffer);
 	fscanf(file, "%10s %i", buffer, i);
 	sscanf("Hello.", "%*i%s%*s", buffer);
 	swscanf(L"Hello.", "%10s", wbuffer);
+	scanf_s("%d %s %d", &i, buffer, 10, &i2);
 
 	return 0;
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/using-aliases/using-alias.expected b/cpp/ql/test/library-tests/using-aliases/using-alias.expected
index e528b93e279d..7a08db82ae49 100644
--- a/cpp/ql/test/library-tests/using-aliases/using-alias.expected
+++ b/cpp/ql/test/library-tests/using-aliases/using-alias.expected
@@ -1,9 +1,9 @@
 | file://:0:0:0:0 | X | NestedTypedefType | file://:0:0:0:0 | int * |
-| file://:0:0:0:0 | X | UsingAliasTypedefType | file://:0:0:0:0 | int * |
+| file://:0:0:0:0 | X | TypeAliasType | file://:0:0:0:0 | int * |
 | using-alias.cpp:2:13:2:17 | type1 | CTypedefType | file://:0:0:0:0 | int |
-| using-alias.cpp:3:7:3:12 | using1 | UsingAliasTypedefType | file://:0:0:0:0 | float |
+| using-alias.cpp:3:7:3:12 | using1 | TypeAliasType | file://:0:0:0:0 | float |
 | using-alias.cpp:5:16:5:20 | type2 | CTypedefType | file://:0:0:0:0 | float |
-| using-alias.cpp:6:7:6:12 | using2 | UsingAliasTypedefType | file://:0:0:0:0 | int |
+| using-alias.cpp:6:7:6:12 | using2 | TypeAliasType | file://:0:0:0:0 | int |
 | using-alias.cpp:8:39:8:39 | X | NestedTypedefType | file://:0:0:0:0 | T * |
-| using-alias.cpp:8:39:8:39 | X | UsingAliasTypedefType | file://:0:0:0:0 | T * |
-| using-alias.cpp:10:7:10:7 | Y | UsingAliasTypedefType | file://:0:0:0:0 | int * |
+| using-alias.cpp:8:39:8:39 | X | TypeAliasType | file://:0:0:0:0 | T * |
+| using-alias.cpp:10:7:10:7 | Y | TypeAliasType | file://:0:0:0:0 | int * |
diff --git a/csharp/.config/dotnet-tools.json b/csharp/.config/dotnet-tools.json
index 66126b691f49..f4f161bafeeb 100644
--- a/csharp/.config/dotnet-tools.json
+++ b/csharp/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "10.0.0-alpha011",
+      "version": "10.3.1",
       "commands": [
         "paket"
       ]
diff --git a/csharp/.paket/Paket.Restore.targets b/csharp/.paket/Paket.Restore.targets
index 17aeb63502d0..8f48b933eb93 100644
--- a/csharp/.paket/Paket.Restore.targets
+++ b/csharp/.paket/Paket.Restore.targets
@@ -241,8 +241,9 @@
 				<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
 				<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
 				<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
+				<ReferenceCondition Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 10">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[9])</ReferenceCondition>
 			</PaketReferencesFileLinesInfo>
-			<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
+			<PackageReference Condition=" ('$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct') AND ('%(PaketReferencesFileLinesInfo.ReferenceCondition)' == 'true' Or $(%(PaketReferencesFileLinesInfo.ReferenceCondition)) == 'true')" Include="%(PaketReferencesFileLinesInfo.PackageName)">
 				<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
 				<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
 				<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
@@ -251,10 +252,8 @@
 				<Aliases Condition=" %(PaketReferencesFileLinesInfo.Aliases) != ''">%(PaketReferencesFileLinesInfo.Aliases)</Aliases>
 				<Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
 				<AllowExplicitVersion>true</AllowExplicitVersion>
-
 			</PackageReference>
-
-			<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
+			<PackageVersion Condition="('$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct') AND ('%(PaketReferencesFileLinesInfo.ReferenceCondition)' == 'true' Or $(%(PaketReferencesFileLinesInfo.ReferenceCondition)) == 'true')" Include="%(PaketReferencesFileLinesInfo.PackageName)">
 				<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
 			</PackageVersion>
 		</ItemGroup>
@@ -319,7 +318,17 @@
 		</ItemGroup>
 
 		<Error Text="Error Because of PAKET_ERROR_ON_MSBUILD_EXEC (not calling fix-nuspecs)" Condition=" '$(PAKET_ERROR_ON_MSBUILD_EXEC)' == 'true' " />
-		<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' />
+		<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) show-conditions -s' ConsoleToMSBuild="true" StandardOutputImportance="low">
+			<Output TaskParameter="ConsoleOutput" ItemName="_ConditionProperties"/>
+		</Exec>
+		<ItemGroup>
+			<_DefinedConditionProperties Include="@(_ConditionProperties)" Condition="$(%(Identity)) == 'true'"/>
+		</ItemGroup>
+		<PropertyGroup>
+			<_ConditionsParameter></_ConditionsParameter>
+			<_ConditionsParameter Condition="@(_DefinedConditionProperties) != ''">--conditions @(_DefinedConditionProperties)</_ConditionsParameter>
+		</PropertyGroup>
+		<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" $(_ConditionsParameter)' />
 		<Error Condition="@(_NuspecFiles) == ''" Text='Could not find nuspec files in "$(AdjustedNuspecOutputPath)" (Version: "$(PackageVersion)"), therefore we cannot call "paket fix-nuspecs" and have to error out!' />
 
 		<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Util/SymbolExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp.Util/SymbolExtensions.cs
index 92d7ecfad6bb..8106cfbf2337 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.Util/SymbolExtensions.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Util/SymbolExtensions.cs
@@ -52,6 +52,13 @@ public static string GetName(this ISymbol symbol, bool useMetadataName = false)
             { "op_False", "false" }
         });
 
+        /// <summary>
+        /// The operatorname for user-defined instance increment- and decrement operators are "op_IncrementAssignment" and
+        /// "op_DecrementAssignment" respectively.
+        /// Thus we need to handle this explicitly to avoid postfixing them with an "=".
+        /// </summary>
+        private static bool IsIncrementOrDecrement(string operatorName) => operatorName == "++" || operatorName == "--";
+
         /// <summary>
         /// Convert an operator method name in to a symbolic name.
         /// A return value indicates whether the conversion succeeded.
@@ -72,7 +79,7 @@ public static bool TryGetOperatorSymbol(this ISymbol symbol, out string operator
             if (match.Success && methodToOperator.TryGetValue($"op_{match.Groups[2]}", out var rawOperatorName))
             {
                 var prefix = match.Groups[1].Success ? "checked " : "";
-                var postfix = match.Groups[3].Success ? "=" : "";
+                var postfix = match.Groups[3].Success && !IsIncrementOrDecrement(rawOperatorName) ? "=" : "";
                 operatorName = $"{prefix}{rawOperatorName}{postfix}";
                 return true;
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
index fbc1b52c99b3..dd7246fa6597 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
@@ -664,7 +664,7 @@ public static bool IsCompilerGeneratedExtensionMethod(this IMethodSymbol method)
                 // Find the (possibly unbound) original extension method that maps to this implementation (if any).
                 var unboundDeclaration = extensions.SelectMany(e => e.GetMembers())
                     .OfType<IMethodSymbol>()
-                    .FirstOrDefault(m => SymbolEqualityComparer.Default.Equals(m.AssociatedExtensionImplementation, method.ConstructedFrom));
+                    .FirstOrDefault(m => SymbolEqualityComparer.Default.Equals(m.AssociatedExtensionImplementation?.ConstructedFrom, method.ConstructedFrom));
 
                 var isFullyConstructed = method.IsBoundGenericMethod();
                 if (isFullyConstructed && unboundDeclaration?.ContainingType is INamedTypeSymbol extensionType)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
index ed409e23b395..7e30d4d5f7cb 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
@@ -69,6 +69,7 @@ public override void Populate(TextWriter trapFile)
             }
 
             Overrides(trapFile);
+            ExtractRefReturn(trapFile, Symbol, this);
 
             if (Symbol.FromSource() && !HasBody)
             {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
index 2c74775460da..dd82f7077276 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
@@ -32,9 +32,13 @@ public override void Populate(TextWriter trapFile)
         {
             var assembly = Assembly.CreateOutputAssembly(Context);
 
-            trapFile.compilations(this, FileUtils.ConvertToUnix(cwd));
+            var path = Context.ExtractionContext.PathTransformer.Transform(cwd);
+            trapFile.compilations(this, path.Value);
             trapFile.compilation_assembly(this, assembly);
 
+            // Ensure that a `Folder` entity exists
+            Folder.Create(Context, path);
+
             // Arguments
             var expandedIndex = 0;
             for (var i = 0; i < args.Length; i++)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
index 4ab90def2c16..bf02ba49a2bd 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
@@ -234,9 +234,9 @@ type.SpecialType is SpecialType.System_IntPtr ||
         /// </summary>
         /// <param name="node">The expression syntax node.</param>
         /// <returns>Returns the target method symbol, or null if it cannot be resolved.</returns>
-        protected IMethodSymbol? GetTargetSymbol(ExpressionSyntax node)
+        protected static IMethodSymbol? GetTargetSymbol(Context cx, ExpressionSyntax node)
         {
-            var si = Context.GetSymbolInfo(node);
+            var si = cx.GetSymbolInfo(node);
             if (si.Symbol is ISymbol symbol)
             {
                 var method = symbol as IMethodSymbol;
@@ -255,7 +255,7 @@ type.SpecialType is SpecialType.System_IntPtr ||
                     .Where(method => method.Parameters.Length >= syntax.ArgumentList.Arguments.Count)
                     .Where(method => method.Parameters.Count(p => !p.HasExplicitDefaultValue) <= syntax.ArgumentList.Arguments.Count);
 
-                return Context.ExtractionContext.IsStandalone ?
+                return cx.ExtractionContext.IsStandalone ?
                     candidates.FirstOrDefault() :
                     candidates.SingleOrDefault();
             }
@@ -281,7 +281,7 @@ public static ExprKind UnaryOperatorKind(Context cx, ExprKind originalKind, Expr
         /// <param name="node">The expression.</param>
         public void AddOperatorCall(TextWriter trapFile, ExpressionSyntax node)
         {
-            var @operator = GetTargetSymbol(node);
+            var @operator = GetTargetSymbol(Context, node);
             if (@operator is IMethodSymbol method)
             {
                 var callType = GetCallType(Context, node);
@@ -312,9 +312,9 @@ public enum CallType
         /// <returns>The call type.</returns>
         public static CallType GetCallType(Context cx, ExpressionSyntax node)
         {
-            var @operator = cx.GetSymbolInfo(node);
+            var @operator = GetTargetSymbol(cx, node);
 
-            if (@operator.Symbol is IMethodSymbol method)
+            if (@operator is IMethodSymbol method)
             {
                 if (method.ContainingSymbol is ITypeSymbol containingSymbol && containingSymbol.TypeKind == Microsoft.CodeAnalysis.TypeKind.Dynamic)
                 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Factory.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Factory.cs
index ed8dae3738fc..70760590070e 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Factory.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Factory.cs
@@ -58,10 +58,10 @@ internal static Expression Create(ExpressionNodeInfo info)
                         return Invocation.Create(info);
 
                     case SyntaxKind.PostIncrementExpression:
-                        return PostfixUnary.Create(info.SetKind(ExprKind.POST_INCR), ((PostfixUnaryExpressionSyntax)info.Node).Operand);
+                        return PostfixUnary.Create(info.SetKind(ExprKind.POST_INCR));
 
                     case SyntaxKind.PostDecrementExpression:
-                        return PostfixUnary.Create(info.SetKind(ExprKind.POST_DECR), ((PostfixUnaryExpressionSyntax)info.Node).Operand);
+                        return PostfixUnary.Create(info.SetKind(ExprKind.POST_DECR));
 
                     case SyntaxKind.AwaitExpression:
                         return Await.Create(info);
@@ -109,10 +109,10 @@ internal static Expression Create(ExpressionNodeInfo info)
                         return MemberAccess.Create(info, (MemberAccessExpressionSyntax)info.Node);
 
                     case SyntaxKind.UnaryMinusExpression:
-                        return Unary.Create(info.SetKind(ExprKind.MINUS));
+                        return PrefixUnary.Create(info.SetKind(ExprKind.MINUS));
 
                     case SyntaxKind.UnaryPlusExpression:
-                        return Unary.Create(info.SetKind(ExprKind.PLUS));
+                        return PrefixUnary.Create(info.SetKind(ExprKind.PLUS));
 
                     case SyntaxKind.SimpleLambdaExpression:
                         return Lambda.Create(info, (SimpleLambdaExpressionSyntax)info.Node);
@@ -146,16 +146,16 @@ internal static Expression Create(ExpressionNodeInfo info)
                         return Name.Create(info);
 
                     case SyntaxKind.LogicalNotExpression:
-                        return Unary.Create(info.SetKind(ExprKind.LOG_NOT));
+                        return PrefixUnary.Create(info.SetKind(ExprKind.LOG_NOT));
 
                     case SyntaxKind.BitwiseNotExpression:
-                        return Unary.Create(info.SetKind(ExprKind.BIT_NOT));
+                        return PrefixUnary.Create(info.SetKind(ExprKind.BIT_NOT));
 
                     case SyntaxKind.PreIncrementExpression:
-                        return Unary.Create(info.SetKind(ExprKind.PRE_INCR));
+                        return PrefixUnary.Create(info.SetKind(ExprKind.PRE_INCR));
 
                     case SyntaxKind.PreDecrementExpression:
-                        return Unary.Create(info.SetKind(ExprKind.PRE_DECR));
+                        return PrefixUnary.Create(info.SetKind(ExprKind.PRE_DECR));
 
                     case SyntaxKind.ThisExpression:
                         return This.CreateExplicit(info);
@@ -164,10 +164,10 @@ internal static Expression Create(ExpressionNodeInfo info)
                         return PropertyFieldAccess.Create(info);
 
                     case SyntaxKind.AddressOfExpression:
-                        return Unary.Create(info.SetKind(ExprKind.ADDRESS_OF));
+                        return PrefixUnary.Create(info.SetKind(ExprKind.ADDRESS_OF));
 
                     case SyntaxKind.PointerIndirectionExpression:
-                        return Unary.Create(info.SetKind(ExprKind.POINTER_INDIRECTION));
+                        return PrefixUnary.Create(info.SetKind(ExprKind.POINTER_INDIRECTION));
 
                     case SyntaxKind.DefaultExpression:
                         return Default.Create(info);
@@ -248,13 +248,13 @@ internal static Expression Create(ExpressionNodeInfo info)
                         return RangeExpression.Create(info);
 
                     case SyntaxKind.IndexExpression:
-                        return Unary.Create(info.SetKind(ExprKind.INDEX));
+                        return PrefixUnary.Create(info.SetKind(ExprKind.INDEX));
 
                     case SyntaxKind.SwitchExpression:
                         return Switch.Create(info);
 
                     case SyntaxKind.SuppressNullableWarningExpression:
-                        return PostfixUnary.Create(info.SetKind(ExprKind.SUPPRESS_NULLABLE_WARNING), ((PostfixUnaryExpressionSyntax)info.Node).Operand);
+                        return PostfixUnary.Create(info.SetKind(ExprKind.SUPPRESS_NULLABLE_WARNING));
 
                     case SyntaxKind.WithExpression:
                         return WithExpression.Create(info);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs
index 343f288eeafe..5b25e53e8eef 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs
@@ -44,7 +44,7 @@ protected override void PopulateExpression(TextWriter trapFile)
 
             var child = -1;
             string? memberName = null;
-            var target = GetTargetSymbol(Syntax);
+            var target = GetTargetSymbol(Context, Syntax);
             switch (Syntax.Expression)
             {
                 case MemberAccessExpressionSyntax memberAccess when IsValidMemberAccessKind():
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/PostfixUnary.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/PostfixUnary.cs
index 051a03e9f8c2..dd7682bf7bb6 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/PostfixUnary.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/PostfixUnary.cs
@@ -4,29 +4,30 @@
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
 {
-    internal class PostfixUnary : Expression<ExpressionSyntax>
+    internal class PostfixUnary : Expression<PostfixUnaryExpressionSyntax>
     {
-        private PostfixUnary(ExpressionNodeInfo info, ExprKind kind, ExpressionSyntax operand)
+        private PostfixUnary(ExpressionNodeInfo info, ExprKind kind)
             : base(info.SetKind(UnaryOperatorKind(info.Context, kind, info.Node)))
         {
-            this.operand = operand;
             operatorKind = kind;
         }
 
-        private readonly ExpressionSyntax operand;
         private readonly ExprKind operatorKind;
 
-        public static Expression Create(ExpressionNodeInfo info, ExpressionSyntax operand) => new PostfixUnary(info, info.Kind, operand).TryPopulate();
+        public static Expression Create(ExpressionNodeInfo info) => new PostfixUnary(info, info.Kind).TryPopulate();
 
         protected override void PopulateExpression(TextWriter trapFile)
         {
-            Create(Context, operand, this, 0);
+            Create(Context, Syntax.Operand, this, 0);
 
-            if ((operatorKind == ExprKind.POST_INCR || operatorKind == ExprKind.POST_DECR) &&
-                Kind == ExprKind.OPERATOR_INVOCATION)
+            if (Kind == ExprKind.OPERATOR_INVOCATION)
             {
                 AddOperatorCall(trapFile, Syntax);
-                trapFile.mutator_invocation_mode(this, 2);
+
+                if (operatorKind == ExprKind.POST_INCR || operatorKind == ExprKind.POST_DECR)
+                {
+                    trapFile.mutator_invocation_mode(this, 2);
+                }
             }
         }
     }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/PrefixUnary.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/PrefixUnary.cs
new file mode 100644
index 000000000000..ca58a8aeb283
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/PrefixUnary.cs
@@ -0,0 +1,34 @@
+using System.IO;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Semmle.Extraction.Kinds;
+
+namespace Semmle.Extraction.CSharp.Entities.Expressions
+{
+    internal class PrefixUnary : Expression<PrefixUnaryExpressionSyntax>
+    {
+        private PrefixUnary(ExpressionNodeInfo info, ExprKind kind)
+            : base(info.SetKind(UnaryOperatorKind(info.Context, info.Kind, info.Node)))
+        {
+            operatorKind = kind;
+        }
+
+        private readonly ExprKind operatorKind;
+
+        public static Expression Create(ExpressionNodeInfo info) => new PrefixUnary(info, info.Kind).TryPopulate();
+
+        protected override void PopulateExpression(TextWriter trapFile)
+        {
+            Create(Context, Syntax.Operand, this, 0);
+
+            if (Kind == ExprKind.OPERATOR_INVOCATION)
+            {
+                AddOperatorCall(trapFile, Syntax);
+
+                if (operatorKind == ExprKind.PRE_INCR || operatorKind == ExprKind.PRE_DECR)
+                {
+                    trapFile.mutator_invocation_mode(this, 1);
+                }
+            }
+        }
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Unary.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Unary.cs
deleted file mode 100644
index 699c3810d116..000000000000
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Unary.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.IO;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Semmle.Extraction.Kinds;
-
-namespace Semmle.Extraction.CSharp.Entities.Expressions
-{
-    internal class Unary : Expression<PrefixUnaryExpressionSyntax>
-    {
-        private Unary(ExpressionNodeInfo info, ExprKind kind)
-            : base(info.SetKind(UnaryOperatorKind(info.Context, info.Kind, info.Node)))
-        {
-            operatorKind = kind;
-        }
-
-        private readonly ExprKind operatorKind;
-
-        public static Unary Create(ExpressionNodeInfo info)
-        {
-            var ret = new Unary(info, info.Kind);
-            ret.TryPopulate();
-            return ret;
-        }
-
-        protected override void PopulateExpression(TextWriter trapFile)
-        {
-            Create(Context, Syntax.Operand, this, 0);
-            AddOperatorCall(trapFile, Syntax);
-
-            if ((operatorKind == ExprKind.PRE_INCR || operatorKind == ExprKind.PRE_DECR) &&
-                Kind == ExprKind.OPERATOR_INVOCATION)
-            {
-                trapFile.mutator_invocation_mode(this, 1);
-            }
-        }
-    }
-}
diff --git a/csharp/paket.dependencies b/csharp/paket.dependencies
index 61cb1d3d8d9f..19a45cd75308 100644
--- a/csharp/paket.dependencies
+++ b/csharp/paket.dependencies
@@ -4,7 +4,7 @@ source https://api.nuget.org/v3/index.json
 # behave like nuget in choosing transitive dependency versions
 strategy: max
 
-nuget Basic.CompilerLog.Util 0.9.25
+nuget Basic.CompilerLog.Util 0.9.39
 nuget Mono.Posix.NETStandard
 nuget Newtonsoft.Json
 nuget NuGet.Versioning
@@ -12,7 +12,7 @@ nuget xunit
 nuget xunit.runner.visualstudio
 nuget xunit.runner.utility
 nuget Microsoft.NET.Test.Sdk
-nuget Microsoft.CodeAnalysis.CSharp 5.0.0
-nuget Microsoft.CodeAnalysis 5.0.0
-nuget Microsoft.Build 18.0.2
+nuget Microsoft.CodeAnalysis.CSharp 5.3.0
+nuget Microsoft.CodeAnalysis 5.3.0
+nuget Microsoft.Build 18.6.3
 nuget Microsoft.VisualStudio.SolutionPersistence
diff --git a/csharp/paket.lock b/csharp/paket.lock
index 42d537cc181b..f76a8afa7eb4 100644
--- a/csharp/paket.lock
+++ b/csharp/paket.lock
@@ -3,45 +3,42 @@ STRATEGY: MAX
 RESTRICTION: == net10.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Basic.CompilerLog.Util (0.9.25)
+    Basic.CompilerLog.Util (0.9.39)
       MessagePack (>= 3.1.4)
-      Microsoft.Bcl.Memory (>= 9.0.10)
+      Microsoft.Bcl.Memory (>= 10.0.7)
       Microsoft.CodeAnalysis (>= 4.8)
       Microsoft.CodeAnalysis.CSharp (>= 4.8)
       Microsoft.CodeAnalysis.VisualBasic (>= 4.8)
-      Microsoft.Extensions.ObjectPool (>= 9.0.10)
-      MSBuild.StructuredLogger (>= 2.3.71)
-      NaturalSort.Extension (>= 4.4)
-      NuGet.Versioning (>= 6.14)
-    Humanizer.Core (3.0.1)
-    MessagePack (3.1.4)
-      MessagePack.Annotations (>= 3.1.4)
-      MessagePackAnalyzer (>= 3.1.4)
+      Microsoft.Extensions.ObjectPool (>= 10.0.7)
+      MSBuild.StructuredLogger (>= 2.3.178)
+    Humanizer.Core (3.0.10)
+    MessagePack (3.1.6)
+      MessagePack.Annotations (>= 3.1.6)
+      MessagePackAnalyzer (>= 3.1.6)
       Microsoft.NET.StringTools (>= 17.11.4)
-    MessagePack.Annotations (3.1.4)
-    MessagePackAnalyzer (3.1.4)
-    Microsoft.Bcl.AsyncInterfaces (10.0.1)
-    Microsoft.Bcl.Memory (10.0.1)
-    Microsoft.Build (18.0.2)
-      Microsoft.Build.Framework (>= 18.0.2)
-      Microsoft.NET.StringTools (>= 18.0.2)
-      System.Configuration.ConfigurationManager (>= 9.0)
-      System.Diagnostics.EventLog (>= 9.0)
-      System.Reflection.MetadataLoadContext (>= 9.0)
-      System.Security.Cryptography.ProtectedData (>= 9.0.6)
-    Microsoft.Build.Framework (18.0.2)
-    Microsoft.Build.Utilities.Core (18.0.2)
-      Microsoft.Build.Framework (>= 18.0.2)
-      Microsoft.NET.StringTools (>= 18.0.2)
-      System.Configuration.ConfigurationManager (>= 9.0)
-      System.Diagnostics.EventLog (>= 9.0)
-      System.Security.Cryptography.ProtectedData (>= 9.0.6)
-    Microsoft.CodeAnalysis (5.0)
+    MessagePack.Annotations (3.1.6)
+    MessagePackAnalyzer (3.1.6)
+    Microsoft.Bcl.AsyncInterfaces (10.0.8)
+    Microsoft.Bcl.Memory (10.0.8)
+    Microsoft.Build (18.6.3)
+      Microsoft.Build.Framework (>= 18.6.3)
+      System.Configuration.ConfigurationManager (>= 10.0.3)
+      System.Diagnostics.EventLog (>= 10.0.3)
+      System.Reflection.MetadataLoadContext (>= 10.0.3)
+      System.Security.Cryptography.ProtectedData (>= 10.0.3)
+    Microsoft.Build.Framework (18.6.3)
+      Microsoft.NET.StringTools (>= 18.6.3)
+    Microsoft.Build.Utilities.Core (18.6.3)
+      Microsoft.Build.Framework (>= 18.6.3)
+      System.Configuration.ConfigurationManager (>= 10.0.3)
+      System.Diagnostics.EventLog (>= 10.0.3)
+      System.Security.Cryptography.ProtectedData (>= 10.0.3)
+    Microsoft.CodeAnalysis (5.3)
       Humanizer.Core (>= 2.14.1)
       Microsoft.Bcl.AsyncInterfaces (>= 9.0)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
-      Microsoft.CodeAnalysis.CSharp.Workspaces (5.0)
-      Microsoft.CodeAnalysis.VisualBasic.Workspaces (5.0)
+      Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1)
+      Microsoft.CodeAnalysis.CSharp.Workspaces (5.3)
+      Microsoft.CodeAnalysis.VisualBasic.Workspaces (5.3)
       System.Buffers (>= 4.6)
       System.Collections.Immutable (>= 9.0)
       System.Composition (>= 9.0)
@@ -53,92 +50,90 @@ NUGET
       System.Text.Encoding.CodePages (>= 8.0)
       System.Threading.Channels (>= 8.0)
       System.Threading.Tasks.Extensions (>= 4.6)
-    Microsoft.CodeAnalysis.Analyzers (3.11)
-    Microsoft.CodeAnalysis.Common (5.0)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
-    Microsoft.CodeAnalysis.CSharp (5.0)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
-      Microsoft.CodeAnalysis.Common (5.0)
-    Microsoft.CodeAnalysis.CSharp.Workspaces (5.0)
+    Microsoft.CodeAnalysis.Analyzers (5.3)
+    Microsoft.CodeAnalysis.Common (5.3)
+      Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1)
+    Microsoft.CodeAnalysis.CSharp (5.3)
+      Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1)
+      Microsoft.CodeAnalysis.Common (5.3)
+    Microsoft.CodeAnalysis.CSharp.Workspaces (5.3)
       Humanizer.Core (>= 2.14.1)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
-      Microsoft.CodeAnalysis.Common (5.0)
-      Microsoft.CodeAnalysis.CSharp (5.0)
-      Microsoft.CodeAnalysis.Workspaces.Common (5.0)
+      Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1)
+      Microsoft.CodeAnalysis.Common (5.3)
+      Microsoft.CodeAnalysis.CSharp (5.3)
+      Microsoft.CodeAnalysis.Workspaces.Common (5.3)
       System.Composition (>= 9.0)
-    Microsoft.CodeAnalysis.VisualBasic (5.0)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
-      Microsoft.CodeAnalysis.Common (5.0)
-    Microsoft.CodeAnalysis.VisualBasic.Workspaces (5.0)
+    Microsoft.CodeAnalysis.VisualBasic (5.3)
+      Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1)
+      Microsoft.CodeAnalysis.Common (5.3)
+    Microsoft.CodeAnalysis.VisualBasic.Workspaces (5.3)
       Humanizer.Core (>= 2.14.1)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
-      Microsoft.CodeAnalysis.Common (5.0)
-      Microsoft.CodeAnalysis.VisualBasic (5.0)
-      Microsoft.CodeAnalysis.Workspaces.Common (5.0)
+      Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1)
+      Microsoft.CodeAnalysis.Common (5.3)
+      Microsoft.CodeAnalysis.VisualBasic (5.3)
+      Microsoft.CodeAnalysis.Workspaces.Common (5.3)
       System.Composition (>= 9.0)
-    Microsoft.CodeAnalysis.Workspaces.Common (5.0)
+    Microsoft.CodeAnalysis.Workspaces.Common (5.3)
       Humanizer.Core (>= 2.14.1)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
-      Microsoft.CodeAnalysis.Common (5.0)
+      Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1)
+      Microsoft.CodeAnalysis.Common (5.3)
       System.Composition (>= 9.0)
-    Microsoft.CodeCoverage (18.0.1)
-    Microsoft.Extensions.ObjectPool (10.0.1)
-    Microsoft.NET.StringTools (18.0.2)
-    Microsoft.NET.Test.Sdk (18.0.1)
-      Microsoft.CodeCoverage (>= 18.0.1)
-      Microsoft.TestPlatform.TestHost (>= 18.0.1)
-    Microsoft.TestPlatform.ObjectModel (18.0.1)
+    Microsoft.CodeCoverage (18.5.1)
+    Microsoft.Extensions.ObjectPool (10.0.8)
+    Microsoft.NET.StringTools (18.6.3)
+    Microsoft.NET.Test.Sdk (18.5.1)
+      Microsoft.CodeCoverage (>= 18.5.1)
+      Microsoft.TestPlatform.TestHost (>= 18.5.1)
+    Microsoft.TestPlatform.ObjectModel (18.5.1)
       System.Reflection.Metadata (>= 8.0)
-    Microsoft.TestPlatform.TestHost (18.0.1)
-      Microsoft.TestPlatform.ObjectModel (>= 18.0.1)
+    Microsoft.TestPlatform.TestHost (18.5.1)
+      Microsoft.TestPlatform.ObjectModel (>= 18.5.1)
       Newtonsoft.Json (>= 13.0.3)
     Microsoft.VisualStudio.SolutionPersistence (1.0.52)
     Mono.Posix.NETStandard (1.0)
-    MSBuild.StructuredLogger (2.3.113)
+    MSBuild.StructuredLogger (2.3.204)
       Microsoft.Build.Framework (>= 17.5)
       Microsoft.Build.Utilities.Core (>= 17.5)
-      System.Collections.Immutable (>= 8.0)
-    NaturalSort.Extension (4.4.1)
     Newtonsoft.Json (13.0.4)
-    NuGet.Versioning (7.0.1)
+    NuGet.Versioning (7.6)
     System.Buffers (4.6.1)
-    System.Collections.Immutable (10.0.1)
-    System.Composition (10.0.1)
-      System.Composition.AttributedModel (>= 10.0.1)
-      System.Composition.Convention (>= 10.0.1)
-      System.Composition.Hosting (>= 10.0.1)
-      System.Composition.Runtime (>= 10.0.1)
-      System.Composition.TypedParts (>= 10.0.1)
-    System.Composition.AttributedModel (10.0.1)
-    System.Composition.Convention (10.0.1)
-      System.Composition.AttributedModel (>= 10.0.1)
-    System.Composition.Hosting (10.0.1)
-      System.Composition.Runtime (>= 10.0.1)
-    System.Composition.Runtime (10.0.1)
-    System.Composition.TypedParts (10.0.1)
-      System.Composition.AttributedModel (>= 10.0.1)
-      System.Composition.Hosting (>= 10.0.1)
-      System.Composition.Runtime (>= 10.0.1)
-    System.Configuration.ConfigurationManager (10.0.1)
-      System.Diagnostics.EventLog (>= 10.0.1)
-      System.Security.Cryptography.ProtectedData (>= 10.0.1)
-    System.Diagnostics.EventLog (10.0.1)
-    System.IO.Pipelines (10.0.1)
+    System.Collections.Immutable (10.0.8)
+    System.Composition (10.0.8)
+      System.Composition.AttributedModel (>= 10.0.8)
+      System.Composition.Convention (>= 10.0.8)
+      System.Composition.Hosting (>= 10.0.8)
+      System.Composition.Runtime (>= 10.0.8)
+      System.Composition.TypedParts (>= 10.0.8)
+    System.Composition.AttributedModel (10.0.8)
+    System.Composition.Convention (10.0.8)
+      System.Composition.AttributedModel (>= 10.0.8)
+    System.Composition.Hosting (10.0.8)
+      System.Composition.Runtime (>= 10.0.8)
+    System.Composition.Runtime (10.0.8)
+    System.Composition.TypedParts (10.0.8)
+      System.Composition.AttributedModel (>= 10.0.8)
+      System.Composition.Hosting (>= 10.0.8)
+      System.Composition.Runtime (>= 10.0.8)
+    System.Configuration.ConfigurationManager (10.0.8)
+      System.Diagnostics.EventLog (>= 10.0.8)
+      System.Security.Cryptography.ProtectedData (>= 10.0.8)
+    System.Diagnostics.EventLog (10.0.8)
+    System.IO.Pipelines (10.0.8)
     System.Memory (4.6.3)
     System.Numerics.Vectors (4.6.1)
-    System.Reflection.Metadata (10.0.1)
-    System.Reflection.MetadataLoadContext (10.0.1)
+    System.Reflection.Metadata (10.0.8)
+    System.Reflection.MetadataLoadContext (10.0.8)
     System.Runtime.CompilerServices.Unsafe (6.1.2)
-    System.Security.Cryptography.ProtectedData (10.0.1)
-    System.Text.Encoding.CodePages (10.0.1)
-    System.Threading.Channels (10.0.1)
+    System.Security.Cryptography.ProtectedData (10.0.8)
+    System.Text.Encoding.CodePages (10.0.8)
+    System.Threading.Channels (10.0.8)
     System.Threading.Tasks.Extensions (4.6.3)
     xunit (2.9.3)
       xunit.analyzers (>= 1.18)
       xunit.assert (>= 2.9.3)
       xunit.core (2.9.3)
     xunit.abstractions (2.0.3)
-    xunit.analyzers (1.26)
+    xunit.analyzers (1.27)
     xunit.assert (2.9.3)
     xunit.core (2.9.3)
       xunit.extensibility.core (2.9.3)
diff --git a/csharp/paket.main.bzl b/csharp/paket.main.bzl
index 88131888227b..0c1b13334243 100644
--- a/csharp/paket.main.bzl
+++ b/csharp/paket.main.bzl
@@ -7,59 +7,58 @@ def main():
     nuget_repo(
         name = "paket.main",
         packages = [
-            {"name": "Basic.CompilerLog.Util", "id": "Basic.CompilerLog.Util", "version": "0.9.25", "sha512": "sha512-AU428QscGy1Z9eM4WqAqlO19pRIyHPZ+K63jgKX+sBWFzVLHMlyc97RVdm8VUAqVVBauS7kwaiA3S1sE/mBr4w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "net462": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "net47": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "net471": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "net472": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "net48": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "net5.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "net6.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "net7.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "net8.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning"], "net9.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "netcoreapp2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "netcoreapp2.2": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "netcoreapp3.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "netcoreapp3.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"], "netstandard2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "NuGet.Versioning", "System.Buffers"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Humanizer.Core", "id": "Humanizer.Core", "version": "3.0.1", "sha512": "sha512-lcQ2HfNqHljfbalRLMKc8j4M0Og3qIvMSeyLp7KY58aCcgcZwiR0s5Uf2vrJ3p7OFGoWjcgbWATTpxqzrbuBSw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Memory"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "MessagePack", "id": "MessagePack", "version": "3.1.4", "sha512": "sha512-O0JoklM97ru+Rqr1hGnlCbSAxi8MOk48pwoaT458RzboCHuAkQWTh+Of9MUoN3LE0Cb2tapku0FRPt2hnk+o0g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net6.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net7.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net8.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net9.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netcoreapp3.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "3.1.4", "sha512": "sha512-kIgD3A0OHs8+VUabMhIJT9ZF4oGHqjCocaRDmERI/Ds2hzJ5q3kcvzn5zI7V3CJ2NlQ4HDI80uh6zCqglwgQCQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "MessagePackAnalyzer", "id": "MessagePackAnalyzer", "version": "3.1.4", "sha512": "sha512-DFlhiA5fia4iK6i0S+L7sYMYmo5XRgWydKxiaxwz7tfcbvIhU7nmG4JzN1D9Y2XCEmLNExvNwTzXVEgURu4GnA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Bcl.AsyncInterfaces", "id": "Microsoft.Bcl.AsyncInterfaces", "version": "10.0.1", "sha512": "sha512-2SbGOdcRb04XU0XDlYH3o3a2Xu9w2kgkS5SXXru/YVvdpbLymqgen+JcYsPzf9IzLO4hFiZhKpBTJRe7fB885A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Threading.Tasks.Extensions"], "net462": ["System.Threading.Tasks.Extensions"], "net47": ["System.Threading.Tasks.Extensions"], "net471": ["System.Threading.Tasks.Extensions"], "net472": ["System.Threading.Tasks.Extensions"], "net48": ["System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Bcl.Memory", "id": "Microsoft.Bcl.Memory", "version": "10.0.1", "sha512": "sha512-e0Z3KEDQN0Q7HxmYBNuY2r1pCyaUl9T5AbtyC2v7Nnn+XcT2v41B+nnhGKesGUWo119e9Qq9wbOhh94Tm6kR/A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Build", "id": "Microsoft.Build", "version": "18.0.2", "sha512": "sha512-/rRET3AtEAUTKFDboKvp/GTDxGwU7VBBfwaKeZtzGg+pyqYdvasHeR3ERTuoxSrgJqnu1J23xd4H481IiJFhnA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Reflection.MetadataLoadContext", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Reflection.MetadataLoadContext", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Build.Framework", "id": "Microsoft.Build.Framework", "version": "18.0.2", "sha512": "sha512-cmXoGncAIrDZgu0NumtXJSTILv9NHU2sPhrlkckefMK1XCuJUrvClVxkmvQDpvm4sCKwSFolW2AanGCLNJ6xDw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Build.Utilities.Core", "id": "Microsoft.Build.Utilities.Core", "version": "18.0.2", "sha512": "sha512-4f5DSPN/nLyGddOx2Etrjy42XFQ9tWeJ8lwJr/tLloRl/YRzT1kV+1txwRFXlav9V93wMOUrwMQqpnd131Sb+w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Configuration.ConfigurationManager", "System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework"], "net462": ["Microsoft.Build.Framework"], "net47": ["Microsoft.Build.Framework"], "net471": ["Microsoft.Build.Framework"], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.Build.Framework"], "net6.0": ["Microsoft.Build.Framework"], "net7.0": ["Microsoft.Build.Framework"], "net8.0": ["Microsoft.Build.Framework"], "net9.0": ["Microsoft.Build.Framework"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework"], "netcoreapp2.1": ["Microsoft.Build.Framework"], "netcoreapp2.2": ["Microsoft.Build.Framework"], "netcoreapp3.0": ["Microsoft.Build.Framework"], "netcoreapp3.1": ["Microsoft.Build.Framework"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework"], "netstandard2.1": ["Microsoft.Build.Framework"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeAnalysis", "id": "Microsoft.CodeAnalysis", "version": "5.0.0", "sha512": "sha512-ToXzcZLcHA9vT4e1A6jNafAPuTJj4osfqJck562Be8ByvzS78pY9I+SdO5yo2Kwka0lz++hOWypW1Qdf1TtR4w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net9.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeAnalysis.Analyzers", "id": "Microsoft.CodeAnalysis.Analyzers", "version": "3.11.0", "sha512": "sha512-tP9SLzLK72XCExlh8KXfrKbU6ycmZL3ExGl/a3Ml7LNy2Uaam7gFjjUmdzyTYkMXTyckCHHpzx7bD6BMumh8Bg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeAnalysis.Common", "id": "Microsoft.CodeAnalysis.Common", "version": "5.0.0", "sha512": "sha512-uK5yslTJQ2UznzYlttFuDCa/6KruN1aQW/ZNFFHvK+yyA6q7vZ5o0BSPvLj+Com1/R7wGJ07c2O0lPcbDrmQdw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net462": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net47": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net471": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net472": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net48": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net5.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net6.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net7.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net8.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netstandard2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeAnalysis.CSharp", "id": "Microsoft.CodeAnalysis.CSharp", "version": "5.0.0", "sha512": "sha512-wwT/CJOQyQ72Ldouy7gjS/3Vi92hbAAoU3Y0e/6mb39+Vp7aXr3PxuBD73U2QrK1zzgTyv3QhvJPrQX0EiWS8Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeAnalysis.CSharp.Workspaces", "id": "Microsoft.CodeAnalysis.CSharp.Workspaces", "version": "5.0.0", "sha512": "sha512-Fy0BNxco9b7XC7LKdTgq+Kk62HKapyEM05LN5ua3Nt6PZ4pzfAAh+9Dg/VW4aSflgYoiQw/mjnotgUuM9NP6Kw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeAnalysis.VisualBasic", "id": "Microsoft.CodeAnalysis.VisualBasic", "version": "5.0.0", "sha512": "sha512-jGrTRyHgUXYd0iH1wF4svuGnB/3kPerq+iIbaLq5XpNv2+3hbZPyyDla+k/Ylpur6+9ZsDoP0ymhribbgXLmYA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "id": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "version": "5.0.0", "sha512": "sha512-sgWa3mUtCHIfPcSCyKKksrZNlYnmKWeivbZdENrPLTJQXiKXCjFcVYaxRvGBcYeAQES5J63iV03XVviSkJyMqQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeAnalysis.Workspaces.Common", "id": "Microsoft.CodeAnalysis.Workspaces.Common", "version": "5.0.0", "sha512": "sha512-zbKJyIkFW+2Bx5eQl/IWBLmbPTpo9/UyAbt8vaVTXsoi4EYlXrJftCRZmUsmyQP7pg3qKMiR6czPdUjTadNkhA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeCoverage", "id": "Microsoft.CodeCoverage", "version": "18.0.1", "sha512": "sha512-0bzrz+vR49E/jtdBySXaJSPP4plwnMHE2qsyJZgZJuDdIOtLUFswInVa7krxIVz2ur6KJZFdTPXr3WMXfgnDNg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Extensions.ObjectPool", "id": "Microsoft.Extensions.ObjectPool", "version": "10.0.1", "sha512": "sha512-dDQU1quroimptw3K9WSczyFrVmFYKEjeWXmba4BHHSEovYZw2TI77wIJTwrPHgk6j9ozE02AgjP0z0A8POZFwg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.NET.StringTools", "id": "Microsoft.NET.StringTools", "version": "18.0.2", "sha512": "sha512-s9BywFgRKhPV5OyY2t2EMQXfoDrvYSEzX4bHaWkZ/PwYJnxbxmLEqA/dh8MQ2mUOq48sGr3hbkgnghZQHeZc7Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.NET.Test.Sdk", "id": "Microsoft.NET.Test.Sdk", "version": "18.0.1", "sha512": "sha512-cfpn4IW0Q+emID8eUocS7xfmwwYgD/JX5S+zCZA2l7gcYzxZ1vvfcdZHcKkuzCH4gMbBYqcZqtBn9uZa0WJRUg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.CodeCoverage"], "net47": ["Microsoft.CodeCoverage"], "net471": ["Microsoft.CodeCoverage"], "net472": ["Microsoft.CodeCoverage"], "net48": ["Microsoft.CodeCoverage"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net9.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.TestPlatform.ObjectModel", "id": "Microsoft.TestPlatform.ObjectModel", "version": "18.0.1", "sha512": "sha512-qZKcsS5mN7GMwtpd+tRfAt4Dmg8yVbtWkm9iGfqY2GNOG2qW95NH6zf/FrTLXTiS7rB7zqihWGEcSspOaSK8TQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Reflection.Metadata"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Reflection.Metadata"], "net462": ["System.Reflection.Metadata"], "net47": ["System.Reflection.Metadata"], "net471": ["System.Reflection.Metadata"], "net472": ["System.Reflection.Metadata"], "net48": ["System.Reflection.Metadata"], "net5.0": ["System.Reflection.Metadata"], "net6.0": ["System.Reflection.Metadata"], "net7.0": ["System.Reflection.Metadata"], "net8.0": ["System.Reflection.Metadata"], "net9.0": ["System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Reflection.Metadata"], "netcoreapp2.1": ["System.Reflection.Metadata"], "netcoreapp2.2": ["System.Reflection.Metadata"], "netcoreapp3.0": ["System.Reflection.Metadata"], "netcoreapp3.1": ["System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Reflection.Metadata"], "netstandard2.1": ["System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.TestPlatform.TestHost", "id": "Microsoft.TestPlatform.TestHost", "version": "18.0.1", "sha512": "sha512-SX1FnYA8zcNv/lbWK3GjLnAx93jalmyHyQMVi+TNWA61R6xzkLMNpC3fotbfpDheXCFhwy/1rKoULyaOOe0jEg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net9.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Basic.CompilerLog.Util", "id": "Basic.CompilerLog.Util", "version": "0.9.39", "sha512": "sha512-/Kqh12aedOvhOPuFDk/yE8HauuxXFuzB8Qt+NxEUopKnxyXtV0uPIVgBU3mLNC1Dj2E5Yhcz1rtECwnu4Tv1eg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net462": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net47": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net471": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net472": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net48": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net5.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net6.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net7.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net8.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net9.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp2.2": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp3.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp3.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netstandard2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Humanizer.Core", "id": "Humanizer.Core", "version": "3.0.10", "sha512": "sha512-86jRQVvMLU7xxsdHrK87TSqu5kL0lg4EiRjvTBglkrtLw242dMON4vTrFbGKr2CRjqbThBuIpodF2MWbCFKZYA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Memory"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "MessagePack", "id": "MessagePack", "version": "3.1.6", "sha512": "sha512-vkEho7kN4kxlkd238214A0/FGz6DB1Dalexql8CtUpsbtr0DhKmhBLsmZlqc9H6rRiRvG2VJyt+UqUmQxZoqyw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net6.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net7.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net8.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net9.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netcoreapp3.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "3.1.6", "sha512": "sha512-7uF/iFA6NSB5Eo0HijkyEAHPURQC2ESmzoqNFd2bVqu2opQnuvutGYvcZKV91FXQ6YMDhzYvYbIlSTJ/Jru5+Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "MessagePackAnalyzer", "id": "MessagePackAnalyzer", "version": "3.1.6", "sha512": "sha512-eLmNdEFDwLjBiv3/rv/mBtIu18pu9eujlZ8pb0EsbnMzuNyNUp3GJ0WLL0h4qYRW5N41f8zN1N627h/kChe3oA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Bcl.AsyncInterfaces", "id": "Microsoft.Bcl.AsyncInterfaces", "version": "10.0.8", "sha512": "sha512-FzE/KnOmwCmg2KMPjuyevkS5fAzNt2DBLSJs3HsJ+I/CoBSW6i0mighH6ryZ8JHQhNLxMK04X7J8BTt0kEG5/g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Threading.Tasks.Extensions"], "net462": ["System.Threading.Tasks.Extensions"], "net47": ["System.Threading.Tasks.Extensions"], "net471": ["System.Threading.Tasks.Extensions"], "net472": ["System.Threading.Tasks.Extensions"], "net48": ["System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Bcl.Memory", "id": "Microsoft.Bcl.Memory", "version": "10.0.8", "sha512": "sha512-Gd9LaF0vnR5noQP7/LPjSKvXw22b51ejGGs/HJHbzNbMOzT1KqGzW2329gP8DKKMj5iYACBKISwl6nDr32WFWA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Build", "id": "Microsoft.Build", "version": "18.6.3", "sha512": "sha512-KC9xCNrucJlKrA0KFXiYUHZI74kNBOaZ/BLHSCm06fS7aoHnlAlRZizti+i4V0AsaJlaIBjtN/Cf6LkcmENi4w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["Microsoft.Build.Framework", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Reflection.MetadataLoadContext", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Build.Framework", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Reflection.MetadataLoadContext", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Build.Framework", "id": "Microsoft.Build.Framework", "version": "18.6.3", "sha512": "sha512-p11xRx05A+bU2oUIsKKuAEOEPyroo2ygUwQVDLAGV3ZkNtHBsQs9RojvRqr+wiql7KPUXv0qbwKcACUpsbbmcA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.NET.StringTools"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Build.Utilities.Core", "id": "Microsoft.Build.Utilities.Core", "version": "18.6.3", "sha512": "sha512-uB3c5znytjARTsycmhOfnTavdGTYalYWcCtb6RAFqHcXv2y8JxGsdgQQ39n9IqXpt9JyxPSWz2uVuztuG/Oplw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "System.Configuration.ConfigurationManager", "System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.Build.Framework", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Build.Framework", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeAnalysis", "id": "Microsoft.CodeAnalysis", "version": "5.3.0", "sha512": "sha512-gCuN2a/33HYRrRg4P2LvbgSsUaGP/FSHTaz6FapSaEATYnbXBoiR9Nk/ItHAknc6IQPtodkUYKvX78MkBdoOSg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net9.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeAnalysis.Analyzers", "id": "Microsoft.CodeAnalysis.Analyzers", "version": "5.3.0", "sha512": "sha512-v9jPlSs/fE7AU2/eZOw5EUzq0JOaWgP+2gghwIP2XbbTv56PZZZsy1QgEiMa3jjO8hR8SN1+NJvG1xxHL2FDgw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeAnalysis.Common", "id": "Microsoft.CodeAnalysis.Common", "version": "5.3.0", "sha512": "sha512-lt42ETYkJrzJrf99jQ9n7xnanR/ETh92o6LX03kTjQKfKFrJGm5/+4OQJyIz8Kj4/ClbeZ3kvxytsyds4jQ5Tg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net462": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net47": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net471": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net472": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net48": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net5.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net6.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net7.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net8.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netstandard2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeAnalysis.CSharp", "id": "Microsoft.CodeAnalysis.CSharp", "version": "5.3.0", "sha512": "sha512-TD8ulDx0+qjf3oi5gcToiNaxVGzn0rsPN0hCQOq+skYGgugKGLVl8obs0KxrxAOx2xkjySbOcEBumgJ0uhzzgA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeAnalysis.CSharp.Workspaces", "id": "Microsoft.CodeAnalysis.CSharp.Workspaces", "version": "5.3.0", "sha512": "sha512-XwemsUpvFZ8zLvu9QxRdgh4rgoI1WypKHn9D4zrvN5V3p+CSJKmFBS1w09DuBSLe+DIITIu7JQmzmDsHXZow1g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeAnalysis.VisualBasic", "id": "Microsoft.CodeAnalysis.VisualBasic", "version": "5.3.0", "sha512": "sha512-0zqIJspSNg8iBDho82FwYt4ajoBRzMEtzdIPs5KBeisxNIBMpZh8CXJED8RY32HCsIOA5tx870xpgPsXOysMqA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "id": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "version": "5.3.0", "sha512": "sha512-FhpamkHtKiOd/2wlQ4l9K+NQLfAtBniWj2TWjgHp5rY+PNDRsOZpiTVBdrlwRTIR2oe6lz6cKYTxwBKVrPjOzQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeAnalysis.Workspaces.Common", "id": "Microsoft.CodeAnalysis.Workspaces.Common", "version": "5.3.0", "sha512": "sha512-pPJy45QDPFZNUpmgJz7fKL6Tte+CZ7NRw8GyluMBGLRAcwrZNMpWOKkV81MGnkCYOs8UA1b510MrQpevf0iQWw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeCoverage", "id": "Microsoft.CodeCoverage", "version": "18.5.1", "sha512": "sha512-BjoX00WuEWNnHFo591eXZIcl3IYm1iln65ub545zWF1o6pHicSHcX2eUBWEJW9W6GA/9cf/ZgJ2XuGOyDdep2A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Extensions.ObjectPool", "id": "Microsoft.Extensions.ObjectPool", "version": "10.0.8", "sha512": "sha512-XOzhf+i3nZIyqy5sFaEdnNsPOPEYcEz9tL3YIU8RjK3aKIMLPLMaXDCGoOxKeOTN+03Faaz5le8X1RlKsW9rPQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.NET.StringTools", "id": "Microsoft.NET.StringTools", "version": "18.6.3", "sha512": "sha512-8RtWydTzV9i25v80XBoNxZDxmxuClq0PVejE2dHfpLhD8jFoEEPP2S+q5oS9HdSKOVDurUDTdjMCEWUB+DiGZg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.NET.Test.Sdk", "id": "Microsoft.NET.Test.Sdk", "version": "18.5.1", "sha512": "sha512-5/ucicw/H9/VNCmMTCjCQhNHEJc08ZeSLSrjvdZR/rtVUY8Enw+bi9LQTP1K97aRCqw/BG7cIV+VVFvgj3fKiw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.CodeCoverage"], "net47": ["Microsoft.CodeCoverage"], "net471": ["Microsoft.CodeCoverage"], "net472": ["Microsoft.CodeCoverage"], "net48": ["Microsoft.CodeCoverage"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net9.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.TestPlatform.ObjectModel", "id": "Microsoft.TestPlatform.ObjectModel", "version": "18.5.1", "sha512": "sha512-SJHvdEawgdOUuyN2/eVWZCwe14DKPgQPDsQGiwfeKFgjzYDUvhESRpohG9IvQQuYiCvAv7Tn+ozZ2fDPfpwdzg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Reflection.Metadata"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Reflection.Metadata"], "net462": ["System.Reflection.Metadata"], "net47": ["System.Reflection.Metadata"], "net471": ["System.Reflection.Metadata"], "net472": ["System.Reflection.Metadata"], "net48": ["System.Reflection.Metadata"], "net5.0": ["System.Reflection.Metadata"], "net6.0": ["System.Reflection.Metadata"], "net7.0": ["System.Reflection.Metadata"], "net8.0": ["System.Reflection.Metadata"], "net9.0": ["System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Reflection.Metadata"], "netcoreapp2.1": ["System.Reflection.Metadata"], "netcoreapp2.2": ["System.Reflection.Metadata"], "netcoreapp3.0": ["System.Reflection.Metadata"], "netcoreapp3.1": ["System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Reflection.Metadata"], "netstandard2.1": ["System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.TestPlatform.TestHost", "id": "Microsoft.TestPlatform.TestHost", "version": "18.5.1", "sha512": "sha512-CbWth1jMU2wVyAy1SVMexSyD3JXG8FYYyyrcY+B1aWhzFzRLh8JdThoibXTqXxZ2NRC9me+N4XIQC75dfLcgiA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net9.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Microsoft.VisualStudio.SolutionPersistence", "id": "Microsoft.VisualStudio.SolutionPersistence", "version": "1.0.52", "sha512": "sha512-lHyMm5j5wRwVaC3vlCWrFH2FGy2SpFUZqLvYhzwf1cEUIQCUChU960h8kteFSf01ZkLSgJwrznmspwjW8kPtrA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Mono.Posix.NETStandard", "id": "Mono.Posix.NETStandard", "version": "1.0.0", "sha512": "sha512-RtGiutQZJAmajvQ0QvBvh73VJye85iW9f9tjZlzF88idLxNMo4lAktP/4Y9ilCpais0LDO0tpoICt9Hdv6wooA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "MSBuild.StructuredLogger", "id": "MSBuild.StructuredLogger", "version": "2.3.113", "sha512": "sha512-FS/vecrCK5mq3v4OIyd90BU6x9clwoRzW6LiIfilSQZQBYp/E9/+G9LS2Q9nB1rHEhJ8kDWnsZdytEIsNAb4Jw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "NaturalSort.Extension", "id": "NaturalSort.Extension", "version": "4.4.1", "sha512": "sha512-UTrcQcgmn7pBdx+0Oi/NxlyPslWbMt7U8I1sg/4m36OkOCS+7QKZWY3O4dKcjHD2wQaBr9L2/XWnx3ViTaehZw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "MSBuild.StructuredLogger", "id": "MSBuild.StructuredLogger", "version": "2.3.204", "sha512": "sha512-MnrlWYtNUl0db/2lePRJhtOCzbQkJ1L9tyrA4xlKTFqjvpw8wnnX6AQ+PXYhjlMJ8ET9aoXGJOn/3e9j07NSwg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Newtonsoft.Json", "id": "Newtonsoft.Json", "version": "13.0.4", "sha512": "sha512-bR+v+E/yJ6g7GV2uXw2OrUSjYYfjLkOLC8JD4kCS23msLapnKtdJPBJA75fwHH++ErIffeIqzYITLxAur4KAXA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "NuGet.Versioning", "id": "NuGet.Versioning", "version": "7.0.1", "sha512": "sha512-ibGcrpgA8foidKNcnf+AQ4zEaVZu4OyWjcPITii6mNgwt2uhd8VFsEq7/Mb0KDxrEJaew+nWJQb7Ju166SAyzw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "NuGet.Versioning", "id": "NuGet.Versioning", "version": "7.6.0", "sha512": "sha512-JwbvmbG+1EOilFOAtjT2A7p05UgeOqzTZluUJ4mFgPZUSpYcHPPaK15x+RiqpKsVmKy741MaLN0fjOYxhGXr3g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Buffers", "id": "System.Buffers", "version": "4.6.1", "sha512": "sha512-qve/dFwECwehSWlZmpkrrlIeATCvo/Hw2koyMrUVcDBy5gXAQrnwX8pHEoqgj8DgkrWuWW1DrQbFqoMbo+Fvrg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Collections.Immutable", "id": "System.Collections.Immutable", "version": "10.0.1", "sha512": "sha512-JdD3TbINwQPseS67IR4oTJHb0KGxwnaT/j3A/VWqoKhvBIqTBgWK08UhDn7mcKEozKIfeSUWspmpW9kE2EgsHQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition", "id": "System.Composition", "version": "10.0.1", "sha512": "sha512-N6NIjCYQpESjd6TSFlaZwbNrV7ZuLZuVBv/5/UuyX2z2zI+zr9lmbCXMN9IEa6gKSu561gsGjveEXAPCY1u6Ug==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net462": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net47": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net471": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net472": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net48": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition.AttributedModel", "id": "System.Composition.AttributedModel", "version": "10.0.1", "sha512": "sha512-1YnM6Ly+qKW62DGTz9Ew+vaYpB7Y3d6R+oxaOgdJwp6vlHP9oUNsL7hD12+ugoGheWcg8Ld+X63wI8/XbLaUxA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition.Convention", "id": "System.Composition.Convention", "version": "10.0.1", "sha512": "sha512-/ugIOC1IAYV2+waaSutJXMvAe5cGG9bP+dKt9oGiXdAFJ3cUFqJdxwQJJSeDZ4OQ220aj6EYErDewWxUoo0QHQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel"], "net462": ["System.Composition.AttributedModel"], "net47": ["System.Composition.AttributedModel"], "net471": ["System.Composition.AttributedModel"], "net472": ["System.Composition.AttributedModel"], "net48": ["System.Composition.AttributedModel"], "net5.0": ["System.Composition.AttributedModel"], "net6.0": ["System.Composition.AttributedModel"], "net7.0": ["System.Composition.AttributedModel"], "net8.0": ["System.Composition.AttributedModel"], "net9.0": ["System.Composition.AttributedModel"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel"], "netcoreapp2.1": ["System.Composition.AttributedModel"], "netcoreapp2.2": ["System.Composition.AttributedModel"], "netcoreapp3.0": ["System.Composition.AttributedModel"], "netcoreapp3.1": ["System.Composition.AttributedModel"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel"], "netstandard2.1": ["System.Composition.AttributedModel"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition.Hosting", "id": "System.Composition.Hosting", "version": "10.0.1", "sha512": "sha512-LVw0GhK+7IJLeIgggvNh7wu3I3MkOBdq+O3SUA378mQeLKjwR8ElsPvyq3rqaO+de38pVl0oFt0Fz/fU/Jox4A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.Runtime"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.Runtime"], "net462": ["System.Composition.Runtime"], "net47": ["System.Composition.Runtime"], "net471": ["System.Composition.Runtime"], "net472": ["System.Composition.Runtime"], "net48": ["System.Composition.Runtime"], "net5.0": ["System.Composition.Runtime"], "net6.0": ["System.Composition.Runtime"], "net7.0": ["System.Composition.Runtime"], "net8.0": ["System.Composition.Runtime"], "net9.0": ["System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.Runtime"], "netstandard2.1": ["System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition.Runtime", "id": "System.Composition.Runtime", "version": "10.0.1", "sha512": "sha512-HYfhfKira/soAn1h3e3pOctNx5WTAZMdGFbF5rO55oXXRzzFtBoujTEjGYCyJVj8jKezGZVvIZNr1N2bmqc3sQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition.TypedParts", "id": "System.Composition.TypedParts", "version": "10.0.1", "sha512": "sha512-AfgzCNetIffOWMnRo2szRGaeV6YZTpS0zrkZj5/6BWWaF2qgGllTtZOBBiZqA57tVDUoVUNf/LP1I6Lt1xkrAw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net462": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net47": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net471": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net472": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net48": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Configuration.ConfigurationManager", "id": "System.Configuration.ConfigurationManager", "version": "10.0.1", "sha512": "sha512-E6SRJRaRweplupgFl3IRfNZ/AeCCb+6/FNeXpG6Wgj0mzKs7EAUoJTn0V+8c+SwffVifZRz9+bvNL/hKVddkyg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Security.Cryptography.ProtectedData"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Security.Cryptography.ProtectedData"], "net6.0": ["System.Security.Cryptography.ProtectedData"], "net7.0": ["System.Security.Cryptography.ProtectedData"], "net8.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net9.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.1": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.2": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.1": ["System.Security.Cryptography.ProtectedData"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Security.Cryptography.ProtectedData"], "netstandard2.1": ["System.Security.Cryptography.ProtectedData"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Diagnostics.EventLog", "id": "System.Diagnostics.EventLog", "version": "10.0.1", "sha512": "sha512-Q1RjaIGlmcSUWEjPkIq6eUd/O5FVR9Kgseq/cPPldpdkRWK/GO5HkDE7B4Az1tVVjDiY/UnpRLQy2e/pH5nr1g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.IO.Pipelines", "id": "System.IO.Pipelines", "version": "10.0.1", "sha512": "sha512-hiEzKxYthGSjhsrnW/D4jCxBbE+lDG01KvAf3Iv7cQjpNU9ZoVo25Ukedth0LRymKpWcsTs3Fuawu9O6+Gnr5g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net462": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net47": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net471": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net472": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net6.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net7.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Collections.Immutable", "id": "System.Collections.Immutable", "version": "10.0.8", "sha512": "sha512-C6PSp5YO9fvxcDoBwqDE/2iMPNgzOcrdjQsnpJxWBMDZRMxdpjDe9tzJb14zZwY0dqbVSsoik5un31ZXJ7Fu8Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition", "id": "System.Composition", "version": "10.0.8", "sha512": "sha512-h1qUp18nhfGfw3mz8ZxNTUZXm2rVvk7HiPKj0IYdRJIdOAcIBmI/MT4U8Etdi6y0tPb2dNQvfTnj35PgDCpDwg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net462": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net47": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net471": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net472": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net48": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition.AttributedModel", "id": "System.Composition.AttributedModel", "version": "10.0.8", "sha512": "sha512-Qy0Ag0tpyGeh7BFgN7Mj2rumQHWoZYuTRE5fo5ice3j97JIMoAKt6uvj3sQqukhNLLPUDY0vz3WA36Fl/AbPRw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition.Convention", "id": "System.Composition.Convention", "version": "10.0.8", "sha512": "sha512-TKc99rqqwWNajwl3o40keYyQtYVD+NnWWX1EId4whrwo7wT9KiTS8Q6CJVR7GLxA+9lbGMJyQh6IgwZk3T7YJg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel"], "net462": ["System.Composition.AttributedModel"], "net47": ["System.Composition.AttributedModel"], "net471": ["System.Composition.AttributedModel"], "net472": ["System.Composition.AttributedModel"], "net48": ["System.Composition.AttributedModel"], "net5.0": ["System.Composition.AttributedModel"], "net6.0": ["System.Composition.AttributedModel"], "net7.0": ["System.Composition.AttributedModel"], "net8.0": ["System.Composition.AttributedModel"], "net9.0": ["System.Composition.AttributedModel"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel"], "netcoreapp2.1": ["System.Composition.AttributedModel"], "netcoreapp2.2": ["System.Composition.AttributedModel"], "netcoreapp3.0": ["System.Composition.AttributedModel"], "netcoreapp3.1": ["System.Composition.AttributedModel"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel"], "netstandard2.1": ["System.Composition.AttributedModel"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition.Hosting", "id": "System.Composition.Hosting", "version": "10.0.8", "sha512": "sha512-Xx+8iGL7kYmfDwxPZqbFGuVO+JKLqfwBPJpqquFDE1IUsZs7yKFmmP1zg+xVwcEq/wJdYVqs9MTsCU/1AaBW/A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.Runtime"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.Runtime"], "net462": ["System.Composition.Runtime"], "net47": ["System.Composition.Runtime"], "net471": ["System.Composition.Runtime"], "net472": ["System.Composition.Runtime"], "net48": ["System.Composition.Runtime"], "net5.0": ["System.Composition.Runtime"], "net6.0": ["System.Composition.Runtime"], "net7.0": ["System.Composition.Runtime"], "net8.0": ["System.Composition.Runtime"], "net9.0": ["System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.Runtime"], "netstandard2.1": ["System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition.Runtime", "id": "System.Composition.Runtime", "version": "10.0.8", "sha512": "sha512-yyACoUVUtVhIcZzApq+ARHwVOkA9PRSQ/gI2y5xXwa6nwqA8doKySyqH1bfpaacHJ3j4zhrRe1lpjffTEhh0+Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition.TypedParts", "id": "System.Composition.TypedParts", "version": "10.0.8", "sha512": "sha512-kPWxTNdqjdnYmvDMnEFbjmKsbECPKXCHiusp53sor6xgDcUQNkzNqEKTMVEFbvjIH0DBLXIP9fudSrK886dqeg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net462": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net47": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net471": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net472": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net48": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Configuration.ConfigurationManager", "id": "System.Configuration.ConfigurationManager", "version": "10.0.8", "sha512": "sha512-1Z/h32w5oEjve1mUU5w1aYY9p+wcuNtTxo0RG+cQl+I34XRkjx4iYK9kuz+WYzud9QpPePk6iyjvnay1mWj6/Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Security.Cryptography.ProtectedData"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Security.Cryptography.ProtectedData"], "net6.0": ["System.Security.Cryptography.ProtectedData"], "net7.0": ["System.Security.Cryptography.ProtectedData"], "net8.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net9.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.1": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.2": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.1": ["System.Security.Cryptography.ProtectedData"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Security.Cryptography.ProtectedData"], "netstandard2.1": ["System.Security.Cryptography.ProtectedData"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Diagnostics.EventLog", "id": "System.Diagnostics.EventLog", "version": "10.0.8", "sha512": "sha512-ik2gdaGlYD5S+5wk4WLP43va4G9IW7g5QxW/C1/+DSEH2KNEGWuskgaVhURZxCkstF20I1iwgfMCB9k/5uUBFw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.IO.Pipelines", "id": "System.IO.Pipelines", "version": "10.0.8", "sha512": "sha512-jrBzkIgn/+Ul7ODVXy5uBYhlXpEVHx57VUtLigfw0pq2r+xu3dv/F0aWi7y3C/w3GSk6mhvoX3RfKcWJT372UA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net462": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net47": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net471": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net472": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net6.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net7.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Memory", "id": "System.Memory", "version": "4.6.3", "sha512": "sha512-NXcNYlWoXe5cz9sb8Huo6x2dCZVYkhwKtgE00n/MoI8V4ZI/7/t+EI5bOhQFlZfFjjqM8+U6prjU/aARt7H/tA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Numerics.Vectors", "id": "System.Numerics.Vectors", "version": "4.6.1", "sha512": "sha512-/rkvpUeUPlCY/2qYVQKiUsj5IKaXZcy2+SQAGAfemAdyEF5AgIgYOFNSTMWDXo09JWFX9HB+wV1yCyi2Mwi3TA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Reflection.Metadata", "id": "System.Reflection.Metadata", "version": "10.0.1", "sha512": "sha512-wY+305y+G3F14m0ba1znntQaZZSGDeCkUYJu1MP4ms0yer0wjx1lDr9PV+3PPXF1FJaKZqynUPzh5S0Oud2OHg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable"], "net462": ["System.Collections.Immutable"], "net47": ["System.Collections.Immutable"], "net471": ["System.Collections.Immutable"], "net472": ["System.Collections.Immutable"], "net48": ["System.Collections.Immutable"], "net5.0": ["System.Collections.Immutable"], "net6.0": ["System.Collections.Immutable"], "net7.0": ["System.Collections.Immutable"], "net8.0": ["System.Collections.Immutable"], "net9.0": ["System.Collections.Immutable"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable"], "netcoreapp2.1": ["System.Collections.Immutable"], "netcoreapp2.2": ["System.Collections.Immutable"], "netcoreapp3.0": ["System.Collections.Immutable"], "netcoreapp3.1": ["System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable"], "netstandard2.1": ["System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Reflection.MetadataLoadContext", "id": "System.Reflection.MetadataLoadContext", "version": "10.0.1", "sha512": "sha512-PhPuIrzG9J6x9stz1ItEOOO+avF41vmPMrvVCGZvIdNUym5i7fepNQsegXfAWYNl8Am8hswj+Gv4eIl9y3gy/Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net8.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Reflection.Metadata", "id": "System.Reflection.Metadata", "version": "10.0.8", "sha512": "sha512-wWf/RiVz/UVoMqYGr2X5z1wz1uktkIU0E+aGcFbffDNMU0kN3t5j3Yc+/8xC6GvT4+KjXDXumO/3ddS/cln5Pw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable"], "net462": ["System.Collections.Immutable"], "net47": ["System.Collections.Immutable"], "net471": ["System.Collections.Immutable"], "net472": ["System.Collections.Immutable"], "net48": ["System.Collections.Immutable"], "net5.0": ["System.Collections.Immutable"], "net6.0": ["System.Collections.Immutable"], "net7.0": ["System.Collections.Immutable"], "net8.0": ["System.Collections.Immutable"], "net9.0": ["System.Collections.Immutable"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable"], "netcoreapp2.1": ["System.Collections.Immutable"], "netcoreapp2.2": ["System.Collections.Immutable"], "netcoreapp3.0": ["System.Collections.Immutable"], "netcoreapp3.1": ["System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable"], "netstandard2.1": ["System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Reflection.MetadataLoadContext", "id": "System.Reflection.MetadataLoadContext", "version": "10.0.8", "sha512": "sha512-YcFpYWsCdnD5vjpskco7E87TD9g6v6nxow1Qu3/XrBlUEulEZOUfTSV5EP7mSSKMYgT3+fJK7zrijCeg+z3w9g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net8.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Runtime.CompilerServices.Unsafe", "id": "System.Runtime.CompilerServices.Unsafe", "version": "6.1.2", "sha512": "sha512-t2aXWJZBkAkRrTOnw31OBELKEVSDD5YvC3O5dXaHFsR66/nRTKm1y3Iq6NwFI5u5IlKrWYfdan66V+GKKkY8hQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Security.Cryptography.ProtectedData", "id": "System.Security.Cryptography.ProtectedData", "version": "10.0.1", "sha512": "sha512-ktT9zhhc2gGmPFGOCy6m+eqnY/yBEnaSanjINTDmF4zqNmSteydGR/Hebaf1IkNOGWs2jrkXvovWO86omwLGQA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Memory"], "net6.0": ["System.Memory"], "net7.0": ["System.Memory"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory"], "netcoreapp2.1": ["System.Memory"], "netcoreapp2.2": ["System.Memory"], "netcoreapp3.0": ["System.Memory"], "netcoreapp3.1": ["System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory"], "netstandard2.1": ["System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Text.Encoding.CodePages", "id": "System.Text.Encoding.CodePages", "version": "10.0.1", "sha512": "sha512-iRoZmmRaI0ZLsMd9+ESdBWZX/tYhM9kozmutE53ZJCiGFXQ7aYaD1Q6LJU8UCDclB+4kY2VfFBRNcIU87jsdgw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Threading.Channels", "id": "System.Threading.Channels", "version": "10.0.1", "sha512": "sha512-zRRdonHIIJHLwFRDMynwD8zZRpkF+FOFz3kqsTO0Az36YBoRsDVjrhnH79P2+UUFl4eBAbgr9U/m7qFtNBtbnA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Security.Cryptography.ProtectedData", "id": "System.Security.Cryptography.ProtectedData", "version": "10.0.8", "sha512": "sha512-LOVSTFOou3ekg+ou98m8tAC591BuTlTqEbSQv34UIjxcU0HvbZ7qLqCXSp/60Cx40Zd0YmeyXTGeARMgSXlWyg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Memory"], "net6.0": ["System.Memory"], "net7.0": ["System.Memory"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory"], "netcoreapp2.1": ["System.Memory"], "netcoreapp2.2": ["System.Memory"], "netcoreapp3.0": ["System.Memory"], "netcoreapp3.1": ["System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory"], "netstandard2.1": ["System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Text.Encoding.CodePages", "id": "System.Text.Encoding.CodePages", "version": "10.0.8", "sha512": "sha512-xr2qHdT5yx3IOZ4bMkPY+1CGCIqzBC41kk9AHFvl/R3oNrEns5y4OUz4KRXk0UqY4FjiOXW6PtqdvDbSC2iYsQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Threading.Channels", "id": "System.Threading.Channels", "version": "10.0.8", "sha512": "sha512-DLFQGFJl9TNsW2KansRP+AvSO+HUoV6s8g/d93zw7IbGWm48uC6P0TIdzuJTtwHVwN+oQsQ0ReBdLVr+gL1Eqg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Threading.Tasks.Extensions", "id": "System.Threading.Tasks.Extensions", "version": "4.6.3", "sha512": "sha512-zWRHXIBnbfzQE1SamNoW9X5NjEcW/JNAtvVxGKd3bcg71wQVmoI3pDq+WUa2A+temXSNCm7707hmAFwwcYlK0A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "xunit", "id": "xunit", "version": "2.9.3", "sha512": "sha512-3/ayVPC7NQWQENR5REbOgXYsbhoJsmpnxQa5pO4lxbjGbckOs62nsm4kLErzc8ng7V5Xz08uwVjMqaZGJiXCrg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net11": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net20": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net30": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net35": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net40": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net403": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net45": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net451": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net452": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net46": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net461": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net462": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net47": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net471": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net472": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net48": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net5.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net6.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net7.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net8.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net9.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.3": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.4": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.5": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.6": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "xunit.abstractions", "id": "xunit.abstractions", "version": "2.0.3", "sha512": "sha512-PKJri5f0qEQPFvgY6CZR9XG8JROlWSdC/ZYLkkDQuID++Egn+yWjB+Yf57AZ8U6GRlP7z33uDQ4/r5BZPer2JA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "xunit.analyzers", "id": "xunit.analyzers", "version": "1.26.0", "sha512": "sha512-gJ6shgzXmTVaWJsRCpWrfp1ymSSIwjandPL5myGv3wt+96TkARHFUV1bAS4omFPPkSLkFV7nOssjCeEIorPE+w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "xunit.analyzers", "id": "xunit.analyzers", "version": "1.27.0", "sha512": "sha512-K5IO29ZNN2ydez2jhlTRsR20ylp/eQMrMgoonfIpv9c9sWBN6MXRIPGWxvuotojuST3HgU9e/X7l4/ViOLPBvw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "xunit.assert", "id": "xunit.assert", "version": "2.9.3", "sha512": "sha512-wfqwCKAhSWGy9P/dPqDGSIBnPW3sUJ49MEfcTqNF+5BgJwjwtHb9SE7ajYZuR8ymTd8dwxoEGnlJHiejbgDv9w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "xunit.core", "id": "xunit.core", "version": "2.9.3", "sha512": "sha512-cv2sO37qJkIbBL3fXDIn3EPQ2zK8LQ6FkMJNnn1xc9n8mo3ik0URA4MfUNCmwDDCx83ZiJeRrJ0y1ykasojNJg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net11": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net20": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net30": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net35": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net40": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net403": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net45": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net451": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net452": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net46": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net461": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net462": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net47": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net471": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net472": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net48": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net5.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net6.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net7.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net8.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net9.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp1.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp1.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.2": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp3.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp3.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.2": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.3": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.4": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.5": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.6": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard2.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard2.1": ["xunit.extensibility.core", "xunit.extensibility.execution"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "xunit.extensibility.core", "id": "xunit.extensibility.core", "version": "2.9.3", "sha512": "sha512-S0a+jmIF/DraKuJ+FfWbqXMwvpcKxjP3GdrQzz5pr3GYtgII2XfDdAhkU/5VIWqWon2R6Q31X/9sTGaU+koDaQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["xunit.abstractions"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": ["xunit.abstractions"], "net451": ["xunit.abstractions"], "net452": ["xunit.abstractions"], "net46": ["xunit.abstractions"], "net461": ["xunit.abstractions"], "net462": ["xunit.abstractions"], "net47": ["xunit.abstractions"], "net471": ["xunit.abstractions"], "net472": ["xunit.abstractions"], "net48": ["xunit.abstractions"], "net5.0": ["xunit.abstractions"], "net6.0": ["xunit.abstractions"], "net7.0": ["xunit.abstractions"], "net8.0": ["xunit.abstractions"], "net9.0": ["xunit.abstractions"], "netcoreapp1.0": ["xunit.abstractions"], "netcoreapp1.1": ["xunit.abstractions"], "netcoreapp2.0": ["xunit.abstractions"], "netcoreapp2.1": ["xunit.abstractions"], "netcoreapp2.2": ["xunit.abstractions"], "netcoreapp3.0": ["xunit.abstractions"], "netcoreapp3.1": ["xunit.abstractions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.abstractions"], "netstandard1.2": ["xunit.abstractions"], "netstandard1.3": ["xunit.abstractions"], "netstandard1.4": ["xunit.abstractions"], "netstandard1.5": ["xunit.abstractions"], "netstandard1.6": ["xunit.abstractions"], "netstandard2.0": ["xunit.abstractions"], "netstandard2.1": ["xunit.abstractions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index eefb35f174ad..3ceb4374a777 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.68
+
+No user-facing changes.
+
 ## 1.7.67
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.68.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.68.md
new file mode 100644
index 000000000000..774ffcebdfeb
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.68.md
@@ -0,0 +1,3 @@
+## 1.7.68
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
index 0293fdade8f5..f737dfa09724 100644
--- a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.67
+lastReleaseVersion: 1.7.68
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index 51b34483e1bf..52172a7a1891 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.7.67
+version: 1.7.69-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index eefb35f174ad..3ceb4374a777 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.68
+
+No user-facing changes.
+
 ## 1.7.67
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.68.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.68.md
new file mode 100644
index 000000000000..774ffcebdfeb
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.68.md
@@ -0,0 +1,3 @@
+## 1.7.68
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
index 0293fdade8f5..f737dfa09724 100644
--- a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.67
+lastReleaseVersion: 1.7.68
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index 81f347373c52..cf63a4395185 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.7.67
+version: 1.7.69-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.expected
index 2be1117efc08..6b32d2248c5e 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.expected
@@ -22,7 +22,6 @@
 | [...]/csharp/tools/[...]/Microsoft.Win32.Primitives.dll |
 | [...]/csharp/tools/[...]/Microsoft.Win32.Registry.dll |
 | [...]/csharp/tools/[...]/Mono.Posix.NETStandard.dll |
-| [...]/csharp/tools/[...]/NaturalSort.Extension.dll |
 | [...]/csharp/tools/[...]/Newtonsoft.Json.dll |
 | [...]/csharp/tools/[...]/NuGet.Versioning.dll |
 | [...]/csharp/tools/[...]/StructuredLogger.dll |
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 17fd83bcda76..a45a993832ed 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 6.0.2
+
+### Minor Analysis Improvements
+
+* Full support for C# 14 / .NET 10. All new language features are now supported by the extractor. The QL library and data flow analysis now support the new C# 14 language constructs and include generated Models as Data (MaD) models for the .NET 10 runtime.
+* C# 14: Added support for user-defined instance increment/decrement operators.
+
 ## 6.0.1
 
 No user-facing changes.
diff --git a/csharp/ql/lib/change-notes/2026-05-19-properties-indexers-refreturn.md b/csharp/ql/lib/change-notes/2026-05-19-properties-indexers-refreturn.md
new file mode 100644
index 000000000000..d92d5fdf819d
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2026-05-19-properties-indexers-refreturn.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Improved call target resolution for ref-return properties and indexers.
diff --git a/csharp/ql/lib/change-notes/released/6.0.2.md b/csharp/ql/lib/change-notes/released/6.0.2.md
new file mode 100644
index 000000000000..ea98fb2257ea
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/6.0.2.md
@@ -0,0 +1,6 @@
+## 6.0.2
+
+### Minor Analysis Improvements
+
+* Full support for C# 14 / .NET 10. All new language features are now supported by the extractor. The QL library and data flow analysis now support the new C# 14 language constructs and include generated Models as Data (MaD) models for the .NET 10 runtime.
+* C# 14: Added support for user-defined instance increment/decrement operators.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index d1f3c68c8120..70437ec53b89 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 6.0.1
+lastReleaseVersion: 6.0.2
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index 1605a359ad80..ca43ae8b07bc 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 6.0.1
+version: 6.0.3-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/lib/semmle/code/csharp/Callable.qll b/csharp/ql/lib/semmle/code/csharp/Callable.qll
index 9416a7d4d9c7..198ad2af1801 100644
--- a/csharp/ql/lib/semmle/code/csharp/Callable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Callable.qll
@@ -613,6 +613,9 @@ class UnaryOperator extends Operator {
     this.getNumberOfParameters() = 1 and
     not this instanceof ConversionOperator and
     not this instanceof CompoundAssignmentOperator
+    or
+    // Instance increment and decrement operators don't have a parameter (only a qualifier).
+    this.getNumberOfParameters() = 0 and not this.isStatic()
   }
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraph.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraph.qll
index ca71e213e327..7e5072637c30 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraph.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraph.qll
@@ -175,7 +175,9 @@ module Ast implements AstSig<Location> {
   final private class FinalForStmt = CS::ForStmt;
 
   class ForStmt extends FinalForStmt {
-    Expr getInit(int index) { result = this.getInitializer(index) }
+    AstNode getInit(int index) { result = super.getInitializer(index) }
+
+    AstNode getUpdate(int index) { result = super.getUpdate(index) }
   }
 
   final private class FinalForeachStmt = CS::ForeachStmt;
diff --git a/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll b/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
index 15a64d12b499..909ba3b9d423 100644
--- a/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
@@ -73,6 +73,19 @@ class DispatchCall extends Internal::TDispatchCall {
   }
 }
 
+abstract private class InstanceOperatorCall extends OperatorCall {
+  abstract Expr getQualifier();
+}
+
+private class InstanceCompoundAssignment extends InstanceOperatorCall instanceof CompoundAssignmentOperatorCall
+{
+  override Expr getQualifier() { result = CompoundAssignmentOperatorCall.super.getQualifier() }
+}
+
+private class InstanceMutator extends InstanceOperatorCall instanceof InstanceMutatorOperatorCall {
+  override Expr getQualifier() { result = InstanceMutatorOperatorCall.super.getQualifier() }
+}
+
 /** Internal implementation details. */
 private module Internal {
   private import OverridableCallable
@@ -101,9 +114,9 @@ private module Internal {
       } or
       TDispatchOperatorCall(OperatorCall oc) {
         not oc.isLateBound() and
-        not oc instanceof CompoundAssignmentOperatorCall
+        not oc instanceof InstanceOperatorCall
       } or
-      TDispatchCompoundAssignmentOperatorCall(CompoundAssignmentOperatorCall caoc) or
+      TDispatchInstanceOperatorCall(InstanceOperatorCall ioc) or
       TDispatchReflectionCall(MethodCall mc, string name, Expr object, Expr qualifier, int args) {
         isReflectionCall(mc, name, object, qualifier, args)
       } or
@@ -890,12 +903,10 @@ private module Internal {
     override Operator getAStaticTarget() { result = this.getCall().getTarget() }
   }
 
-  private class DispatchCompoundAssignmentOperatorCall extends DispatchOverridableCall,
-    TDispatchCompoundAssignmentOperatorCall
+  private class DispatchInstanceOperatorCall extends DispatchOverridableCall,
+    TDispatchInstanceOperatorCall
   {
-    override CompoundAssignmentOperatorCall getCall() {
-      this = TDispatchCompoundAssignmentOperatorCall(result)
-    }
+    override InstanceOperatorCall getCall() { this = TDispatchInstanceOperatorCall(result) }
 
     override Expr getArgument(int i) { result = this.getCall().getArgument(i) }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll
index 9dbf898e2864..a358e73970c1 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll
@@ -570,6 +570,29 @@ class MutatorOperatorCall extends OperatorCall {
   predicate isPostfix() { mutator_invocation_mode(this, 2) }
 }
 
+/**
+ * A call to an instance mutator operator, for example `a++` on
+ * line 5 in
+ *
+ * ```csharp
+ * class A {
+ *   public void operator ++() { ... }
+ *
+ *   public static void Increment(A a) {
+ *     a++;
+ *   }
+ * }
+ * ```
+ */
+class InstanceMutatorOperatorCall extends MutatorOperatorCall {
+  InstanceMutatorOperatorCall() { this.getTarget().getNumberOfParameters() = 0 }
+
+  /** Gets the qualifier of this instance mutator operator call. */
+  Expr getQualifier() { result = this.getChildExpr(0) }
+
+  override Expr getArgument(int i) { none() }
+}
+
 /**
  * A call to a compound assignment operator, for example `this += other`
  * on line 7 in
@@ -743,7 +766,16 @@ class PropertyCall extends AccessorCall, PropertyAccessExpr {
   }
 
   override Accessor getWriteTarget() {
-    this instanceof AssignableWrite and result = this.getProperty().getSetter()
+    this instanceof AssignableWrite and
+    exists(Property p | p = this.getProperty() |
+      result = p.getSetter()
+      or
+      result =
+        any(Getter g |
+          g = p.getGetter() and
+          g.getAnnotatedReturnType().isRef()
+        )
+    )
   }
 
   override Expr getArgument(int i) {
@@ -778,7 +810,16 @@ class IndexerCall extends AccessorCall, IndexerAccessExpr {
   }
 
   override Accessor getWriteTarget() {
-    this instanceof AssignableWrite and result = this.getIndexer().getSetter()
+    this instanceof AssignableWrite and
+    exists(Indexer i | i = this.getIndexer() |
+      result = i.getSetter()
+      or
+      result =
+        any(Getter g |
+          g = i.getGetter() and
+          g.getAnnotatedReturnType().isRef()
+        )
+    )
   }
 
   override Expr getArgument(int i) {
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 8c4388fe2bb6..5c196df3614c 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.4
+
+No user-facing changes.
+
 ## 1.7.3
 
 No user-facing changes.
diff --git a/csharp/ql/src/change-notes/released/1.7.4.md b/csharp/ql/src/change-notes/released/1.7.4.md
new file mode 100644
index 000000000000..801ed5f5e718
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.7.4.md
@@ -0,0 +1,3 @@
+## 1.7.4
+
+No user-facing changes.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index 9f9661b1e77a..f4f3a4d51201 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.3
+lastReleaseVersion: 1.7.4
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 84a1271fcad4..378d02fee3f8 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.7.3
+version: 1.7.5-dev
 groups:
   - csharp
   - queries
diff --git a/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected b/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected
index 6ab83277fcfe..d6965f85da5c 100644
--- a/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected
+++ b/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected
@@ -227,7 +227,7 @@ returnTypes
 | NullableRefTypes.cs:107:26:107:36 | ReturnsRef5 | readonly MyClass! |
 | NullableRefTypes.cs:108:26:108:36 | ReturnsRef6 | readonly MyClass! |
 | NullableRefTypes.cs:110:10:110:20 | Parameters1 | Void! |
-| NullableRefTypes.cs:113:32:113:44 | get_RefProperty | MyClass! |
+| NullableRefTypes.cs:113:32:113:44 | get_RefProperty | ref MyClass! |
 | NullableRefTypes.cs:116:7:116:23 | <object initializer> | Void |
 | NullableRefTypes.cs:116:7:116:23 | ToStringWithTypes | Void! |
 | NullableRefTypes.cs:136:7:136:24 | <object initializer> | Void |
diff --git a/csharp/ql/test/library-tests/dataflow/operators/Operator.cs b/csharp/ql/test/library-tests/dataflow/operators/Operator.cs
index 5db1a82b9a4b..0b6aa2e8f90a 100644
--- a/csharp/ql/test/library-tests/dataflow/operators/Operator.cs
+++ b/csharp/ql/test/library-tests/dataflow/operators/Operator.cs
@@ -120,3 +120,36 @@ public void M1()
         Sink(x.Field); // $ hasValueFlow=1
     }
 }
+
+public class MutatorOperators
+{
+    static void Sink(object o) { }
+    static T Source<T>(object source) => throw null;
+
+    public class C1
+    {
+        public object Field { get; private set; }
+
+        public C1()
+        {
+            Field = new object();
+        }
+
+        public C1(object o)
+        {
+            Field = o;
+        }
+
+        public void operator ++()
+        {
+            Field = Source<object>(1);
+        }
+
+        public void M1()
+        {
+            var x = new C1();
+            x++;
+            Sink(x.Field); // $ hasValueFlow=1
+        }
+    }
+}
diff --git a/csharp/ql/test/library-tests/dataflow/operators/operatorFlow.expected b/csharp/ql/test/library-tests/dataflow/operators/operatorFlow.expected
index 8fd12f1c2a8f..dc1ec8b71f44 100644
--- a/csharp/ql/test/library-tests/dataflow/operators/operatorFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/operators/operatorFlow.expected
@@ -130,6 +130,16 @@ edges
 | Operator.cs:119:14:119:14 | access to local variable y : C [property Field] : Object | Operator.cs:119:9:119:9 | [post] access to local variable x : C [property Field] : Object | provenance |  |
 | Operator.cs:120:14:120:14 | access to local variable x : C [property Field] : Object | Operator.cs:120:14:120:20 | access to property Field | provenance |  |
 | Operator.cs:120:14:120:14 | access to local variable x : C [property Field] : Object | Operator.cs:120:14:120:20 | access to property Field | provenance |  |
+| Operator.cs:143:30:143:31 | this [Return] : C1 [property Field] : Object | Operator.cs:151:13:151:13 | [post] access to local variable x : C1 [property Field] : Object | provenance |  |
+| Operator.cs:143:30:143:31 | this [Return] : C1 [property Field] : Object | Operator.cs:151:13:151:13 | [post] access to local variable x : C1 [property Field] : Object | provenance |  |
+| Operator.cs:145:13:145:17 | [post] this access : C1 [property Field] : Object | Operator.cs:143:30:143:31 | this [Return] : C1 [property Field] : Object | provenance |  |
+| Operator.cs:145:13:145:17 | [post] this access : C1 [property Field] : Object | Operator.cs:143:30:143:31 | this [Return] : C1 [property Field] : Object | provenance |  |
+| Operator.cs:145:21:145:37 | call to method Source<Object> : Object | Operator.cs:145:13:145:17 | [post] this access : C1 [property Field] : Object | provenance |  |
+| Operator.cs:145:21:145:37 | call to method Source<Object> : Object | Operator.cs:145:13:145:17 | [post] this access : C1 [property Field] : Object | provenance |  |
+| Operator.cs:151:13:151:13 | [post] access to local variable x : C1 [property Field] : Object | Operator.cs:152:18:152:18 | access to local variable x : C1 [property Field] : Object | provenance |  |
+| Operator.cs:151:13:151:13 | [post] access to local variable x : C1 [property Field] : Object | Operator.cs:152:18:152:18 | access to local variable x : C1 [property Field] : Object | provenance |  |
+| Operator.cs:152:18:152:18 | access to local variable x : C1 [property Field] : Object | Operator.cs:152:18:152:24 | access to property Field | provenance |  |
+| Operator.cs:152:18:152:18 | access to local variable x : C1 [property Field] : Object | Operator.cs:152:18:152:24 | access to property Field | provenance |  |
 nodes
 | Operator.cs:9:39:9:39 | x : C | semmle.label | x : C |
 | Operator.cs:9:39:9:39 | x : C | semmle.label | x : C |
@@ -275,6 +285,18 @@ nodes
 | Operator.cs:120:14:120:14 | access to local variable x : C [property Field] : Object | semmle.label | access to local variable x : C [property Field] : Object |
 | Operator.cs:120:14:120:20 | access to property Field | semmle.label | access to property Field |
 | Operator.cs:120:14:120:20 | access to property Field | semmle.label | access to property Field |
+| Operator.cs:143:30:143:31 | this [Return] : C1 [property Field] : Object | semmle.label | this [Return] : C1 [property Field] : Object |
+| Operator.cs:143:30:143:31 | this [Return] : C1 [property Field] : Object | semmle.label | this [Return] : C1 [property Field] : Object |
+| Operator.cs:145:13:145:17 | [post] this access : C1 [property Field] : Object | semmle.label | [post] this access : C1 [property Field] : Object |
+| Operator.cs:145:13:145:17 | [post] this access : C1 [property Field] : Object | semmle.label | [post] this access : C1 [property Field] : Object |
+| Operator.cs:145:21:145:37 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Operator.cs:145:21:145:37 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Operator.cs:151:13:151:13 | [post] access to local variable x : C1 [property Field] : Object | semmle.label | [post] access to local variable x : C1 [property Field] : Object |
+| Operator.cs:151:13:151:13 | [post] access to local variable x : C1 [property Field] : Object | semmle.label | [post] access to local variable x : C1 [property Field] : Object |
+| Operator.cs:152:18:152:18 | access to local variable x : C1 [property Field] : Object | semmle.label | access to local variable x : C1 [property Field] : Object |
+| Operator.cs:152:18:152:18 | access to local variable x : C1 [property Field] : Object | semmle.label | access to local variable x : C1 [property Field] : Object |
+| Operator.cs:152:18:152:24 | access to property Field | semmle.label | access to property Field |
+| Operator.cs:152:18:152:24 | access to property Field | semmle.label | access to property Field |
 subpaths
 | Operator.cs:29:17:29:17 | access to local variable x : C | Operator.cs:16:38:16:38 | x : C | Operator.cs:16:49:16:49 | access to parameter x : C | Operator.cs:29:17:29:21 | call to operator + : C |
 | Operator.cs:29:17:29:17 | access to local variable x : C | Operator.cs:16:38:16:38 | x : C | Operator.cs:16:49:16:49 | access to parameter x : C | Operator.cs:29:17:29:21 | call to operator + : C |
@@ -308,3 +330,5 @@ testFailures
 | Operator.cs:78:14:78:14 | (...) ... | Operator.cs:84:17:84:29 | call to method Source<C> : C | Operator.cs:78:14:78:14 | (...) ... | $@ | Operator.cs:84:17:84:29 | call to method Source<C> : C | call to method Source<C> : C |
 | Operator.cs:120:14:120:20 | access to property Field | Operator.cs:116:23:116:39 | call to method Source<Object> : Object | Operator.cs:120:14:120:20 | access to property Field | $@ | Operator.cs:116:23:116:39 | call to method Source<Object> : Object | call to method Source<Object> : Object |
 | Operator.cs:120:14:120:20 | access to property Field | Operator.cs:116:23:116:39 | call to method Source<Object> : Object | Operator.cs:120:14:120:20 | access to property Field | $@ | Operator.cs:116:23:116:39 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Operator.cs:152:18:152:24 | access to property Field | Operator.cs:145:21:145:37 | call to method Source<Object> : Object | Operator.cs:152:18:152:24 | access to property Field | $@ | Operator.cs:145:21:145:37 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Operator.cs:152:18:152:24 | access to property Field | Operator.cs:145:21:145:37 | call to method Source<Object> : Object | Operator.cs:152:18:152:24 | access to property Field | $@ | Operator.cs:145:21:145:37 | call to method Source<Object> : Object | call to method Source<Object> : Object |
diff --git a/csharp/ql/test/library-tests/encoding/SBCS.cs b/csharp/ql/test/library-tests/encoding/SBCS.cs
index 46d3af486961..9a2d677ba16b 100644
--- a/csharp/ql/test/library-tests/encoding/SBCS.cs
+++ b/csharp/ql/test/library-tests/encoding/SBCS.cs
@@ -1,4 +1,4 @@
-class SBCS
+class SBCS
 {
-    string sbcs = "’";
+    string sbcs = "�";
 }
diff --git a/csharp/ql/test/library-tests/extension/PrintAst.expected b/csharp/ql/test/library-tests/extension/PrintAst.expected
index 5016665c08b2..f05e3969261c 100644
--- a/csharp/ql/test/library-tests/extension/PrintAst.expected
+++ b/csharp/ql/test/library-tests/extension/PrintAst.expected
@@ -171,311 +171,341 @@ extensions.cs:
 #   16|       4: [BlockStmt] {...}
 #   16|         0: [ReturnStmt] return ...;
 #   16|           0: [ParameterAccess] access to parameter t
-#   19|   5: [ExtensionType] extension(Object)
-#   21|     4: [ExtensionMethod] StaticObjectM1
-#   21|       -1: [TypeMention] int
-#   21|       4: [BlockStmt] {...}
-#   21|         0: [ReturnStmt] return ...;
-#   21|           0: [IntLiteral] 0
-#   22|     5: [ExtensionMethod] StaticObjectM2
-#   22|       -1: [TypeMention] int
+#   17|     15: [ExtensionCallable,IncrementOperator] ++
+#   17|       -1: [TypeMention] Void
 #-----|       2: (Parameters)
-#   22|         0: [Parameter] s
-#   22|           -1: [TypeMention] string
-#   22|       4: [BlockStmt] {...}
-#   22|         0: [ReturnStmt] return ...;
-#   22|           0: [PropertyCall] access to property Length
-#   22|             -1: [ParameterAccess] access to parameter s
-#   23|     6: [Property] StaticProp
-#   23|       -1: [TypeMention] bool
-#   23|       3: [ExtensionCallable,Getter] get_StaticProp
-#   23|         4: [BoolLiteral] true
-#   26|   8: [ExtensionType] extension(T)`1
+#    6|         0: [Parameter] s
+#    6|           -1: [TypeMention] string
+#   17|       4: [BlockStmt] {...}
+#   18|     16: [DecrementOperator,ExtensionCallable] --
+#   18|       -1: [TypeMention] string
+#-----|       2: (Parameters)
+#   18|         0: [Parameter] o
+#   18|           -1: [TypeMention] string
+#   18|       4: [BlockStmt] {...}
+#   18|         0: [ReturnStmt] return ...;
+#   18|           0: [ParameterAccess] access to parameter o
+#   21|   5: [ExtensionType] extension(Object)
+#   23|     4: [ExtensionMethod] StaticObjectM1
+#   23|       -1: [TypeMention] int
+#   23|       4: [BlockStmt] {...}
+#   23|         0: [ReturnStmt] return ...;
+#   23|           0: [IntLiteral] 0
+#   24|     5: [ExtensionMethod] StaticObjectM2
+#   24|       -1: [TypeMention] int
+#-----|       2: (Parameters)
+#   24|         0: [Parameter] s
+#   24|           -1: [TypeMention] string
+#   24|       4: [BlockStmt] {...}
+#   24|         0: [ReturnStmt] return ...;
+#   24|           0: [PropertyCall] access to property Length
+#   24|             -1: [ParameterAccess] access to parameter s
+#   25|     6: [Property] StaticProp
+#   25|       -1: [TypeMention] bool
+#   25|       3: [ExtensionCallable,Getter] get_StaticProp
+#   25|         4: [BoolLiteral] true
+#   28|   8: [ExtensionType] extension(T)`1
 #-----|     1: (Type parameters)
-#   26|       0: [TypeParameter] T
+#   28|       0: [TypeParameter] T
 #-----|     2: (Parameters)
-#   26|       0: [Parameter] t
-#   26|         -1: [TypeMention] T
-#   28|     4: [Property] GenericProp1
-#   28|       -1: [TypeMention] bool
-#   28|       3: [ExtensionCallable,Getter] get_GenericProp1
+#   28|       0: [Parameter] t
+#   28|         -1: [TypeMention] T
+#   30|     4: [Property] GenericProp1
+#   30|       -1: [TypeMention] bool
+#   30|       3: [ExtensionCallable,Getter] get_GenericProp1
 #-----|         2: (Parameters)
-#   26|           0: [Parameter] t
-#   26|             -1: [TypeMention] T
-#   28|         4: [IsExpr] ... is ...
-#   28|           0: [SyntheticExtensionParameterAccess] access to extension synthetic parameter t
-#   28|           1: [NotPatternExpr] not ...
-#   28|             0: [ConstantPatternExpr,NullLiteral] null
-#   29|     5: [Property] GenericProp2
-#   29|       -1: [TypeMention] bool
-#   29|       3: [ExtensionCallable,Getter] get_GenericProp2
+#   28|           0: [Parameter] t
+#   28|             -1: [TypeMention] T
+#   30|         4: [IsExpr] ... is ...
+#   30|           0: [SyntheticExtensionParameterAccess] access to extension synthetic parameter t
+#   30|           1: [NotPatternExpr] not ...
+#   30|             0: [ConstantPatternExpr,NullLiteral] null
+#   31|     5: [Property] GenericProp2
+#   31|       -1: [TypeMention] bool
+#   31|       3: [ExtensionCallable,Getter] get_GenericProp2
 #-----|         2: (Parameters)
-#   26|           0: [Parameter] t
-#   26|             -1: [TypeMention] T
-#   29|         4: [BlockStmt] {...}
-#   29|           0: [ReturnStmt] return ...;
-#   29|             0: [BoolLiteral] true
-#   29|       4: [ExtensionCallable,Setter] set_GenericProp2
+#   28|           0: [Parameter] t
+#   28|             -1: [TypeMention] T
+#   31|         4: [BlockStmt] {...}
+#   31|           0: [ReturnStmt] return ...;
+#   31|             0: [BoolLiteral] true
+#   31|       4: [ExtensionCallable,Setter] set_GenericProp2
 #-----|         2: (Parameters)
-#   26|           0: [Parameter] t
-#   26|             -1: [TypeMention] T
-#   29|           1: [Parameter] value
-#   29|         4: [BlockStmt] {...}
-#   30|     6: [ExtensionMethod] GenericM1
-#   30|       -1: [TypeMention] bool
-#-----|       2: (Parameters)
-#   26|         0: [Parameter] t
-#   26|           -1: [TypeMention] T
-#   30|       4: [IsExpr] ... is ...
-#   30|         0: [SyntheticExtensionParameterAccess] access to extension synthetic parameter t
-#   30|         1: [NotPatternExpr] not ...
-#   30|           0: [ConstantPatternExpr,NullLiteral] null
-#   31|     7: [ExtensionMethod] GenericM2`1
-#   31|       -1: [TypeMention] Void
-#-----|       1: (Type parameters)
-#   31|         0: [TypeParameter] S
-#-----|       2: (Parameters)
-#   26|         0: [Parameter] t
-#   26|           -1: [TypeMention] T
-#   31|         1: [Parameter] other
-#   31|           -1: [TypeMention] S
-#   31|       4: [BlockStmt] {...}
-#   32|     8: [ExtensionMethod] GenericStaticM1
-#   32|       -1: [TypeMention] Void
+#   28|           0: [Parameter] t
+#   28|             -1: [TypeMention] T
+#   31|           1: [Parameter] value
+#   31|         4: [BlockStmt] {...}
+#   32|     6: [ExtensionMethod] GenericM1
+#   32|       -1: [TypeMention] bool
 #-----|       2: (Parameters)
-#   26|         0: [Parameter] t
-#   26|           -1: [TypeMention] T
-#   32|       4: [BlockStmt] {...}
-#   33|     9: [ExtensionMethod] GenericStaticM2`1
+#   28|         0: [Parameter] t
+#   28|           -1: [TypeMention] T
+#   32|       4: [IsExpr] ... is ...
+#   32|         0: [SyntheticExtensionParameterAccess] access to extension synthetic parameter t
+#   32|         1: [NotPatternExpr] not ...
+#   32|           0: [ConstantPatternExpr,NullLiteral] null
+#   33|     7: [ExtensionMethod] GenericM2`1
 #   33|       -1: [TypeMention] Void
 #-----|       1: (Type parameters)
 #   33|         0: [TypeParameter] S
 #-----|       2: (Parameters)
-#   33|         0: [Parameter] other
+#   28|         0: [Parameter] t
+#   28|           -1: [TypeMention] T
+#   33|         1: [Parameter] other
 #   33|           -1: [TypeMention] S
 #   33|       4: [BlockStmt] {...}
-#   34|     10: [AddOperator,ExtensionCallable] +
-#   34|       -1: [TypeMention] T
+#   34|     8: [ExtensionMethod] GenericStaticM1
+#   34|       -1: [TypeMention] Void
 #-----|       2: (Parameters)
-#   34|         0: [Parameter] a
-#   34|           -1: [TypeMention] T
-#   34|         1: [Parameter] b
-#   34|           -1: [TypeMention] T
+#   28|         0: [Parameter] t
+#   28|           -1: [TypeMention] T
 #   34|       4: [BlockStmt] {...}
-#   34|         0: [ReturnStmt] return ...;
-#   34|           0: [NullLiteral] null
-#   38| [Class] ClassicExtensions
-#   40|   4: [ExtensionMethod] M3
-#   40|     -1: [TypeMention] bool
+#   35|     9: [ExtensionMethod] GenericStaticM2`1
+#   35|       -1: [TypeMention] Void
+#-----|       1: (Type parameters)
+#   35|         0: [TypeParameter] S
+#-----|       2: (Parameters)
+#   35|         0: [Parameter] other
+#   35|           -1: [TypeMention] S
+#   35|       4: [BlockStmt] {...}
+#   36|     10: [AddOperator,ExtensionCallable] +
+#   36|       -1: [TypeMention] T
+#-----|       2: (Parameters)
+#   36|         0: [Parameter] a
+#   36|           -1: [TypeMention] T
+#   36|         1: [Parameter] b
+#   36|           -1: [TypeMention] T
+#   36|       4: [BlockStmt] {...}
+#   36|         0: [ReturnStmt] return ...;
+#   36|           0: [NullLiteral] null
+#   40| [Class] ClassicExtensions
+#   42|   4: [ExtensionMethod] M3
+#   42|     -1: [TypeMention] bool
 #-----|     2: (Parameters)
-#   40|       0: [Parameter] s
-#   40|         -1: [TypeMention] string
-#   40|     4: [IsExpr] ... is ...
-#   40|       0: [ParameterAccess] access to parameter s
-#   40|       1: [NotPatternExpr] not ...
-#   40|         0: [ConstantPatternExpr,NullLiteral] null
-#   43| [Class] C
-#   45|   6: [Method] CallingExtensions
-#   45|     -1: [TypeMention] Void
-#   46|     4: [BlockStmt] {...}
-#   47|       0: [LocalVariableDeclStmt] ... ...;
-#   47|         0: [LocalVariableDeclAndInitExpr] String s = ...
-#   47|           -1: [TypeMention] string
-#   47|           0: [LocalVariableAccess] access to local variable s
-#   47|           1: [StringLiteralUtf16] "Hello World."
-#   50|       1: [LocalVariableDeclStmt] ... ...;
-#   50|         0: [LocalVariableDeclAndInitExpr] Boolean x11 = ...
-#   50|           -1: [TypeMention] bool
-#   50|           0: [LocalVariableAccess] access to local variable x11
-#   50|           1: [ExtensionPropertyCall] access to property Prop1
-#   50|             -1: [LocalVariableAccess] access to local variable s
-#   51|       2: [LocalVariableDeclStmt] ... ...;
-#   51|         0: [LocalVariableDeclAndInitExpr] Boolean x12 = ...
-#   51|           -1: [TypeMention] bool
-#   51|           0: [LocalVariableAccess] access to local variable x12
-#   51|           1: [ExtensionPropertyCall] access to property Prop2
-#   51|             -1: [LocalVariableAccess] access to local variable s
-#   52|       3: [ExprStmt] ...;
-#   52|         0: [AssignExpr] ... = ...
-#   52|           0: [ExtensionPropertyCall] access to property Prop2
+#   42|       0: [Parameter] s
+#   42|         -1: [TypeMention] string
+#   42|     4: [IsExpr] ... is ...
+#   42|       0: [ParameterAccess] access to parameter s
+#   42|       1: [NotPatternExpr] not ...
+#   42|         0: [ConstantPatternExpr,NullLiteral] null
+#   45| [Class] C
+#   47|   6: [Method] CallingExtensions
+#   47|     -1: [TypeMention] Void
+#   48|     4: [BlockStmt] {...}
+#   49|       0: [LocalVariableDeclStmt] ... ...;
+#   49|         0: [LocalVariableDeclAndInitExpr] String s = ...
+#   49|           -1: [TypeMention] string
+#   49|           0: [LocalVariableAccess] access to local variable s
+#   49|           1: [StringLiteralUtf16] "Hello World."
+#   52|       1: [LocalVariableDeclStmt] ... ...;
+#   52|         0: [LocalVariableDeclAndInitExpr] Boolean x11 = ...
+#   52|           -1: [TypeMention] bool
+#   52|           0: [LocalVariableAccess] access to local variable x11
+#   52|           1: [ExtensionPropertyCall] access to property Prop1
 #   52|             -1: [LocalVariableAccess] access to local variable s
-#   52|           1: [BoolLiteral] true
-#   53|       4: [LocalVariableDeclStmt] ... ...;
-#   53|         0: [LocalVariableDeclAndInitExpr] Boolean x13 = ...
+#   53|       2: [LocalVariableDeclStmt] ... ...;
+#   53|         0: [LocalVariableDeclAndInitExpr] Boolean x12 = ...
 #   53|           -1: [TypeMention] bool
-#   53|           0: [LocalVariableAccess] access to local variable x13
-#   53|           1: [ExtensionPropertyCall] access to property StaticProp1
-#   53|             -1: [TypeAccess] access to type String
-#   53|               0: [TypeMention] string
-#   54|       5: [LocalVariableDeclStmt] ... ...;
-#   54|         0: [LocalVariableDeclAndInitExpr] Boolean x14 = ...
-#   54|           -1: [TypeMention] bool
-#   54|           0: [LocalVariableAccess] access to local variable x14
-#   54|           1: [ExtensionPropertyCall] access to property StaticProp
-#   54|             -1: [TypeAccess] access to type Object
-#   54|               0: [TypeMention] object
-#   57|       6: [LocalVariableDeclStmt] ... ...;
-#   57|         0: [LocalVariableDeclAndInitExpr] Boolean x21 = ...
-#   57|           -1: [TypeMention] bool
-#   57|           0: [LocalVariableAccess] access to local variable x21
-#   57|           1: [MethodCall] call to method M1
-#   57|             -1: [LocalVariableAccess] access to local variable s
-#   58|       7: [LocalVariableDeclStmt] ... ...;
-#   58|         0: [LocalVariableDeclAndInitExpr] String x22 = ...
-#   58|           -1: [TypeMention] string
-#   58|           0: [LocalVariableAccess] access to local variable x22
-#   58|           1: [MethodCall] call to method M2
-#   58|             -1: [LocalVariableAccess] access to local variable s
-#   58|             0: [StringLiteralUtf16] "!!!"
-#   59|       8: [LocalVariableDeclStmt] ... ...;
-#   59|         0: [LocalVariableDeclAndInitExpr] Int32 x23 = ...
-#   59|           -1: [TypeMention] int
-#   59|           0: [LocalVariableAccess] access to local variable x23
-#   59|           1: [MethodCall] call to method StaticM1
-#   59|             -1: [TypeAccess] access to type String
-#   59|               0: [TypeMention] string
-#   60|       9: [LocalVariableDeclStmt] ... ...;
-#   60|         0: [LocalVariableDeclAndInitExpr] Int32 x24 = ...
-#   60|           -1: [TypeMention] int
-#   60|           0: [LocalVariableAccess] access to local variable x24
-#   60|           1: [MethodCall] call to method StaticM2
-#   60|             -1: [TypeAccess] access to type String
-#   60|               0: [TypeMention] string
-#   60|             0: [LocalVariableAccess] access to local variable s
-#   61|       10: [LocalVariableDeclStmt] ... ...;
-#   61|         0: [LocalVariableDeclAndInitExpr] Int32 x25 = ...
+#   53|           0: [LocalVariableAccess] access to local variable x12
+#   53|           1: [ExtensionPropertyCall] access to property Prop2
+#   53|             -1: [LocalVariableAccess] access to local variable s
+#   54|       3: [ExprStmt] ...;
+#   54|         0: [AssignExpr] ... = ...
+#   54|           0: [ExtensionPropertyCall] access to property Prop2
+#   54|             -1: [LocalVariableAccess] access to local variable s
+#   54|           1: [BoolLiteral] true
+#   55|       4: [LocalVariableDeclStmt] ... ...;
+#   55|         0: [LocalVariableDeclAndInitExpr] Boolean x13 = ...
+#   55|           -1: [TypeMention] bool
+#   55|           0: [LocalVariableAccess] access to local variable x13
+#   55|           1: [ExtensionPropertyCall] access to property StaticProp1
+#   55|             -1: [TypeAccess] access to type String
+#   55|               0: [TypeMention] string
+#   56|       5: [LocalVariableDeclStmt] ... ...;
+#   56|         0: [LocalVariableDeclAndInitExpr] Boolean x14 = ...
+#   56|           -1: [TypeMention] bool
+#   56|           0: [LocalVariableAccess] access to local variable x14
+#   56|           1: [ExtensionPropertyCall] access to property StaticProp
+#   56|             -1: [TypeAccess] access to type Object
+#   56|               0: [TypeMention] object
+#   59|       6: [LocalVariableDeclStmt] ... ...;
+#   59|         0: [LocalVariableDeclAndInitExpr] Boolean x21 = ...
+#   59|           -1: [TypeMention] bool
+#   59|           0: [LocalVariableAccess] access to local variable x21
+#   59|           1: [MethodCall] call to method M1
+#   59|             -1: [LocalVariableAccess] access to local variable s
+#   60|       7: [LocalVariableDeclStmt] ... ...;
+#   60|         0: [LocalVariableDeclAndInitExpr] String x22 = ...
+#   60|           -1: [TypeMention] string
+#   60|           0: [LocalVariableAccess] access to local variable x22
+#   60|           1: [MethodCall] call to method M2
+#   60|             -1: [LocalVariableAccess] access to local variable s
+#   60|             0: [StringLiteralUtf16] "!!!"
+#   61|       8: [LocalVariableDeclStmt] ... ...;
+#   61|         0: [LocalVariableDeclAndInitExpr] Int32 x23 = ...
 #   61|           -1: [TypeMention] int
-#   61|           0: [LocalVariableAccess] access to local variable x25
-#   61|           1: [MethodCall] call to method StaticObjectM1
-#   61|             -1: [TypeAccess] access to type Object
-#   61|               0: [TypeMention] object
-#   62|       11: [LocalVariableDeclStmt] ... ...;
-#   62|         0: [LocalVariableDeclAndInitExpr] Int32 x26 = ...
+#   61|           0: [LocalVariableAccess] access to local variable x23
+#   61|           1: [MethodCall] call to method StaticM1
+#   61|             -1: [TypeAccess] access to type String
+#   61|               0: [TypeMention] string
+#   62|       9: [LocalVariableDeclStmt] ... ...;
+#   62|         0: [LocalVariableDeclAndInitExpr] Int32 x24 = ...
 #   62|           -1: [TypeMention] int
-#   62|           0: [LocalVariableAccess] access to local variable x26
-#   62|           1: [MethodCall] call to method StaticObjectM2
-#   62|             -1: [TypeAccess] access to type Object
-#   62|               0: [TypeMention] object
+#   62|           0: [LocalVariableAccess] access to local variable x24
+#   62|           1: [MethodCall] call to method StaticM2
+#   62|             -1: [TypeAccess] access to type String
+#   62|               0: [TypeMention] string
 #   62|             0: [LocalVariableAccess] access to local variable s
-#   65|       12: [LocalVariableDeclStmt] ... ...;
-#   65|         0: [LocalVariableDeclAndInitExpr] String x30 = ...
-#   65|           -1: [TypeMention] string
-#   65|           0: [LocalVariableAccess] access to local variable x30
-#   65|           1: [ExtensionOperatorCall] call to operator *
-#   65|             0: [IntLiteral] 3
-#   65|             1: [LocalVariableAccess] access to local variable s
-#   68|       13: [LocalVariableDeclStmt] ... ...;
-#   68|         0: [LocalVariableDeclAndInitExpr] Boolean y = ...
-#   68|           -1: [TypeMention] bool
-#   68|           0: [LocalVariableAccess] access to local variable y
-#   68|           1: [MethodCall] call to method M3
-#   68|             -1: [LocalVariableAccess] access to local variable s
-#   71|       14: [ExprStmt] ...;
-#   71|         0: [MethodCall] call to method M1
-#   71|           -1: [TypeAccess] access to type MyExtensions
-#   71|             0: [TypeMention] MyExtensions
-#   71|           0: [LocalVariableAccess] access to local variable s
-#   72|       15: [ExprStmt] ...;
-#   72|         0: [MethodCall] call to method M2
-#   72|           -1: [TypeAccess] access to type MyExtensions
-#   72|             0: [TypeMention] MyExtensions
-#   72|           0: [LocalVariableAccess] access to local variable s
-#   72|           1: [StringLiteralUtf16] "!!!"
-#   73|       16: [ExprStmt] ...;
-#   73|         0: [MethodCall] call to method StaticM1
-#   73|           -1: [TypeAccess] access to type MyExtensions
-#   73|             0: [TypeMention] MyExtensions
-#   74|       17: [ExprStmt] ...;
-#   74|         0: [MethodCall] call to method StaticM2
-#   74|           -1: [TypeAccess] access to type MyExtensions
-#   74|             0: [TypeMention] MyExtensions
-#   74|           0: [LocalVariableAccess] access to local variable s
-#   75|       18: [ExprStmt] ...;
-#   75|         0: [MethodCall] call to method StaticObjectM1
+#   63|       10: [LocalVariableDeclStmt] ... ...;
+#   63|         0: [LocalVariableDeclAndInitExpr] Int32 x25 = ...
+#   63|           -1: [TypeMention] int
+#   63|           0: [LocalVariableAccess] access to local variable x25
+#   63|           1: [MethodCall] call to method StaticObjectM1
+#   63|             -1: [TypeAccess] access to type Object
+#   63|               0: [TypeMention] object
+#   64|       11: [LocalVariableDeclStmt] ... ...;
+#   64|         0: [LocalVariableDeclAndInitExpr] Int32 x26 = ...
+#   64|           -1: [TypeMention] int
+#   64|           0: [LocalVariableAccess] access to local variable x26
+#   64|           1: [MethodCall] call to method StaticObjectM2
+#   64|             -1: [TypeAccess] access to type Object
+#   64|               0: [TypeMention] object
+#   64|             0: [LocalVariableAccess] access to local variable s
+#   67|       12: [LocalVariableDeclStmt] ... ...;
+#   67|         0: [LocalVariableDeclAndInitExpr] String x30 = ...
+#   67|           -1: [TypeMention] string
+#   67|           0: [LocalVariableAccess] access to local variable x30
+#   67|           1: [ExtensionOperatorCall] call to operator *
+#   67|             0: [IntLiteral] 3
+#   67|             1: [LocalVariableAccess] access to local variable s
+#   68|       13: [ExprStmt] ...;
+#   68|         0: [ExtensionOperatorCall] call to operator ++
+#   68|           0: [LocalVariableAccess] access to local variable s
+#   69|       14: [ExprStmt] ...;
+#   69|         0: [ExtensionOperatorCall] call to operator --
+#   69|           0: [LocalVariableAccess] access to local variable s
+#   72|       15: [LocalVariableDeclStmt] ... ...;
+#   72|         0: [LocalVariableDeclAndInitExpr] Boolean y = ...
+#   72|           -1: [TypeMention] bool
+#   72|           0: [LocalVariableAccess] access to local variable y
+#   72|           1: [MethodCall] call to method M3
+#   72|             -1: [LocalVariableAccess] access to local variable s
+#   75|       16: [ExprStmt] ...;
+#   75|         0: [MethodCall] call to method M1
 #   75|           -1: [TypeAccess] access to type MyExtensions
 #   75|             0: [TypeMention] MyExtensions
-#   76|       19: [ExprStmt] ...;
-#   76|         0: [MethodCall] call to method StaticObjectM2
+#   75|           0: [LocalVariableAccess] access to local variable s
+#   76|       17: [ExprStmt] ...;
+#   76|         0: [MethodCall] call to method M2
 #   76|           -1: [TypeAccess] access to type MyExtensions
 #   76|             0: [TypeMention] MyExtensions
 #   76|           0: [LocalVariableAccess] access to local variable s
+#   76|           1: [StringLiteralUtf16] "!!!"
+#   77|       18: [ExprStmt] ...;
+#   77|         0: [MethodCall] call to method StaticM1
+#   77|           -1: [TypeAccess] access to type MyExtensions
+#   77|             0: [TypeMention] MyExtensions
+#   78|       19: [ExprStmt] ...;
+#   78|         0: [MethodCall] call to method StaticM2
+#   78|           -1: [TypeAccess] access to type MyExtensions
+#   78|             0: [TypeMention] MyExtensions
+#   78|           0: [LocalVariableAccess] access to local variable s
 #   79|       20: [ExprStmt] ...;
-#   79|         0: [ExtensionOperatorCall] call to operator *
+#   79|         0: [MethodCall] call to method StaticObjectM1
 #   79|           -1: [TypeAccess] access to type MyExtensions
 #   79|             0: [TypeMention] MyExtensions
-#   79|           0: [IntLiteral] 3
-#   79|           1: [LocalVariableAccess] access to local variable s
-#   82|       21: [ExprStmt] ...;
-#   82|         0: [MethodCall] call to extension accessor get_Prop1
-#   82|           -1: [TypeAccess] access to type MyExtensions
-#   82|             0: [TypeMention] MyExtensions
-#   82|           0: [LocalVariableAccess] access to local variable s
+#   80|       21: [ExprStmt] ...;
+#   80|         0: [MethodCall] call to method StaticObjectM2
+#   80|           -1: [TypeAccess] access to type MyExtensions
+#   80|             0: [TypeMention] MyExtensions
+#   80|           0: [LocalVariableAccess] access to local variable s
 #   83|       22: [ExprStmt] ...;
-#   83|         0: [MethodCall] call to extension accessor get_Prop2
+#   83|         0: [ExtensionOperatorCall] call to operator *
 #   83|           -1: [TypeAccess] access to type MyExtensions
 #   83|             0: [TypeMention] MyExtensions
-#   83|           0: [LocalVariableAccess] access to local variable s
+#   83|           0: [IntLiteral] 3
+#   83|           1: [LocalVariableAccess] access to local variable s
 #   84|       23: [ExprStmt] ...;
-#   84|         0: [MethodCall] call to extension accessor set_Prop2
+#   84|         0: [ExtensionOperatorCall] call to operator ++
 #   84|           -1: [TypeAccess] access to type MyExtensions
 #   84|             0: [TypeMention] MyExtensions
 #   84|           0: [LocalVariableAccess] access to local variable s
-#   84|           1: [BoolLiteral] false
 #   85|       24: [ExprStmt] ...;
-#   85|         0: [MethodCall] call to extension accessor get_StaticProp
+#   85|         0: [ExtensionOperatorCall] call to operator --
 #   85|           -1: [TypeAccess] access to type MyExtensions
 #   85|             0: [TypeMention] MyExtensions
-#   88|   7: [Method] CallingGenericExtensions
-#   88|     -1: [TypeMention] Void
-#   89|     4: [BlockStmt] {...}
-#   90|       0: [LocalVariableDeclStmt] ... ...;
-#   90|         0: [LocalVariableDeclAndInitExpr] String s = ...
-#   90|           -1: [TypeMention] string
+#   85|           0: [LocalVariableAccess] access to local variable s
+#   88|       25: [ExprStmt] ...;
+#   88|         0: [MethodCall] call to extension accessor get_Prop1
+#   88|           -1: [TypeAccess] access to type MyExtensions
+#   88|             0: [TypeMention] MyExtensions
+#   88|           0: [LocalVariableAccess] access to local variable s
+#   89|       26: [ExprStmt] ...;
+#   89|         0: [MethodCall] call to extension accessor get_Prop2
+#   89|           -1: [TypeAccess] access to type MyExtensions
+#   89|             0: [TypeMention] MyExtensions
+#   89|           0: [LocalVariableAccess] access to local variable s
+#   90|       27: [ExprStmt] ...;
+#   90|         0: [MethodCall] call to extension accessor set_Prop2
+#   90|           -1: [TypeAccess] access to type MyExtensions
+#   90|             0: [TypeMention] MyExtensions
 #   90|           0: [LocalVariableAccess] access to local variable s
-#   90|           1: [StringLiteralUtf16] "Hello Generic World."
-#   91|       1: [LocalVariableDeclStmt] ... ...;
-#   91|         0: [LocalVariableDeclAndInitExpr] Object o = ...
-#   91|           -1: [TypeMention] object
-#   91|           0: [LocalVariableAccess] access to local variable o
-#   91|           1: [ObjectCreation] object creation of type Object
-#   91|             0: [TypeMention] object
-#   94|       2: [ExprStmt] ...;
-#   94|         0: [MethodCall] call to method GenericM1
-#   94|           -1: [LocalVariableAccess] access to local variable o
-#   95|       3: [ExprStmt] ...;
-#   95|         0: [MethodCall] call to method GenericM1
-#   95|           -1: [LocalVariableAccess] access to local variable s
-#   98|       4: [ExprStmt] ...;
-#   98|         0: [MethodCall] call to method GenericM1
-#   98|           -1: [TypeAccess] access to type MyExtensions
-#   98|             0: [TypeMention] MyExtensions
-#   98|           0: [LocalVariableAccess] access to local variable o
-#   99|       5: [ExprStmt] ...;
-#   99|         0: [MethodCall] call to method GenericM1
-#   99|           -1: [TypeAccess] access to type MyExtensions
-#   99|             0: [TypeMention] MyExtensions
-#   99|           0: [LocalVariableAccess] access to local variable s
-#  101|       6: [ExprStmt] ...;
-#  101|         0: [MethodCall] call to method GenericM2<Int32>
-#  101|           -1: [LocalVariableAccess] access to local variable o
-#  101|           0: [IntLiteral] 42
-#  102|       7: [ExprStmt] ...;
-#  102|         0: [MethodCall] call to method GenericM2<Int32>
-#  102|           -1: [TypeAccess] access to type MyExtensions
-#  102|             0: [TypeMention] MyExtensions
-#  102|           0: [LocalVariableAccess] access to local variable o
-#  102|           1: [IntLiteral] 42
-#  104|       8: [ExprStmt] ...;
-#  104|         0: [MethodCall] call to method StringGenericM1<Int32>
-#  104|           -1: [LocalVariableAccess] access to local variable s
-#  104|           0: [IntLiteral] 7
-#  104|           1: [ObjectCreation] object creation of type Object
-#  104|             0: [TypeMention] object
-#  105|       9: [ExprStmt] ...;
-#  105|         0: [MethodCall] call to method StringGenericM1<String>
+#   90|           1: [BoolLiteral] false
+#   91|       28: [ExprStmt] ...;
+#   91|         0: [MethodCall] call to extension accessor get_StaticProp
+#   91|           -1: [TypeAccess] access to type MyExtensions
+#   91|             0: [TypeMention] MyExtensions
+#   94|   7: [Method] CallingGenericExtensions
+#   94|     -1: [TypeMention] Void
+#   95|     4: [BlockStmt] {...}
+#   96|       0: [LocalVariableDeclStmt] ... ...;
+#   96|         0: [LocalVariableDeclAndInitExpr] String s = ...
+#   96|           -1: [TypeMention] string
+#   96|           0: [LocalVariableAccess] access to local variable s
+#   96|           1: [StringLiteralUtf16] "Hello Generic World."
+#   97|       1: [LocalVariableDeclStmt] ... ...;
+#   97|         0: [LocalVariableDeclAndInitExpr] Object o = ...
+#   97|           -1: [TypeMention] object
+#   97|           0: [LocalVariableAccess] access to local variable o
+#   97|           1: [ObjectCreation] object creation of type Object
+#   97|             0: [TypeMention] object
+#  100|       2: [ExprStmt] ...;
+#  100|         0: [MethodCall] call to method GenericM1
+#  100|           -1: [LocalVariableAccess] access to local variable o
+#  101|       3: [ExprStmt] ...;
+#  101|         0: [MethodCall] call to method GenericM1
+#  101|           -1: [LocalVariableAccess] access to local variable s
+#  104|       4: [ExprStmt] ...;
+#  104|         0: [MethodCall] call to method GenericM1
+#  104|           -1: [TypeAccess] access to type MyExtensions
+#  104|             0: [TypeMention] MyExtensions
+#  104|           0: [LocalVariableAccess] access to local variable o
+#  105|       5: [ExprStmt] ...;
+#  105|         0: [MethodCall] call to method GenericM1
 #  105|           -1: [TypeAccess] access to type MyExtensions
 #  105|             0: [TypeMention] MyExtensions
 #  105|           0: [LocalVariableAccess] access to local variable s
-#  105|           1: [StringLiteralUtf16] "test"
-#  105|           2: [ObjectCreation] object creation of type Object
-#  105|             0: [TypeMention] object
+#  107|       6: [ExprStmt] ...;
+#  107|         0: [MethodCall] call to method GenericM2<Int32>
+#  107|           -1: [LocalVariableAccess] access to local variable o
+#  107|           0: [IntLiteral] 42
+#  108|       7: [ExprStmt] ...;
+#  108|         0: [MethodCall] call to method GenericM2<Int32>
+#  108|           -1: [TypeAccess] access to type MyExtensions
+#  108|             0: [TypeMention] MyExtensions
+#  108|           0: [LocalVariableAccess] access to local variable o
+#  108|           1: [IntLiteral] 42
+#  110|       8: [ExprStmt] ...;
+#  110|         0: [MethodCall] call to method StringGenericM1<Int32>
+#  110|           -1: [LocalVariableAccess] access to local variable s
+#  110|           0: [IntLiteral] 7
+#  110|           1: [ObjectCreation] object creation of type Object
+#  110|             0: [TypeMention] object
+#  111|       9: [ExprStmt] ...;
+#  111|         0: [MethodCall] call to method StringGenericM1<String>
+#  111|           -1: [TypeAccess] access to type MyExtensions
+#  111|             0: [TypeMention] MyExtensions
+#  111|           0: [LocalVariableAccess] access to local variable s
+#  111|           1: [StringLiteralUtf16] "test"
+#  111|           2: [ObjectCreation] object creation of type Object
+#  111|             0: [TypeMention] object
diff --git a/csharp/ql/test/library-tests/extension/extensionTypes.expected b/csharp/ql/test/library-tests/extension/extensionTypes.expected
index b27ff095a4be..30be52e8e898 100644
--- a/csharp/ql/test/library-tests/extension/extensionTypes.expected
+++ b/csharp/ql/test/library-tests/extension/extensionTypes.expected
@@ -5,10 +5,10 @@ extensionTypeReceiverParameter
 | extensionTypes.cs:18:5:21:5 | extension(Int32) | extensionTypes.cs:18:23:18:24 | i3 |
 | extensionTypes.cs:22:5:25:5 | extension(String) | extensionTypes.cs:22:23:22:23 | s |
 | extensionTypes.cs:26:5:29:5 | extension(T1)`1 | extensionTypes.cs:26:42:26:43 | t1 |
-| extensions.cs:6:5:17:5 | extension(String) | extensions.cs:6:22:6:22 | s |
-| extensions.cs:26:5:35:5 | extension(Object)<Object> | extensions.cs:26:20:26:20 | t |
-| extensions.cs:26:5:35:5 | extension(String)<String> | extensions.cs:26:20:26:20 | t |
-| extensions.cs:26:5:35:5 | extension(T)`1 | extensions.cs:26:20:26:20 | t |
+| extensions.cs:6:5:19:5 | extension(String) | extensions.cs:6:22:6:22 | s |
+| extensions.cs:28:5:37:5 | extension(Object)<Object> | extensions.cs:28:20:28:20 | t |
+| extensions.cs:28:5:37:5 | extension(String)<String> | extensions.cs:28:20:28:20 | t |
+| extensions.cs:28:5:37:5 | extension(T)`1 | extensions.cs:28:20:28:20 | t |
 extensionTypeExtendedType
 | extensionTypes.cs:6:5:9:5 | extension(String) | string |
 | extensionTypes.cs:10:5:13:5 | extension(Int32) | int |
@@ -16,11 +16,11 @@ extensionTypeExtendedType
 | extensionTypes.cs:18:5:21:5 | extension(Int32) | int |
 | extensionTypes.cs:22:5:25:5 | extension(String) | string |
 | extensionTypes.cs:26:5:29:5 | extension(T1)`1 | T1 |
-| extensions.cs:6:5:17:5 | extension(String) | string |
-| extensions.cs:19:5:24:5 | extension(Object) | object |
-| extensions.cs:26:5:35:5 | extension(Object)<Object> | object |
-| extensions.cs:26:5:35:5 | extension(String)<String> | string |
-| extensions.cs:26:5:35:5 | extension(T)`1 | T |
+| extensions.cs:6:5:19:5 | extension(String) | string |
+| extensions.cs:21:5:26:5 | extension(Object) | object |
+| extensions.cs:28:5:37:5 | extension(Object)<Object> | object |
+| extensions.cs:28:5:37:5 | extension(String)<String> | string |
+| extensions.cs:28:5:37:5 | extension(T)`1 | T |
 extensionTypeReceiverParameterAttribute
 | extensionTypes.cs:6:5:9:5 | extension(String) | extensionTypes.cs:6:32:6:32 | s | extensionTypes.cs:6:16:6:22 | [NotNull(...)] |
 | extensionTypes.cs:26:5:29:5 | extension(T1)`1 | extensionTypes.cs:26:42:26:43 | t1 | extensionTypes.cs:26:20:26:30 | [NotNullWhen(...)] |
@@ -30,7 +30,7 @@ extensionTypeReceiverParameterModifier
 | extensionTypes.cs:18:5:21:5 | extension(Int32) | extensionTypes.cs:18:23:18:24 | i3 | ref |
 extensionTypeParameterConstraints
 | extensionTypes.cs:26:5:29:5 | extension(T1)`1 | extensionTypes.cs:26:15:26:16 | T1 | file://:0:0:0:0 | where T1: ... |
-| extensions.cs:26:5:35:5 | extension(T)`1 | extensions.cs:26:15:26:15 | T | file://:0:0:0:0 | where T: ... |
+| extensions.cs:28:5:37:5 | extension(T)`1 | extensions.cs:28:15:28:15 | T | file://:0:0:0:0 | where T: ... |
 syntheticParameterModifier
 | extensionTypes.cs:10:5:13:5 | extension(Int32) | extensionTypes.cs:12:21:12:23 | M21 | extensionTypes.cs:10:32:10:33 | i1 | ref readonly |
 | extensionTypes.cs:14:5:17:5 | extension(Int32) | extensionTypes.cs:16:21:16:23 | M31 | extensionTypes.cs:14:22:14:23 | i2 | in |
diff --git a/csharp/ql/test/library-tests/extension/extensions.cs b/csharp/ql/test/library-tests/extension/extensions.cs
index 1117a98f8a07..892304ee84d7 100644
--- a/csharp/ql/test/library-tests/extension/extensions.cs
+++ b/csharp/ql/test/library-tests/extension/extensions.cs
@@ -14,6 +14,8 @@ public static class MyExtensions
         public static int StaticM2(string x) { return x.Length; }
         public static string operator *(int a, string b) { return ""; }
         public T StringGenericM1<T>(T t, object o) { return t; }
+        public void operator ++() { }
+        public static string operator --(string o) { return o; }
     }
 
     extension(object)
@@ -61,8 +63,10 @@ public static void CallingExtensions()
         var x25 = object.StaticObjectM1();
         var x26 = object.StaticObjectM2(s);
 
-        // Calling the extension operator.
+        // Calling the extension operators.
         var x30 = 3 * s;
+        s++;
+        s--;
 
         // Calling the classic extension method.
         var y = s.M3();
@@ -77,6 +81,8 @@ public static void CallingExtensions()
 
         // Calling the compiler generated operator method.
         MyExtensions.op_Multiply(3, s);
+        MyExtensions.op_IncrementAssignment(s);
+        MyExtensions.op_Decrement(s);
 
         // Calling the compiler generated methods used by the extension property accessors.
         MyExtensions.get_Prop1(s);
diff --git a/csharp/ql/test/library-tests/extension/extensions.expected b/csharp/ql/test/library-tests/extension/extensions.expected
index 45b557a96352..e29e455d25dc 100644
--- a/csharp/ql/test/library-tests/extension/extensions.expected
+++ b/csharp/ql/test/library-tests/extension/extensions.expected
@@ -1,51 +1,51 @@
 extensionMethodCallArgument
-| extensions.cs:57:19:57:24 | call to method M1 | extensions.cs:11:21:11:22 | M1 | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:57:19:57:19 | access to local variable s |
-| extensions.cs:58:19:58:29 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:58:19:58:19 | access to local variable s |
-| extensions.cs:58:19:58:29 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:12:33:12:37 | other | 1 | extensions.cs:58:24:58:28 | "!!!" |
-| extensions.cs:60:19:60:36 | call to method StaticM2 | extensions.cs:14:27:14:34 | StaticM2 | extensions.cs:14:43:14:43 | x | 0 | extensions.cs:60:35:60:35 | access to local variable s |
-| extensions.cs:62:19:62:42 | call to method StaticObjectM2 | extensions.cs:22:27:22:40 | StaticObjectM2 | extensions.cs:22:49:22:49 | s | 0 | extensions.cs:62:41:62:41 | access to local variable s |
-| extensions.cs:68:17:68:22 | call to method M3 | extensions.cs:40:24:40:25 | M3 | extensions.cs:40:39:40:39 | s | 0 | extensions.cs:68:17:68:17 | access to local variable s |
-| extensions.cs:71:9:71:26 | call to method M1 | extensions.cs:11:21:11:22 | M1 | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:71:25:71:25 | access to local variable s |
-| extensions.cs:72:9:72:33 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:72:25:72:25 | access to local variable s |
-| extensions.cs:72:9:72:33 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:12:33:12:37 | other | 1 | extensions.cs:72:28:72:32 | "!!!" |
-| extensions.cs:74:9:74:32 | call to method StaticM2 | extensions.cs:14:27:14:34 | StaticM2 | extensions.cs:14:43:14:43 | x | 0 | extensions.cs:74:31:74:31 | access to local variable s |
-| extensions.cs:76:9:76:38 | call to method StaticObjectM2 | extensions.cs:22:27:22:40 | StaticObjectM2 | extensions.cs:22:49:22:49 | s | 0 | extensions.cs:76:37:76:37 | access to local variable s |
-| extensions.cs:94:9:94:21 | call to method GenericM1 | extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:20:26:20 | t | 0 | extensions.cs:94:9:94:9 | access to local variable o |
-| extensions.cs:95:9:95:21 | call to method GenericM1 | extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:20:26:20 | t | 0 | extensions.cs:95:9:95:9 | access to local variable s |
-| extensions.cs:98:9:98:33 | call to method GenericM1 | extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:20:26:20 | t | 0 | extensions.cs:98:32:98:32 | access to local variable o |
-| extensions.cs:99:9:99:33 | call to method GenericM1 | extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:20:26:20 | t | 0 | extensions.cs:99:32:99:32 | access to local variable s |
-| extensions.cs:101:9:101:23 | call to method GenericM2<Int32> | extensions.cs:31:21:31:32 | GenericM2<Int32> | extensions.cs:26:20:26:20 | t | 0 | extensions.cs:101:9:101:9 | access to local variable o |
-| extensions.cs:101:9:101:23 | call to method GenericM2<Int32> | extensions.cs:31:21:31:32 | GenericM2<Int32> | extensions.cs:31:36:31:40 | other | 1 | extensions.cs:101:21:101:22 | 42 |
-| extensions.cs:102:9:102:37 | call to method GenericM2<Int32> | extensions.cs:31:21:31:32 | GenericM2<Int32> | extensions.cs:26:20:26:20 | t | 0 | extensions.cs:102:32:102:32 | access to local variable o |
-| extensions.cs:102:9:102:37 | call to method GenericM2<Int32> | extensions.cs:31:21:31:32 | GenericM2<Int32> | extensions.cs:31:36:31:40 | other | 1 | extensions.cs:102:35:102:36 | 42 |
-| extensions.cs:104:9:104:47 | call to method StringGenericM1<Int32> | extensions.cs:16:18:16:35 | StringGenericM1<Int32> | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:104:9:104:9 | access to local variable s |
-| extensions.cs:104:9:104:47 | call to method StringGenericM1<Int32> | extensions.cs:16:18:16:35 | StringGenericM1<Int32> | extensions.cs:16:39:16:39 | t | 1 | extensions.cs:104:32:104:32 | 7 |
-| extensions.cs:104:9:104:47 | call to method StringGenericM1<Int32> | extensions.cs:16:18:16:35 | StringGenericM1<Int32> | extensions.cs:16:49:16:49 | o | 2 | extensions.cs:104:35:104:46 | object creation of type Object |
-| extensions.cs:105:9:105:69 | call to method StringGenericM1<String> | extensions.cs:16:18:16:35 | StringGenericM1<String> | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:105:46:105:46 | access to local variable s |
-| extensions.cs:105:9:105:69 | call to method StringGenericM1<String> | extensions.cs:16:18:16:35 | StringGenericM1<String> | extensions.cs:16:39:16:39 | t | 1 | extensions.cs:105:49:105:54 | "test" |
-| extensions.cs:105:9:105:69 | call to method StringGenericM1<String> | extensions.cs:16:18:16:35 | StringGenericM1<String> | extensions.cs:16:49:16:49 | o | 2 | extensions.cs:105:57:105:68 | object creation of type Object |
+| extensions.cs:59:19:59:24 | call to method M1 | extensions.cs:11:21:11:22 | M1 | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:59:19:59:19 | access to local variable s |
+| extensions.cs:60:19:60:29 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:60:19:60:19 | access to local variable s |
+| extensions.cs:60:19:60:29 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:12:33:12:37 | other | 1 | extensions.cs:60:24:60:28 | "!!!" |
+| extensions.cs:62:19:62:36 | call to method StaticM2 | extensions.cs:14:27:14:34 | StaticM2 | extensions.cs:14:43:14:43 | x | 0 | extensions.cs:62:35:62:35 | access to local variable s |
+| extensions.cs:64:19:64:42 | call to method StaticObjectM2 | extensions.cs:24:27:24:40 | StaticObjectM2 | extensions.cs:24:49:24:49 | s | 0 | extensions.cs:64:41:64:41 | access to local variable s |
+| extensions.cs:72:17:72:22 | call to method M3 | extensions.cs:42:24:42:25 | M3 | extensions.cs:42:39:42:39 | s | 0 | extensions.cs:72:17:72:17 | access to local variable s |
+| extensions.cs:75:9:75:26 | call to method M1 | extensions.cs:11:21:11:22 | M1 | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:75:25:75:25 | access to local variable s |
+| extensions.cs:76:9:76:33 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:76:25:76:25 | access to local variable s |
+| extensions.cs:76:9:76:33 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:12:33:12:37 | other | 1 | extensions.cs:76:28:76:32 | "!!!" |
+| extensions.cs:78:9:78:32 | call to method StaticM2 | extensions.cs:14:27:14:34 | StaticM2 | extensions.cs:14:43:14:43 | x | 0 | extensions.cs:78:31:78:31 | access to local variable s |
+| extensions.cs:80:9:80:38 | call to method StaticObjectM2 | extensions.cs:24:27:24:40 | StaticObjectM2 | extensions.cs:24:49:24:49 | s | 0 | extensions.cs:80:37:80:37 | access to local variable s |
+| extensions.cs:100:9:100:21 | call to method GenericM1 | extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:20:28:20 | t | 0 | extensions.cs:100:9:100:9 | access to local variable o |
+| extensions.cs:101:9:101:21 | call to method GenericM1 | extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:20:28:20 | t | 0 | extensions.cs:101:9:101:9 | access to local variable s |
+| extensions.cs:104:9:104:33 | call to method GenericM1 | extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:20:28:20 | t | 0 | extensions.cs:104:32:104:32 | access to local variable o |
+| extensions.cs:105:9:105:33 | call to method GenericM1 | extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:20:28:20 | t | 0 | extensions.cs:105:32:105:32 | access to local variable s |
+| extensions.cs:107:9:107:23 | call to method GenericM2<Int32> | extensions.cs:33:21:33:32 | GenericM2<Int32> | extensions.cs:28:20:28:20 | t | 0 | extensions.cs:107:9:107:9 | access to local variable o |
+| extensions.cs:107:9:107:23 | call to method GenericM2<Int32> | extensions.cs:33:21:33:32 | GenericM2<Int32> | extensions.cs:33:36:33:40 | other | 1 | extensions.cs:107:21:107:22 | 42 |
+| extensions.cs:108:9:108:37 | call to method GenericM2<Int32> | extensions.cs:33:21:33:32 | GenericM2<Int32> | extensions.cs:28:20:28:20 | t | 0 | extensions.cs:108:32:108:32 | access to local variable o |
+| extensions.cs:108:9:108:37 | call to method GenericM2<Int32> | extensions.cs:33:21:33:32 | GenericM2<Int32> | extensions.cs:33:36:33:40 | other | 1 | extensions.cs:108:35:108:36 | 42 |
+| extensions.cs:110:9:110:47 | call to method StringGenericM1<Int32> | extensions.cs:16:18:16:35 | StringGenericM1<Int32> | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:110:9:110:9 | access to local variable s |
+| extensions.cs:110:9:110:47 | call to method StringGenericM1<Int32> | extensions.cs:16:18:16:35 | StringGenericM1<Int32> | extensions.cs:16:39:16:39 | t | 1 | extensions.cs:110:32:110:32 | 7 |
+| extensions.cs:110:9:110:47 | call to method StringGenericM1<Int32> | extensions.cs:16:18:16:35 | StringGenericM1<Int32> | extensions.cs:16:49:16:49 | o | 2 | extensions.cs:110:35:110:46 | object creation of type Object |
+| extensions.cs:111:9:111:69 | call to method StringGenericM1<String> | extensions.cs:16:18:16:35 | StringGenericM1<String> | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:111:46:111:46 | access to local variable s |
+| extensions.cs:111:9:111:69 | call to method StringGenericM1<String> | extensions.cs:16:18:16:35 | StringGenericM1<String> | extensions.cs:16:39:16:39 | t | 1 | extensions.cs:111:49:111:54 | "test" |
+| extensions.cs:111:9:111:69 | call to method StringGenericM1<String> | extensions.cs:16:18:16:35 | StringGenericM1<String> | extensions.cs:16:49:16:49 | o | 2 | extensions.cs:111:57:111:68 | object creation of type Object |
 extensionMethodCalls
-| extensions.cs:57:19:57:24 | call to method M1 | extensions.cs:11:21:11:22 | M1 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).M1 |
-| extensions.cs:58:19:58:29 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).M2 |
-| extensions.cs:59:19:59:35 | call to method StaticM1 | extensions.cs:13:27:13:34 | StaticM1 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).StaticM1 |
-| extensions.cs:60:19:60:36 | call to method StaticM2 | extensions.cs:14:27:14:34 | StaticM2 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).StaticM2 |
-| extensions.cs:61:19:61:41 | call to method StaticObjectM1 | extensions.cs:21:27:21:40 | StaticObjectM1 | extensions.cs:19:5:24:5 | extension(Object) | MyExtensions+extension(System.Object).StaticObjectM1 |
-| extensions.cs:62:19:62:42 | call to method StaticObjectM2 | extensions.cs:22:27:22:40 | StaticObjectM2 | extensions.cs:19:5:24:5 | extension(Object) | MyExtensions+extension(System.Object).StaticObjectM2 |
-| extensions.cs:68:17:68:22 | call to method M3 | extensions.cs:40:24:40:25 | M3 | extensions.cs:38:21:38:37 | ClassicExtensions | ClassicExtensions.M3 |
-| extensions.cs:71:9:71:26 | call to method M1 | extensions.cs:11:21:11:22 | M1 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).M1 |
-| extensions.cs:72:9:72:33 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).M2 |
-| extensions.cs:73:9:73:31 | call to method StaticM1 | extensions.cs:13:27:13:34 | StaticM1 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).StaticM1 |
-| extensions.cs:74:9:74:32 | call to method StaticM2 | extensions.cs:14:27:14:34 | StaticM2 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).StaticM2 |
-| extensions.cs:75:9:75:37 | call to method StaticObjectM1 | extensions.cs:21:27:21:40 | StaticObjectM1 | extensions.cs:19:5:24:5 | extension(Object) | MyExtensions+extension(System.Object).StaticObjectM1 |
-| extensions.cs:76:9:76:38 | call to method StaticObjectM2 | extensions.cs:22:27:22:40 | StaticObjectM2 | extensions.cs:19:5:24:5 | extension(Object) | MyExtensions+extension(System.Object).StaticObjectM2 |
-| extensions.cs:94:9:94:21 | call to method GenericM1 | extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:5:35:5 | extension(Object)<Object> | MyExtensions+extension(System.Object)<System.Object>.GenericM1 |
-| extensions.cs:95:9:95:21 | call to method GenericM1 | extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:5:35:5 | extension(String)<String> | MyExtensions+extension(System.String)<System.String>.GenericM1 |
-| extensions.cs:98:9:98:33 | call to method GenericM1 | extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:5:35:5 | extension(Object)<Object> | MyExtensions+extension(System.Object)<System.Object>.GenericM1 |
-| extensions.cs:99:9:99:33 | call to method GenericM1 | extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:5:35:5 | extension(String)<String> | MyExtensions+extension(System.String)<System.String>.GenericM1 |
-| extensions.cs:101:9:101:23 | call to method GenericM2<Int32> | extensions.cs:31:21:31:32 | GenericM2<Int32> | extensions.cs:26:5:35:5 | extension(Object)<Object> | MyExtensions+extension(System.Object)<System.Object>.GenericM2<Int32> |
-| extensions.cs:102:9:102:37 | call to method GenericM2<Int32> | extensions.cs:31:21:31:32 | GenericM2<Int32> | extensions.cs:26:5:35:5 | extension(Object)<Object> | MyExtensions+extension(System.Object)<System.Object>.GenericM2<Int32> |
-| extensions.cs:104:9:104:47 | call to method StringGenericM1<Int32> | extensions.cs:16:18:16:35 | StringGenericM1<Int32> | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).StringGenericM1<Int32> |
-| extensions.cs:105:9:105:69 | call to method StringGenericM1<String> | extensions.cs:16:18:16:35 | StringGenericM1<String> | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).StringGenericM1<String> |
+| extensions.cs:59:19:59:24 | call to method M1 | extensions.cs:11:21:11:22 | M1 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).M1 |
+| extensions.cs:60:19:60:29 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).M2 |
+| extensions.cs:61:19:61:35 | call to method StaticM1 | extensions.cs:13:27:13:34 | StaticM1 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).StaticM1 |
+| extensions.cs:62:19:62:36 | call to method StaticM2 | extensions.cs:14:27:14:34 | StaticM2 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).StaticM2 |
+| extensions.cs:63:19:63:41 | call to method StaticObjectM1 | extensions.cs:23:27:23:40 | StaticObjectM1 | extensions.cs:21:5:26:5 | extension(Object) | MyExtensions+extension(System.Object).StaticObjectM1 |
+| extensions.cs:64:19:64:42 | call to method StaticObjectM2 | extensions.cs:24:27:24:40 | StaticObjectM2 | extensions.cs:21:5:26:5 | extension(Object) | MyExtensions+extension(System.Object).StaticObjectM2 |
+| extensions.cs:72:17:72:22 | call to method M3 | extensions.cs:42:24:42:25 | M3 | extensions.cs:40:21:40:37 | ClassicExtensions | ClassicExtensions.M3 |
+| extensions.cs:75:9:75:26 | call to method M1 | extensions.cs:11:21:11:22 | M1 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).M1 |
+| extensions.cs:76:9:76:33 | call to method M2 | extensions.cs:12:23:12:24 | M2 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).M2 |
+| extensions.cs:77:9:77:31 | call to method StaticM1 | extensions.cs:13:27:13:34 | StaticM1 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).StaticM1 |
+| extensions.cs:78:9:78:32 | call to method StaticM2 | extensions.cs:14:27:14:34 | StaticM2 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).StaticM2 |
+| extensions.cs:79:9:79:37 | call to method StaticObjectM1 | extensions.cs:23:27:23:40 | StaticObjectM1 | extensions.cs:21:5:26:5 | extension(Object) | MyExtensions+extension(System.Object).StaticObjectM1 |
+| extensions.cs:80:9:80:38 | call to method StaticObjectM2 | extensions.cs:24:27:24:40 | StaticObjectM2 | extensions.cs:21:5:26:5 | extension(Object) | MyExtensions+extension(System.Object).StaticObjectM2 |
+| extensions.cs:100:9:100:21 | call to method GenericM1 | extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:5:37:5 | extension(Object)<Object> | MyExtensions+extension(System.Object)<System.Object>.GenericM1 |
+| extensions.cs:101:9:101:21 | call to method GenericM1 | extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:5:37:5 | extension(String)<String> | MyExtensions+extension(System.String)<System.String>.GenericM1 |
+| extensions.cs:104:9:104:33 | call to method GenericM1 | extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:5:37:5 | extension(Object)<Object> | MyExtensions+extension(System.Object)<System.Object>.GenericM1 |
+| extensions.cs:105:9:105:33 | call to method GenericM1 | extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:5:37:5 | extension(String)<String> | MyExtensions+extension(System.String)<System.String>.GenericM1 |
+| extensions.cs:107:9:107:23 | call to method GenericM2<Int32> | extensions.cs:33:21:33:32 | GenericM2<Int32> | extensions.cs:28:5:37:5 | extension(Object)<Object> | MyExtensions+extension(System.Object)<System.Object>.GenericM2<Int32> |
+| extensions.cs:108:9:108:37 | call to method GenericM2<Int32> | extensions.cs:33:21:33:32 | GenericM2<Int32> | extensions.cs:28:5:37:5 | extension(Object)<Object> | MyExtensions+extension(System.Object)<System.Object>.GenericM2<Int32> |
+| extensions.cs:110:9:110:47 | call to method StringGenericM1<Int32> | extensions.cs:16:18:16:35 | StringGenericM1<Int32> | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).StringGenericM1<Int32> |
+| extensions.cs:111:9:111:69 | call to method StringGenericM1<String> | extensions.cs:16:18:16:35 | StringGenericM1<String> | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).StringGenericM1<String> |
 extensionParameter
 | extensions.cs:11:21:11:22 | M1 | extensions.cs:6:22:6:22 | s | 0 | string | extensions.cs:6:22:6:22 | s |
 | extensions.cs:12:23:12:24 | M2 | extensions.cs:6:22:6:22 | s | 0 | string | extensions.cs:6:22:6:22 | s |
@@ -60,52 +60,60 @@ extensionParameter
 | extensions.cs:16:18:16:35 | StringGenericM1`1 | extensions.cs:6:22:6:22 | s | 0 | string | extensions.cs:6:22:6:22 | s |
 | extensions.cs:16:18:16:35 | StringGenericM1`1 | extensions.cs:16:39:16:39 | t | 1 | T | extensions.cs:16:39:16:39 | t |
 | extensions.cs:16:18:16:35 | StringGenericM1`1 | extensions.cs:16:49:16:49 | o | 2 | object | extensions.cs:16:49:16:49 | o |
-| extensions.cs:22:27:22:40 | StaticObjectM2 | extensions.cs:22:49:22:49 | s | 0 | string | extensions.cs:22:49:22:49 | s |
-| extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:20:26:20 | t | 0 | T | extensions.cs:26:20:26:20 | t |
-| extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:20:26:20 | t | 0 | object | extensions.cs:26:20:26:20 | t |
-| extensions.cs:30:21:30:29 | GenericM1 | extensions.cs:26:20:26:20 | t | 0 | string | extensions.cs:26:20:26:20 | t |
-| extensions.cs:31:21:31:32 | GenericM2<Int32> | extensions.cs:26:20:26:20 | t | 0 | object | extensions.cs:26:20:26:20 | t |
-| extensions.cs:31:21:31:32 | GenericM2<Int32> | extensions.cs:31:36:31:40 | other | 1 | int | extensions.cs:31:36:31:40 | other |
-| extensions.cs:31:21:31:32 | GenericM2`1 | extensions.cs:26:20:26:20 | t | 0 | T | extensions.cs:26:20:26:20 | t |
-| extensions.cs:31:21:31:32 | GenericM2`1 | extensions.cs:26:20:26:20 | t | 0 | object | extensions.cs:26:20:26:20 | t |
-| extensions.cs:31:21:31:32 | GenericM2`1 | extensions.cs:26:20:26:20 | t | 0 | string | extensions.cs:26:20:26:20 | t |
-| extensions.cs:31:21:31:32 | GenericM2`1 | extensions.cs:31:36:31:40 | other | 1 | S | extensions.cs:31:36:31:40 | other |
-| extensions.cs:31:21:31:32 | GenericM2`1 | extensions.cs:31:36:31:40 | other | 1 | S | extensions.cs:31:36:31:40 | other |
-| extensions.cs:31:21:31:32 | GenericM2`1 | extensions.cs:31:36:31:40 | other | 1 | S | extensions.cs:31:36:31:40 | other |
-| extensions.cs:32:21:32:35 | GenericStaticM1 | extensions.cs:26:20:26:20 | t | 0 | T | extensions.cs:26:20:26:20 | t |
-| extensions.cs:32:21:32:35 | GenericStaticM1 | extensions.cs:26:20:26:20 | t | 0 | object | extensions.cs:26:20:26:20 | t |
-| extensions.cs:32:21:32:35 | GenericStaticM1 | extensions.cs:26:20:26:20 | t | 0 | string | extensions.cs:26:20:26:20 | t |
-| extensions.cs:33:28:33:45 | GenericStaticM2`1 | extensions.cs:33:49:33:53 | other | 0 | S | extensions.cs:33:49:33:53 | other |
-| extensions.cs:33:28:33:45 | GenericStaticM2`1 | extensions.cs:33:49:33:53 | other | 0 | S | extensions.cs:33:49:33:53 | other |
-| extensions.cs:33:28:33:45 | GenericStaticM2`1 | extensions.cs:33:49:33:53 | other | 0 | S | extensions.cs:33:49:33:53 | other |
-| extensions.cs:40:24:40:25 | M3 | extensions.cs:40:39:40:39 | s | 0 | string | extensions.cs:40:39:40:39 | s |
+| extensions.cs:24:27:24:40 | StaticObjectM2 | extensions.cs:24:49:24:49 | s | 0 | string | extensions.cs:24:49:24:49 | s |
+| extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:20:28:20 | t | 0 | T | extensions.cs:28:20:28:20 | t |
+| extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:20:28:20 | t | 0 | object | extensions.cs:28:20:28:20 | t |
+| extensions.cs:32:21:32:29 | GenericM1 | extensions.cs:28:20:28:20 | t | 0 | string | extensions.cs:28:20:28:20 | t |
+| extensions.cs:33:21:33:32 | GenericM2<Int32> | extensions.cs:28:20:28:20 | t | 0 | object | extensions.cs:28:20:28:20 | t |
+| extensions.cs:33:21:33:32 | GenericM2<Int32> | extensions.cs:33:36:33:40 | other | 1 | int | extensions.cs:33:36:33:40 | other |
+| extensions.cs:33:21:33:32 | GenericM2`1 | extensions.cs:28:20:28:20 | t | 0 | T | extensions.cs:28:20:28:20 | t |
+| extensions.cs:33:21:33:32 | GenericM2`1 | extensions.cs:28:20:28:20 | t | 0 | object | extensions.cs:28:20:28:20 | t |
+| extensions.cs:33:21:33:32 | GenericM2`1 | extensions.cs:28:20:28:20 | t | 0 | string | extensions.cs:28:20:28:20 | t |
+| extensions.cs:33:21:33:32 | GenericM2`1 | extensions.cs:33:36:33:40 | other | 1 | S | extensions.cs:33:36:33:40 | other |
+| extensions.cs:33:21:33:32 | GenericM2`1 | extensions.cs:33:36:33:40 | other | 1 | S | extensions.cs:33:36:33:40 | other |
+| extensions.cs:33:21:33:32 | GenericM2`1 | extensions.cs:33:36:33:40 | other | 1 | S | extensions.cs:33:36:33:40 | other |
+| extensions.cs:34:21:34:35 | GenericStaticM1 | extensions.cs:28:20:28:20 | t | 0 | T | extensions.cs:28:20:28:20 | t |
+| extensions.cs:34:21:34:35 | GenericStaticM1 | extensions.cs:28:20:28:20 | t | 0 | object | extensions.cs:28:20:28:20 | t |
+| extensions.cs:34:21:34:35 | GenericStaticM1 | extensions.cs:28:20:28:20 | t | 0 | string | extensions.cs:28:20:28:20 | t |
+| extensions.cs:35:28:35:45 | GenericStaticM2`1 | extensions.cs:35:49:35:53 | other | 0 | S | extensions.cs:35:49:35:53 | other |
+| extensions.cs:35:28:35:45 | GenericStaticM2`1 | extensions.cs:35:49:35:53 | other | 0 | S | extensions.cs:35:49:35:53 | other |
+| extensions.cs:35:28:35:45 | GenericStaticM2`1 | extensions.cs:35:49:35:53 | other | 0 | S | extensions.cs:35:49:35:53 | other |
+| extensions.cs:42:24:42:25 | M3 | extensions.cs:42:39:42:39 | s | 0 | string | extensions.cs:42:39:42:39 | s |
 extensionOperatorCallArgument
-| extensions.cs:15:39:15:39 | * | extensions.cs:65:19:65:23 | call to operator * | extensions.cs:15:45:15:45 | a | 0 | extensions.cs:65:19:65:19 | 3 |
-| extensions.cs:15:39:15:39 | * | extensions.cs:65:19:65:23 | call to operator * | extensions.cs:15:55:15:55 | b | 1 | extensions.cs:65:23:65:23 | access to local variable s |
-| extensions.cs:15:39:15:39 | * | extensions.cs:79:9:79:38 | call to operator * | extensions.cs:15:45:15:45 | a | 0 | extensions.cs:79:34:79:34 | 3 |
-| extensions.cs:15:39:15:39 | * | extensions.cs:79:9:79:38 | call to operator * | extensions.cs:15:55:15:55 | b | 1 | extensions.cs:79:37:79:37 | access to local variable s |
+| extensions.cs:15:39:15:39 | * | extensions.cs:67:19:67:23 | call to operator * | extensions.cs:15:45:15:45 | a | 0 | extensions.cs:67:19:67:19 | 3 |
+| extensions.cs:15:39:15:39 | * | extensions.cs:67:19:67:23 | call to operator * | extensions.cs:15:55:15:55 | b | 1 | extensions.cs:67:23:67:23 | access to local variable s |
+| extensions.cs:15:39:15:39 | * | extensions.cs:83:9:83:38 | call to operator * | extensions.cs:15:45:15:45 | a | 0 | extensions.cs:83:34:83:34 | 3 |
+| extensions.cs:15:39:15:39 | * | extensions.cs:83:9:83:38 | call to operator * | extensions.cs:15:55:15:55 | b | 1 | extensions.cs:83:37:83:37 | access to local variable s |
+| extensions.cs:17:30:17:31 | ++ | extensions.cs:68:9:68:11 | call to operator ++ | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:68:9:68:9 | access to local variable s |
+| extensions.cs:17:30:17:31 | ++ | extensions.cs:84:9:84:46 | call to operator ++ | extensions.cs:6:22:6:22 | s | 0 | extensions.cs:84:45:84:45 | access to local variable s |
+| extensions.cs:18:39:18:40 | -- | extensions.cs:69:9:69:11 | call to operator -- | extensions.cs:18:49:18:49 | o | 0 | extensions.cs:69:9:69:9 | access to local variable s |
+| extensions.cs:18:39:18:40 | -- | extensions.cs:85:9:85:36 | call to operator -- | extensions.cs:18:49:18:49 | o | 0 | extensions.cs:85:35:85:35 | access to local variable s |
 extensionOperatorCalls
-| extensions.cs:65:19:65:23 | call to operator * | extensions.cs:15:39:15:39 | * | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).op_Multiply |
-| extensions.cs:79:9:79:38 | call to operator * | extensions.cs:15:39:15:39 | * | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).op_Multiply |
+| extensions.cs:67:19:67:23 | call to operator * | extensions.cs:15:39:15:39 | * | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).op_Multiply |
+| extensions.cs:68:9:68:11 | call to operator ++ | extensions.cs:17:30:17:31 | ++ | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).op_IncrementAssignment |
+| extensions.cs:69:9:69:11 | call to operator -- | extensions.cs:18:39:18:40 | -- | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).op_Decrement |
+| extensions.cs:83:9:83:38 | call to operator * | extensions.cs:15:39:15:39 | * | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).op_Multiply |
+| extensions.cs:84:9:84:46 | call to operator ++ | extensions.cs:17:30:17:31 | ++ | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).op_IncrementAssignment |
+| extensions.cs:85:9:85:36 | call to operator -- | extensions.cs:18:39:18:40 | -- | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).op_Decrement |
 extensionProperty
-| extensions.cs:8:21:8:25 | Prop1 | extensions.cs:6:5:17:5 | extension(String) |
-| extensions.cs:9:21:9:25 | Prop2 | extensions.cs:6:5:17:5 | extension(String) |
-| extensions.cs:10:28:10:38 | StaticProp1 | extensions.cs:6:5:17:5 | extension(String) |
-| extensions.cs:23:28:23:37 | StaticProp | extensions.cs:19:5:24:5 | extension(Object) |
-| extensions.cs:28:21:28:32 | GenericProp1 | extensions.cs:26:5:35:5 | extension(Object)<Object> |
-| extensions.cs:28:21:28:32 | GenericProp1 | extensions.cs:26:5:35:5 | extension(String)<String> |
-| extensions.cs:28:21:28:32 | GenericProp1 | extensions.cs:26:5:35:5 | extension(T)`1 |
-| extensions.cs:29:21:29:32 | GenericProp2 | extensions.cs:26:5:35:5 | extension(Object)<Object> |
-| extensions.cs:29:21:29:32 | GenericProp2 | extensions.cs:26:5:35:5 | extension(String)<String> |
-| extensions.cs:29:21:29:32 | GenericProp2 | extensions.cs:26:5:35:5 | extension(T)`1 |
+| extensions.cs:8:21:8:25 | Prop1 | extensions.cs:6:5:19:5 | extension(String) |
+| extensions.cs:9:21:9:25 | Prop2 | extensions.cs:6:5:19:5 | extension(String) |
+| extensions.cs:10:28:10:38 | StaticProp1 | extensions.cs:6:5:19:5 | extension(String) |
+| extensions.cs:25:28:25:37 | StaticProp | extensions.cs:21:5:26:5 | extension(Object) |
+| extensions.cs:30:21:30:32 | GenericProp1 | extensions.cs:28:5:37:5 | extension(Object)<Object> |
+| extensions.cs:30:21:30:32 | GenericProp1 | extensions.cs:28:5:37:5 | extension(String)<String> |
+| extensions.cs:30:21:30:32 | GenericProp1 | extensions.cs:28:5:37:5 | extension(T)`1 |
+| extensions.cs:31:21:31:32 | GenericProp2 | extensions.cs:28:5:37:5 | extension(Object)<Object> |
+| extensions.cs:31:21:31:32 | GenericProp2 | extensions.cs:28:5:37:5 | extension(String)<String> |
+| extensions.cs:31:21:31:32 | GenericProp2 | extensions.cs:28:5:37:5 | extension(T)`1 |
 extensionPropertyCall
-| extensions.cs:50:19:50:25 | access to property Prop1 | extensions.cs:8:21:8:25 | Prop1 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).Prop1 |
-| extensions.cs:51:19:51:25 | access to property Prop2 | extensions.cs:9:21:9:25 | Prop2 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).Prop2 |
-| extensions.cs:52:9:52:15 | access to property Prop2 | extensions.cs:9:21:9:25 | Prop2 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).Prop2 |
-| extensions.cs:53:19:53:36 | access to property StaticProp1 | extensions.cs:10:28:10:38 | StaticProp1 | extensions.cs:6:5:17:5 | extension(String) | MyExtensions+extension(System.String).StaticProp1 |
-| extensions.cs:54:19:54:35 | access to property StaticProp | extensions.cs:23:28:23:37 | StaticProp | extensions.cs:19:5:24:5 | extension(Object) | MyExtensions+extension(System.Object).StaticProp |
+| extensions.cs:52:19:52:25 | access to property Prop1 | extensions.cs:8:21:8:25 | Prop1 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).Prop1 |
+| extensions.cs:53:19:53:25 | access to property Prop2 | extensions.cs:9:21:9:25 | Prop2 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).Prop2 |
+| extensions.cs:54:9:54:15 | access to property Prop2 | extensions.cs:9:21:9:25 | Prop2 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).Prop2 |
+| extensions.cs:55:19:55:36 | access to property StaticProp1 | extensions.cs:10:28:10:38 | StaticProp1 | extensions.cs:6:5:19:5 | extension(String) | MyExtensions+extension(System.String).StaticProp1 |
+| extensions.cs:56:19:56:35 | access to property StaticProp | extensions.cs:25:28:25:37 | StaticProp | extensions.cs:21:5:26:5 | extension(Object) | MyExtensions+extension(System.Object).StaticProp |
 extensionAccessorCall
-| extensions.cs:82:9:82:33 | call to extension accessor get_Prop1 | extensions.cs:8:30:8:41 | get_Prop1 | extensions.cs:8:21:8:25 | Prop1 | MyExtensions+extension(System.String).get_Prop1 |
-| extensions.cs:83:9:83:33 | call to extension accessor get_Prop2 | extensions.cs:9:29:9:31 | get_Prop2 | extensions.cs:9:21:9:25 | Prop2 | MyExtensions+extension(System.String).get_Prop2 |
-| extensions.cs:84:9:84:40 | call to extension accessor set_Prop2 | extensions.cs:9:50:9:52 | set_Prop2 | extensions.cs:9:21:9:25 | Prop2 | MyExtensions+extension(System.String).set_Prop2 |
-| extensions.cs:85:9:85:37 | call to extension accessor get_StaticProp | extensions.cs:23:42:23:45 | get_StaticProp | extensions.cs:23:28:23:37 | StaticProp | MyExtensions+extension(System.Object).get_StaticProp |
+| extensions.cs:88:9:88:33 | call to extension accessor get_Prop1 | extensions.cs:8:30:8:41 | get_Prop1 | extensions.cs:8:21:8:25 | Prop1 | MyExtensions+extension(System.String).get_Prop1 |
+| extensions.cs:89:9:89:33 | call to extension accessor get_Prop2 | extensions.cs:9:29:9:31 | get_Prop2 | extensions.cs:9:21:9:25 | Prop2 | MyExtensions+extension(System.String).get_Prop2 |
+| extensions.cs:90:9:90:40 | call to extension accessor set_Prop2 | extensions.cs:9:50:9:52 | set_Prop2 | extensions.cs:9:21:9:25 | Prop2 | MyExtensions+extension(System.String).set_Prop2 |
+| extensions.cs:91:9:91:37 | call to extension accessor get_StaticProp | extensions.cs:25:42:25:45 | get_StaticProp | extensions.cs:25:28:25:37 | StaticProp | MyExtensions+extension(System.Object).get_StaticProp |
diff --git a/csharp/ql/test/library-tests/indexers/Indexers13.expected b/csharp/ql/test/library-tests/indexers/Indexers13.expected
new file mode 100644
index 000000000000..a5e831421f83
--- /dev/null
+++ b/csharp/ql/test/library-tests/indexers/Indexers13.expected
@@ -0,0 +1,4 @@
+| indexers.cs:24:21:24:24 | Item | indexers.cs:62:22:62:29 | access to indexer | indexers.cs:26:13:26:15 | get_Item |
+| indexers.cs:24:21:24:24 | Item | indexers.cs:65:25:65:32 | access to indexer | indexers.cs:34:13:34:15 | set_Item |
+| indexers.cs:143:24:143:27 | Item | indexers.cs:156:13:156:16 | access to indexer | indexers.cs:145:13:145:15 | get_Item |
+| indexers.cs:143:24:143:27 | Item | indexers.cs:157:21:157:24 | access to indexer | indexers.cs:145:13:145:15 | get_Item |
diff --git a/csharp/ql/test/library-tests/indexers/Indexers13.ql b/csharp/ql/test/library-tests/indexers/Indexers13.ql
new file mode 100644
index 000000000000..636802690077
--- /dev/null
+++ b/csharp/ql/test/library-tests/indexers/Indexers13.ql
@@ -0,0 +1,8 @@
+import csharp
+
+from IndexerCall ic, Indexer i, Accessor target
+where
+  ic.getIndexer() = i and
+  ic.getTarget() = target and
+  i.fromSource()
+select i, ic, target
diff --git a/csharp/ql/test/library-tests/indexers/PrintAst.expected b/csharp/ql/test/library-tests/indexers/PrintAst.expected
index 93160309c79b..57b83223c36d 100644
--- a/csharp/ql/test/library-tests/indexers/PrintAst.expected
+++ b/csharp/ql/test/library-tests/indexers/PrintAst.expected
@@ -360,3 +360,57 @@ indexers.cs:
 #  130|         4: [BlockStmt] {...}
 #  130|           0: [ReturnStmt] return ...;
 #  130|             0: [IntLiteral] 0
+#  134|   5: [RefStruct] S
+#  136|     6: [Field] x
+#  136|       -1: [TypeMention] int
+#  138|     7: [InstanceConstructor] S
+#-----|       2: (Parameters)
+#  138|         0: [Parameter] v
+#  138|           -1: [TypeMention] int
+#  139|       4: [BlockStmt] {...}
+#  140|         0: [ExprStmt] ...;
+#  140|           0: [AssignExpr] ... = ...
+#  140|             0: [FieldAccess] access to field x
+#  140|             1: [RefExpr] ref ...
+#  140|               0: [ParameterAccess] access to parameter v
+#  143|     8: [Indexer] Item
+#  143|       -1: [TypeMention] int
+#-----|       1: (Parameters)
+#  143|         0: [Parameter] i
+#  143|           -1: [TypeMention] int
+#  145|       3: [Getter] get_Item
+#-----|         2: (Parameters)
+#  143|           0: [Parameter] i
+#  145|         4: [BlockStmt] {...}
+#  145|           0: [ReturnStmt] return ...;
+#  145|             0: [RefExpr] ref ...
+#  145|               0: [FieldAccess] access to field x
+#  149|   6: [Class] TestRefReturns
+#  151|     6: [Method] M
+#  151|       -1: [TypeMention] Void
+#  152|       4: [BlockStmt] {...}
+#  153|         0: [LocalVariableDeclStmt] ... ...;
+#  153|           0: [LocalVariableDeclAndInitExpr] Int32 a = ...
+#  153|             -1: [TypeMention] int
+#  153|             0: [LocalVariableAccess] access to local variable a
+#  153|             1: [IntLiteral] 0
+#  155|         1: [LocalVariableDeclStmt] ... ...;
+#  155|           0: [LocalVariableDeclAndInitExpr] S s = ...
+#  155|             -1: [TypeMention] S
+#  155|             0: [LocalVariableAccess] access to local variable s
+#  155|             1: [ObjectCreation] object creation of type S
+#  155|               -1: [TypeMention] S
+#  155|               0: [LocalVariableAccess] access to local variable a
+#  156|         2: [ExprStmt] ...;
+#  156|           0: [AssignExpr] ... = ...
+#  156|             0: [IndexerCall] access to indexer
+#  156|               -1: [LocalVariableAccess] access to local variable s
+#  156|               0: [IntLiteral] 0
+#  156|             1: [IntLiteral] 1
+#  157|         3: [LocalVariableDeclStmt] ... ...;
+#  157|           0: [LocalVariableDeclAndInitExpr] Int32 x = ...
+#  157|             -1: [TypeMention] int
+#  157|             0: [LocalVariableAccess] access to local variable x
+#  157|             1: [IndexerCall] access to indexer
+#  157|               -1: [LocalVariableAccess] access to local variable s
+#  157|               0: [IntLiteral] 0
diff --git a/csharp/ql/test/library-tests/indexers/indexers.cs b/csharp/ql/test/library-tests/indexers/indexers.cs
index 6da14ae769dd..55011d82755e 100644
--- a/csharp/ql/test/library-tests/indexers/indexers.cs
+++ b/csharp/ql/test/library-tests/indexers/indexers.cs
@@ -130,4 +130,31 @@ public bool this[int index]
             get { return 0; }
         }
     }
+
+    public ref struct S
+    {
+        private ref int x;
+
+        public S(ref int v)
+        {
+            x = ref v;
+        }
+
+        public ref int this[int i]
+        {
+            get { return ref x; }
+        }
+    }
+
+    public class TestRefReturns
+    {
+        public void M()
+        {
+            int a = 0;
+
+            S s = new S(ref a);
+            s[0] = 1;
+            var x = s[0];
+        }
+    }
 }
diff --git a/csharp/ql/test/library-tests/operators/Operators3.expected b/csharp/ql/test/library-tests/operators/Operators3.expected
index e81aec79ba19..bda7edb99bae 100644
--- a/csharp/ql/test/library-tests/operators/Operators3.expected
+++ b/csharp/ql/test/library-tests/operators/Operators3.expected
@@ -1 +1 @@
-| operators.cs:96:32:96:39 | implicit conversion |
+| operators.cs:118:36:118:43 | implicit conversion |
diff --git a/csharp/ql/test/library-tests/operators/Operators4.expected b/csharp/ql/test/library-tests/operators/Operators4.expected
index 49db993c093d..bee27656f264 100644
--- a/csharp/ql/test/library-tests/operators/Operators4.expected
+++ b/csharp/ql/test/library-tests/operators/Operators4.expected
@@ -1 +1 @@
-| operators.cs:101:32:101:39 | explicit conversion |
+| operators.cs:123:36:123:43 | explicit conversion |
diff --git a/csharp/ql/test/library-tests/operators/Operators5.expected b/csharp/ql/test/library-tests/operators/Operators5.expected
index 8e506e5119df..900b5170c349 100644
--- a/csharp/ql/test/library-tests/operators/Operators5.expected
+++ b/csharp/ql/test/library-tests/operators/Operators5.expected
@@ -1,15 +1,15 @@
-| operators.cs:23:30:23:31 | += | operators.cs:61:13:61:22 | ... += ... |
-| operators.cs:31:38:31:39 | checked += | operators.cs:77:17:77:26 | ... += ... |
-| operators.cs:33:38:33:39 | checked -= | operators.cs:78:17:78:26 | ... -= ... |
-| operators.cs:34:30:34:31 | -= | operators.cs:64:13:64:22 | ... -= ... |
-| operators.cs:36:38:36:39 | checked *= | operators.cs:79:17:79:26 | ... *= ... |
-| operators.cs:37:30:37:31 | *= | operators.cs:65:13:65:22 | ... *= ... |
-| operators.cs:39:38:39:39 | checked /= | operators.cs:80:17:80:26 | ... /= ... |
-| operators.cs:40:30:40:31 | /= | operators.cs:66:13:66:22 | ... /= ... |
-| operators.cs:42:30:42:31 | %= | operators.cs:67:13:67:22 | ... %= ... |
-| operators.cs:43:30:43:31 | &= | operators.cs:68:13:68:22 | ... &= ... |
-| operators.cs:44:30:44:31 | \|= | operators.cs:69:13:69:22 | ... \|= ... |
-| operators.cs:45:30:45:31 | ^= | operators.cs:70:13:70:22 | ... ^= ... |
-| operators.cs:46:30:46:32 | <<= | operators.cs:71:13:71:23 | ... <<= ... |
-| operators.cs:47:30:47:32 | >>= | operators.cs:72:13:72:23 | ... >>= ... |
-| operators.cs:48:30:48:33 | >>>= | operators.cs:73:13:73:24 | ... >>>= ... |
+| operators.cs:23:30:23:31 | += | operators.cs:70:13:70:22 | ... += ... |
+| operators.cs:31:38:31:39 | checked += | operators.cs:86:17:86:26 | ... += ... |
+| operators.cs:33:38:33:39 | checked -= | operators.cs:87:17:87:26 | ... -= ... |
+| operators.cs:34:30:34:31 | -= | operators.cs:73:13:73:22 | ... -= ... |
+| operators.cs:36:38:36:39 | checked *= | operators.cs:88:17:88:26 | ... *= ... |
+| operators.cs:37:30:37:31 | *= | operators.cs:74:13:74:22 | ... *= ... |
+| operators.cs:39:38:39:39 | checked /= | operators.cs:89:17:89:26 | ... /= ... |
+| operators.cs:40:30:40:31 | /= | operators.cs:75:13:75:22 | ... /= ... |
+| operators.cs:42:30:42:31 | %= | operators.cs:76:13:76:22 | ... %= ... |
+| operators.cs:43:30:43:31 | &= | operators.cs:77:13:77:22 | ... &= ... |
+| operators.cs:44:30:44:31 | \|= | operators.cs:78:13:78:22 | ... \|= ... |
+| operators.cs:45:30:45:31 | ^= | operators.cs:79:13:79:22 | ... ^= ... |
+| operators.cs:46:30:46:32 | <<= | operators.cs:80:13:80:23 | ... <<= ... |
+| operators.cs:47:30:47:32 | >>= | operators.cs:81:13:81:23 | ... >>= ... |
+| operators.cs:48:30:48:33 | >>>= | operators.cs:82:13:82:24 | ... >>>= ... |
diff --git a/csharp/ql/test/library-tests/operators/Operators6.expected b/csharp/ql/test/library-tests/operators/Operators6.expected
new file mode 100644
index 000000000000..f0878a511d9b
--- /dev/null
+++ b/csharp/ql/test/library-tests/operators/Operators6.expected
@@ -0,0 +1,10 @@
+| operators.cs:15:42:15:43 | ++ | operators.cs:66:19:66:23 | call to operator ++ |
+| operators.cs:15:42:15:43 | ++ | operators.cs:67:19:67:23 | call to operator ++ |
+| operators.cs:54:38:54:39 | checked ++ | operators.cs:100:17:100:19 | call to operator checked ++ |
+| operators.cs:54:38:54:39 | checked ++ | operators.cs:101:17:101:19 | call to operator checked ++ |
+| operators.cs:55:30:55:31 | ++ | operators.cs:93:13:93:15 | call to operator ++ |
+| operators.cs:55:30:55:31 | ++ | operators.cs:94:13:94:15 | call to operator ++ |
+| operators.cs:56:38:56:39 | checked -- | operators.cs:102:17:102:19 | call to operator checked -- |
+| operators.cs:56:38:56:39 | checked -- | operators.cs:103:17:103:19 | call to operator checked -- |
+| operators.cs:57:30:57:31 | -- | operators.cs:95:13:95:15 | call to operator -- |
+| operators.cs:57:30:57:31 | -- | operators.cs:96:13:96:15 | call to operator -- |
diff --git a/csharp/ql/test/library-tests/operators/Operators6.ql b/csharp/ql/test/library-tests/operators/Operators6.ql
new file mode 100644
index 000000000000..0eb578a11340
--- /dev/null
+++ b/csharp/ql/test/library-tests/operators/Operators6.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Test for operators
+ */
+
+import csharp
+
+from Operator op, OperatorCall call
+where
+  op.fromSource() and
+  (
+    op instanceof IncrementOperator or
+    op instanceof CheckedIncrementOperator or
+    op instanceof DecrementOperator or
+    op instanceof CheckedDecrementOperator
+  ) and
+  call.getTarget() = op
+select op, call
diff --git a/csharp/ql/test/library-tests/operators/PrintAst.expected b/csharp/ql/test/library-tests/operators/PrintAst.expected
index 8ea38d79b148..2087e5f96dc3 100644
--- a/csharp/ql/test/library-tests/operators/PrintAst.expected
+++ b/csharp/ql/test/library-tests/operators/PrintAst.expected
@@ -181,159 +181,204 @@ operators.cs:
 #   48|         0: [Parameter] n
 #   48|           -1: [TypeMention] IntVector
 #   48|       4: [BlockStmt] {...}
-#   51|   2: [Class] TestOperator
-#   53|     6: [Method] Main
-#   53|       -1: [TypeMention] Void
+#   51|   2: [Class] C
+#   54|     6: [CheckedIncrementOperator] checked ++
+#   54|       -1: [TypeMention] Void
 #   54|       4: [BlockStmt] {...}
-#   55|         0: [LocalVariableDeclStmt] ... ...;
-#   55|           0: [LocalVariableDeclAndInitExpr] IntVector iv1 = ...
-#   55|             -1: [TypeMention] IntVector
-#   55|             0: [LocalVariableAccess] access to local variable iv1
-#   55|             1: [ObjectCreation] object creation of type IntVector
-#   55|               -1: [TypeMention] IntVector
-#   55|               0: [IntLiteral] 4
-#   56|         1: [LocalVariableDeclStmt] ... ...;
-#   56|           0: [LocalVariableDeclExpr] IntVector iv2
-#   56|             0: [TypeMention] IntVector
-#   57|         2: [ExprStmt] ...;
-#   57|           0: [AssignExpr] ... = ...
-#   57|             0: [LocalVariableAccess] access to local variable iv2
-#   57|             1: [OperatorCall] call to operator ++
-#   57|               0: [LocalVariableAccess] access to local variable iv1
-#   58|         3: [ExprStmt] ...;
-#   58|           0: [AssignExpr] ... = ...
-#   58|             0: [LocalVariableAccess] access to local variable iv2
-#   58|             1: [OperatorCall] call to operator ++
-#   58|               0: [LocalVariableAccess] access to local variable iv1
-#   60|         4: [LocalVariableDeclStmt] ... ...;
-#   60|           0: [LocalVariableDeclAndInitExpr] IntVector iv3 = ...
-#   60|             -1: [TypeMention] IntVector
-#   60|             0: [LocalVariableAccess] access to local variable iv3
-#   60|             1: [ObjectCreation] object creation of type IntVector
-#   60|               -1: [TypeMention] IntVector
-#   60|               0: [IntLiteral] 4
-#   61|         5: [ExprStmt] ...;
-#   61|           0: [AssignAddExpr] ... += ...
-#   61|             0: [LocalVariableAccess] access to local variable iv3
-#   61|             1: [LocalVariableAccess] access to local variable iv2
-#   64|         6: [ExprStmt] ...;
-#   64|           0: [AssignSubExpr] ... -= ...
-#   64|             0: [LocalVariableAccess] access to local variable iv3
-#   64|             1: [LocalVariableAccess] access to local variable iv2
-#   65|         7: [ExprStmt] ...;
-#   65|           0: [AssignMulExpr] ... *= ...
-#   65|             0: [LocalVariableAccess] access to local variable iv3
-#   65|             1: [LocalVariableAccess] access to local variable iv2
-#   66|         8: [ExprStmt] ...;
-#   66|           0: [AssignDivExpr] ... /= ...
-#   66|             0: [LocalVariableAccess] access to local variable iv3
-#   66|             1: [LocalVariableAccess] access to local variable iv2
-#   67|         9: [ExprStmt] ...;
-#   67|           0: [AssignRemExpr] ... %= ...
-#   67|             0: [LocalVariableAccess] access to local variable iv3
-#   67|             1: [LocalVariableAccess] access to local variable iv2
-#   68|         10: [ExprStmt] ...;
-#   68|           0: [AssignAndExpr] ... &= ...
-#   68|             0: [LocalVariableAccess] access to local variable iv3
-#   68|             1: [LocalVariableAccess] access to local variable iv2
-#   69|         11: [ExprStmt] ...;
-#   69|           0: [AssignOrExpr] ... |= ...
+#   55|     7: [IncrementOperator] ++
+#   55|       -1: [TypeMention] Void
+#   55|       4: [BlockStmt] {...}
+#   56|     8: [CheckedDecrementOperator] checked --
+#   56|       -1: [TypeMention] Void
+#   56|       4: [BlockStmt] {...}
+#   57|     9: [DecrementOperator] --
+#   57|       -1: [TypeMention] Void
+#   57|       4: [BlockStmt] {...}
+#   60|   3: [Class] TestOperator
+#   62|     6: [Method] Main
+#   62|       -1: [TypeMention] Void
+#   63|       4: [BlockStmt] {...}
+#   64|         0: [LocalVariableDeclStmt] ... ...;
+#   64|           0: [LocalVariableDeclAndInitExpr] IntVector iv1 = ...
+#   64|             -1: [TypeMention] IntVector
+#   64|             0: [LocalVariableAccess] access to local variable iv1
+#   64|             1: [ObjectCreation] object creation of type IntVector
+#   64|               -1: [TypeMention] IntVector
+#   64|               0: [IntLiteral] 4
+#   65|         1: [LocalVariableDeclStmt] ... ...;
+#   65|           0: [LocalVariableDeclExpr] IntVector iv2
+#   65|             0: [TypeMention] IntVector
+#   66|         2: [ExprStmt] ...;
+#   66|           0: [AssignExpr] ... = ...
+#   66|             0: [LocalVariableAccess] access to local variable iv2
+#   66|             1: [OperatorCall] call to operator ++
+#   66|               0: [LocalVariableAccess] access to local variable iv1
+#   67|         3: [ExprStmt] ...;
+#   67|           0: [AssignExpr] ... = ...
+#   67|             0: [LocalVariableAccess] access to local variable iv2
+#   67|             1: [OperatorCall] call to operator ++
+#   67|               0: [LocalVariableAccess] access to local variable iv1
+#   69|         4: [LocalVariableDeclStmt] ... ...;
+#   69|           0: [LocalVariableDeclAndInitExpr] IntVector iv3 = ...
+#   69|             -1: [TypeMention] IntVector
 #   69|             0: [LocalVariableAccess] access to local variable iv3
-#   69|             1: [LocalVariableAccess] access to local variable iv2
-#   70|         12: [ExprStmt] ...;
-#   70|           0: [AssignXorExpr] ... ^= ...
+#   69|             1: [ObjectCreation] object creation of type IntVector
+#   69|               -1: [TypeMention] IntVector
+#   69|               0: [IntLiteral] 4
+#   70|         5: [ExprStmt] ...;
+#   70|           0: [AssignAddExpr] ... += ...
 #   70|             0: [LocalVariableAccess] access to local variable iv3
 #   70|             1: [LocalVariableAccess] access to local variable iv2
-#   71|         13: [ExprStmt] ...;
-#   71|           0: [AssignLeftShiftExpr] ... <<= ...
-#   71|             0: [LocalVariableAccess] access to local variable iv3
-#   71|             1: [LocalVariableAccess] access to local variable iv2
-#   72|         14: [ExprStmt] ...;
-#   72|           0: [AssignRightShiftExpr] ... >>= ...
-#   72|             0: [LocalVariableAccess] access to local variable iv3
-#   72|             1: [LocalVariableAccess] access to local variable iv2
-#   73|         15: [ExprStmt] ...;
-#   73|           0: [AssignUnsignedRightShiftExpr] ... >>>= ...
+#   73|         6: [ExprStmt] ...;
+#   73|           0: [AssignSubExpr] ... -= ...
 #   73|             0: [LocalVariableAccess] access to local variable iv3
 #   73|             1: [LocalVariableAccess] access to local variable iv2
-#   75|         16: [CheckedStmt] checked {...}
-#   76|           0: [BlockStmt] {...}
-#   77|             0: [ExprStmt] ...;
-#   77|               0: [AssignAddExpr] ... += ...
-#   77|                 0: [LocalVariableAccess] access to local variable iv3
-#   77|                 1: [LocalVariableAccess] access to local variable iv2
-#   78|             1: [ExprStmt] ...;
-#   78|               0: [AssignSubExpr] ... -= ...
-#   78|                 0: [LocalVariableAccess] access to local variable iv3
-#   78|                 1: [LocalVariableAccess] access to local variable iv2
-#   79|             2: [ExprStmt] ...;
-#   79|               0: [AssignMulExpr] ... *= ...
-#   79|                 0: [LocalVariableAccess] access to local variable iv3
-#   79|                 1: [LocalVariableAccess] access to local variable iv2
-#   80|             3: [ExprStmt] ...;
-#   80|               0: [AssignDivExpr] ... /= ...
-#   80|                 0: [LocalVariableAccess] access to local variable iv3
-#   80|                 1: [LocalVariableAccess] access to local variable iv2
-#   85|   3: [Struct] Digit
-#   87|     6: [Field] value
-#   87|       -1: [TypeMention] byte
-#   89|     7: [InstanceConstructor] Digit
-#-----|       2: (Parameters)
-#   89|         0: [Parameter] value
-#   89|           -1: [TypeMention] byte
-#   90|       4: [BlockStmt] {...}
-#   91|         0: [IfStmt] if (...) ...
-#   91|           0: [LogicalOrExpr] ... || ...
-#   91|             0: [LTExpr] ... < ...
-#   91|               0: [CastExpr] (...) ...
-#   91|                 1: [ParameterAccess] access to parameter value
-#   91|               1: [IntLiteral] 0
-#   91|             1: [GTExpr] ... > ...
-#   91|               0: [CastExpr] (...) ...
-#   91|                 1: [ParameterAccess] access to parameter value
-#   91|               1: [IntLiteral] 9
-#   92|           1: [ThrowStmt] throw ...;
-#   92|             0: [ObjectCreation] object creation of type ArgumentException
-#   92|               0: [TypeMention] ArgumentException
-#   93|         1: [ExprStmt] ...;
-#   93|           0: [AssignExpr] ... = ...
-#   93|             0: [FieldAccess] access to field value
-#   93|               -1: [ThisAccess] this access
-#   93|             1: [ParameterAccess] access to parameter value
-#   96|     8: [ImplicitConversionOperator] implicit conversion
-#   96|       -1: [TypeMention] byte
-#-----|       2: (Parameters)
-#   96|         0: [Parameter] d
-#   96|           -1: [TypeMention] Digit
-#   97|       4: [BlockStmt] {...}
-#   98|         0: [ReturnStmt] return ...;
-#   98|           0: [FieldAccess] access to field value
-#   98|             -1: [ParameterAccess] access to parameter d
-#  101|     9: [ExplicitConversionOperator] explicit conversion
-#  101|       -1: [TypeMention] Digit
-#-----|       2: (Parameters)
-#  101|         0: [Parameter] b
-#  101|           -1: [TypeMention] byte
-#  102|       4: [BlockStmt] {...}
-#  103|         0: [ReturnStmt] return ...;
-#  103|           0: [ObjectCreation] object creation of type Digit
-#  103|             -1: [TypeMention] Digit
-#  103|             0: [ParameterAccess] access to parameter b
-#  108|   4: [Class] TestConversionOperator
-#  111|     6: [Method] Main
-#  111|       -1: [TypeMention] Void
-#  112|       4: [BlockStmt] {...}
-#  113|         0: [LocalVariableDeclStmt] ... ...;
-#  113|           0: [LocalVariableDeclAndInitExpr] Digit d = ...
-#  113|             -1: [TypeMention] Digit
-#  113|             0: [LocalVariableAccess] access to local variable d
-#  113|             1: [OperatorCall] call to operator explicit conversion
-#  113|               -1: [TypeMention] Digit
-#  113|               0: [CastExpr] (...) ...
-#  113|                 1: [IntLiteral] 8
-#  114|         1: [LocalVariableDeclStmt] ... ...;
-#  114|           0: [LocalVariableDeclAndInitExpr] Byte b = ...
-#  114|             -1: [TypeMention] byte
-#  114|             0: [LocalVariableAccess] access to local variable b
-#  114|             1: [OperatorCall] call to operator implicit conversion
-#  114|               0: [LocalVariableAccess] access to local variable d
+#   74|         7: [ExprStmt] ...;
+#   74|           0: [AssignMulExpr] ... *= ...
+#   74|             0: [LocalVariableAccess] access to local variable iv3
+#   74|             1: [LocalVariableAccess] access to local variable iv2
+#   75|         8: [ExprStmt] ...;
+#   75|           0: [AssignDivExpr] ... /= ...
+#   75|             0: [LocalVariableAccess] access to local variable iv3
+#   75|             1: [LocalVariableAccess] access to local variable iv2
+#   76|         9: [ExprStmt] ...;
+#   76|           0: [AssignRemExpr] ... %= ...
+#   76|             0: [LocalVariableAccess] access to local variable iv3
+#   76|             1: [LocalVariableAccess] access to local variable iv2
+#   77|         10: [ExprStmt] ...;
+#   77|           0: [AssignAndExpr] ... &= ...
+#   77|             0: [LocalVariableAccess] access to local variable iv3
+#   77|             1: [LocalVariableAccess] access to local variable iv2
+#   78|         11: [ExprStmt] ...;
+#   78|           0: [AssignOrExpr] ... |= ...
+#   78|             0: [LocalVariableAccess] access to local variable iv3
+#   78|             1: [LocalVariableAccess] access to local variable iv2
+#   79|         12: [ExprStmt] ...;
+#   79|           0: [AssignXorExpr] ... ^= ...
+#   79|             0: [LocalVariableAccess] access to local variable iv3
+#   79|             1: [LocalVariableAccess] access to local variable iv2
+#   80|         13: [ExprStmt] ...;
+#   80|           0: [AssignLeftShiftExpr] ... <<= ...
+#   80|             0: [LocalVariableAccess] access to local variable iv3
+#   80|             1: [LocalVariableAccess] access to local variable iv2
+#   81|         14: [ExprStmt] ...;
+#   81|           0: [AssignRightShiftExpr] ... >>= ...
+#   81|             0: [LocalVariableAccess] access to local variable iv3
+#   81|             1: [LocalVariableAccess] access to local variable iv2
+#   82|         15: [ExprStmt] ...;
+#   82|           0: [AssignUnsignedRightShiftExpr] ... >>>= ...
+#   82|             0: [LocalVariableAccess] access to local variable iv3
+#   82|             1: [LocalVariableAccess] access to local variable iv2
+#   84|         16: [CheckedStmt] checked {...}
+#   85|           0: [BlockStmt] {...}
+#   86|             0: [ExprStmt] ...;
+#   86|               0: [AssignAddExpr] ... += ...
+#   86|                 0: [LocalVariableAccess] access to local variable iv3
+#   86|                 1: [LocalVariableAccess] access to local variable iv2
+#   87|             1: [ExprStmt] ...;
+#   87|               0: [AssignSubExpr] ... -= ...
+#   87|                 0: [LocalVariableAccess] access to local variable iv3
+#   87|                 1: [LocalVariableAccess] access to local variable iv2
+#   88|             2: [ExprStmt] ...;
+#   88|               0: [AssignMulExpr] ... *= ...
+#   88|                 0: [LocalVariableAccess] access to local variable iv3
+#   88|                 1: [LocalVariableAccess] access to local variable iv2
+#   89|             3: [ExprStmt] ...;
+#   89|               0: [AssignDivExpr] ... /= ...
+#   89|                 0: [LocalVariableAccess] access to local variable iv3
+#   89|                 1: [LocalVariableAccess] access to local variable iv2
+#   92|         17: [LocalVariableDeclStmt] ... ...;
+#   92|           0: [LocalVariableDeclAndInitExpr] C c = ...
+#   92|             -1: [TypeMention] C
+#   92|             0: [LocalVariableAccess] access to local variable c
+#   92|             1: [ObjectCreation] object creation of type C
+#   92|               0: [TypeMention] C
+#   93|         18: [ExprStmt] ...;
+#   93|           0: [OperatorCall] call to operator ++
+#   93|             0: [LocalVariableAccess] access to local variable c
+#   94|         19: [ExprStmt] ...;
+#   94|           0: [OperatorCall] call to operator ++
+#   94|             0: [LocalVariableAccess] access to local variable c
+#   95|         20: [ExprStmt] ...;
+#   95|           0: [OperatorCall] call to operator --
+#   95|             0: [LocalVariableAccess] access to local variable c
+#   96|         21: [ExprStmt] ...;
+#   96|           0: [OperatorCall] call to operator --
+#   96|             0: [LocalVariableAccess] access to local variable c
+#   98|         22: [CheckedStmt] checked {...}
+#   99|           0: [BlockStmt] {...}
+#  100|             0: [ExprStmt] ...;
+#  100|               0: [OperatorCall] call to operator checked ++
+#  100|                 0: [LocalVariableAccess] access to local variable c
+#  101|             1: [ExprStmt] ...;
+#  101|               0: [OperatorCall] call to operator checked ++
+#  101|                 0: [LocalVariableAccess] access to local variable c
+#  102|             2: [ExprStmt] ...;
+#  102|               0: [OperatorCall] call to operator checked --
+#  102|                 0: [LocalVariableAccess] access to local variable c
+#  103|             3: [ExprStmt] ...;
+#  103|               0: [OperatorCall] call to operator checked --
+#  103|                 0: [LocalVariableAccess] access to local variable c
+#  107|     7: [Struct] Digit
+#  109|       6: [Field] value
+#  109|         -1: [TypeMention] byte
+#  111|       7: [InstanceConstructor] Digit
+#-----|         2: (Parameters)
+#  111|           0: [Parameter] value
+#  111|             -1: [TypeMention] byte
+#  112|         4: [BlockStmt] {...}
+#  113|           0: [IfStmt] if (...) ...
+#  113|             0: [LogicalOrExpr] ... || ...
+#  113|               0: [LTExpr] ... < ...
+#  113|                 0: [CastExpr] (...) ...
+#  113|                   1: [ParameterAccess] access to parameter value
+#  113|                 1: [IntLiteral] 0
+#  113|               1: [GTExpr] ... > ...
+#  113|                 0: [CastExpr] (...) ...
+#  113|                   1: [ParameterAccess] access to parameter value
+#  113|                 1: [IntLiteral] 9
+#  114|             1: [ThrowStmt] throw ...;
+#  114|               0: [ObjectCreation] object creation of type ArgumentException
+#  114|                 0: [TypeMention] ArgumentException
+#  115|           1: [ExprStmt] ...;
+#  115|             0: [AssignExpr] ... = ...
+#  115|               0: [FieldAccess] access to field value
+#  115|                 -1: [ThisAccess] this access
+#  115|               1: [ParameterAccess] access to parameter value
+#  118|       8: [ImplicitConversionOperator] implicit conversion
+#  118|         -1: [TypeMention] byte
+#-----|         2: (Parameters)
+#  118|           0: [Parameter] d
+#  118|             -1: [TypeMention] Digit
+#  119|         4: [BlockStmt] {...}
+#  120|           0: [ReturnStmt] return ...;
+#  120|             0: [FieldAccess] access to field value
+#  120|               -1: [ParameterAccess] access to parameter d
+#  123|       9: [ExplicitConversionOperator] explicit conversion
+#  123|         -1: [TypeMention] Digit
+#-----|         2: (Parameters)
+#  123|           0: [Parameter] b
+#  123|             -1: [TypeMention] byte
+#  124|         4: [BlockStmt] {...}
+#  125|           0: [ReturnStmt] return ...;
+#  125|             0: [ObjectCreation] object creation of type Digit
+#  125|               -1: [TypeMention] Digit
+#  125|               0: [ParameterAccess] access to parameter b
+#  130|     8: [Class] TestConversionOperator
+#  133|       6: [Method] Main
+#  133|         -1: [TypeMention] Void
+#  134|         4: [BlockStmt] {...}
+#  135|           0: [LocalVariableDeclStmt] ... ...;
+#  135|             0: [LocalVariableDeclAndInitExpr] Digit d = ...
+#  135|               -1: [TypeMention] Digit
+#  135|               0: [LocalVariableAccess] access to local variable d
+#  135|               1: [OperatorCall] call to operator explicit conversion
+#  135|                 -1: [TypeMention] Digit
+#  135|                 0: [CastExpr] (...) ...
+#  135|                   1: [IntLiteral] 8
+#  136|           1: [LocalVariableDeclStmt] ... ...;
+#  136|             0: [LocalVariableDeclAndInitExpr] Byte b = ...
+#  136|               -1: [TypeMention] byte
+#  136|               0: [LocalVariableAccess] access to local variable b
+#  136|               1: [OperatorCall] call to operator implicit conversion
+#  136|                 0: [LocalVariableAccess] access to local variable d
diff --git a/csharp/ql/test/library-tests/operators/operators.cs b/csharp/ql/test/library-tests/operators/operators.cs
index 3ff2fe1a26bf..22aee92e36d0 100644
--- a/csharp/ql/test/library-tests/operators/operators.cs
+++ b/csharp/ql/test/library-tests/operators/operators.cs
@@ -48,6 +48,15 @@ public IntVector(int length) { }
         public void operator >>>=(IntVector n) { }
     }
 
+    public class C
+    {
+        // Unary instance operators.
+        public void operator checked ++() { }
+        public void operator ++() { }
+        public void operator checked --() { }
+        public void operator --() { }
+    }
+
     class TestOperator
     {
         void Main()
@@ -79,41 +88,55 @@ void Main()
                 iv3 *= iv2;
                 iv3 /= iv2;
             }
-        }
-    }
 
-    public struct Digit
-    {
-        byte value;
+            var c = new C();
+            c++;
+            ++c;
+            c--;
+            --c;
 
-        public Digit(byte value)
-        {
-            if (value < 0 || value > 9)
-                throw new ArgumentException();
-            this.value = value;
+            checked
+            {
+                c++;
+                ++c;
+                c--;
+                --c;
+            }
         }
 
-        public static implicit operator byte(Digit d)
+        public struct Digit
         {
-            return d.value;
-        }
+            byte value;
 
-        public static explicit operator Digit(byte b)
-        {
-            return new Digit(b);
-        }
+            public Digit(byte value)
+            {
+                if (value < 0 || value > 9)
+                    throw new ArgumentException();
+                this.value = value;
+            }
 
-    }
+            public static implicit operator byte(Digit d)
+            {
+                return d.value;
+            }
 
-    class TestConversionOperator
-    {
+            public static explicit operator Digit(byte b)
+            {
+                return new Digit(b);
+            }
 
-        void Main()
+        }
+
+        class TestConversionOperator
         {
-            Digit d = (Digit)8;
-            byte b = d;
+
+            void Main()
+            {
+                Digit d = (Digit)8;
+                byte b = d;
+            }
+
         }
 
     }
-
 }
diff --git a/csharp/ql/test/library-tests/properties/PrintAst.expected b/csharp/ql/test/library-tests/properties/PrintAst.expected
index 711e417558ed..ef482ed33d06 100644
--- a/csharp/ql/test/library-tests/properties/PrintAst.expected
+++ b/csharp/ql/test/library-tests/properties/PrintAst.expected
@@ -246,3 +246,50 @@ properties.cs:
 #  133|               0: [FieldAccess] access to field Prop.field
 #  133|               1: [ParameterAccess] access to parameter value
 #  130|     7: [Field] Prop.field
+#  137|   11: [RefStruct] S
+#  139|     6: [Field] x
+#  139|       -1: [TypeMention] int
+#  141|     7: [InstanceConstructor] S
+#-----|       2: (Parameters)
+#  141|         0: [Parameter] v
+#  141|           -1: [TypeMention] int
+#  142|       4: [BlockStmt] {...}
+#  143|         0: [ExprStmt] ...;
+#  143|           0: [AssignExpr] ... = ...
+#  143|             0: [FieldAccess] access to field x
+#  143|             1: [RefExpr] ref ...
+#  143|               0: [ParameterAccess] access to parameter v
+#  146|     8: [Property] Prop
+#  146|       -1: [TypeMention] int
+#  148|       3: [Getter] get_Prop
+#  148|         4: [BlockStmt] {...}
+#  148|           0: [ReturnStmt] return ...;
+#  148|             0: [RefExpr] ref ...
+#  148|               0: [FieldAccess] access to field x
+#  152|   12: [Class] TestRefReturns
+#  154|     6: [Method] M
+#  154|       -1: [TypeMention] Void
+#  155|       4: [BlockStmt] {...}
+#  156|         0: [LocalVariableDeclStmt] ... ...;
+#  156|           0: [LocalVariableDeclAndInitExpr] Int32 a = ...
+#  156|             -1: [TypeMention] int
+#  156|             0: [LocalVariableAccess] access to local variable a
+#  156|             1: [IntLiteral] 0
+#  158|         1: [LocalVariableDeclStmt] ... ...;
+#  158|           0: [LocalVariableDeclAndInitExpr] S s = ...
+#  158|             -1: [TypeMention] S
+#  158|             0: [LocalVariableAccess] access to local variable s
+#  158|             1: [ObjectCreation] object creation of type S
+#  158|               -1: [TypeMention] S
+#  158|               0: [LocalVariableAccess] access to local variable a
+#  159|         2: [ExprStmt] ...;
+#  159|           0: [AssignExpr] ... = ...
+#  159|             0: [PropertyCall] access to property Prop
+#  159|               -1: [LocalVariableAccess] access to local variable s
+#  159|             1: [IntLiteral] 1
+#  160|         3: [LocalVariableDeclStmt] ... ...;
+#  160|           0: [LocalVariableDeclAndInitExpr] Int32 x = ...
+#  160|             -1: [TypeMention] int
+#  160|             0: [LocalVariableAccess] access to local variable x
+#  160|             1: [PropertyCall] access to property Prop
+#  160|               -1: [LocalVariableAccess] access to local variable s
diff --git a/csharp/ql/test/library-tests/properties/Properties17.expected b/csharp/ql/test/library-tests/properties/Properties17.expected
index ee817a63df94..74efae145f78 100644
--- a/csharp/ql/test/library-tests/properties/Properties17.expected
+++ b/csharp/ql/test/library-tests/properties/Properties17.expected
@@ -1,5 +1,6 @@
 | Prop.field |
 | caption |
 | next |
+| x |
 | y |
 | z |
diff --git a/csharp/ql/test/library-tests/properties/Properties19.expected b/csharp/ql/test/library-tests/properties/Properties19.expected
new file mode 100644
index 000000000000..7c027119067b
--- /dev/null
+++ b/csharp/ql/test/library-tests/properties/Properties19.expected
@@ -0,0 +1,8 @@
+| properties.cs:12:23:12:29 | Caption | properties.cs:29:13:29:28 | access to property Caption | properties.cs:17:13:17:15 | set_Caption |
+| properties.cs:12:23:12:29 | Caption | properties.cs:30:24:30:39 | access to property Caption | properties.cs:15:13:15:15 | get_Caption |
+| properties.cs:57:20:57:20 | X | properties.cs:61:13:61:13 | access to property X | properties.cs:57:37:57:39 | set_X |
+| properties.cs:58:20:58:20 | Y | properties.cs:62:13:62:13 | access to property Y | properties.cs:58:37:58:39 | set_Y |
+| properties.cs:70:28:70:28 | X | properties.cs:82:46:82:51 | access to property X | properties.cs:70:32:70:34 | get_X |
+| properties.cs:71:28:71:28 | Y | properties.cs:83:39:83:44 | access to property Y | properties.cs:74:13:74:15 | set_Y |
+| properties.cs:146:24:146:27 | Prop | properties.cs:159:13:159:18 | access to property Prop | properties.cs:148:13:148:15 | get_Prop |
+| properties.cs:146:24:146:27 | Prop | properties.cs:160:21:160:26 | access to property Prop | properties.cs:148:13:148:15 | get_Prop |
diff --git a/csharp/ql/test/library-tests/properties/Properties19.ql b/csharp/ql/test/library-tests/properties/Properties19.ql
new file mode 100644
index 000000000000..ea34f1d5635f
--- /dev/null
+++ b/csharp/ql/test/library-tests/properties/Properties19.ql
@@ -0,0 +1,8 @@
+import csharp
+
+from PropertyCall pc, Property p, Accessor target
+where
+  pc.getProperty() = p and
+  pc.getTarget() = target and
+  p.fromSource()
+select p, pc, target
diff --git a/csharp/ql/test/library-tests/properties/properties.cs b/csharp/ql/test/library-tests/properties/properties.cs
index 2f88214ec755..391245e3497e 100644
--- a/csharp/ql/test/library-tests/properties/properties.cs
+++ b/csharp/ql/test/library-tests/properties/properties.cs
@@ -133,4 +133,31 @@ public object Prop
             set { field = value; }
         }
     }
+
+    public ref struct S
+    {
+        private ref int x;
+
+        public S(ref int v)
+        {
+            x = ref v;
+        }
+
+        public ref int Prop
+        {
+            get { return ref x; }
+        }
+    }
+
+    public class TestRefReturns
+    {
+        public void M()
+        {
+            int a = 0;
+
+            S s = new S(ref a);
+            s.Prop = 1;
+            var x = s.Prop;
+        }
+    }
 }
diff --git a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/IsNotOkayCall.expected b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/IsNotOkayCall.expected
index 7555a37394b5..dcdb8b09058c 100644
--- a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/IsNotOkayCall.expected
+++ b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/IsNotOkayCall.expected
@@ -1,3 +1,2 @@
 | Quality.cs:26:19:26:26 | access to indexer | Call without target $@. | Quality.cs:26:19:26:26 | access to indexer | access to indexer |
 | Quality.cs:29:21:29:27 | access to indexer | Call without target $@. | Quality.cs:29:21:29:27 | access to indexer | access to indexer |
-| Quality.cs:32:9:32:21 | access to indexer | Call without target $@. | Quality.cs:32:9:32:21 | access to indexer | access to indexer |
diff --git a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/NoTarget.expected b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/NoTarget.expected
index 7ae469cf84e3..a76dd08cdb6b 100644
--- a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/NoTarget.expected
+++ b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/NoTarget.expected
@@ -9,6 +9,5 @@
 | Quality.cs:23:9:23:30 | delegate call | Call without target $@. | Quality.cs:23:9:23:30 | delegate call | delegate call |
 | Quality.cs:26:19:26:26 | access to indexer | Call without target $@. | Quality.cs:26:19:26:26 | access to indexer | access to indexer |
 | Quality.cs:29:21:29:27 | access to indexer | Call without target $@. | Quality.cs:29:21:29:27 | access to indexer | access to indexer |
-| Quality.cs:32:9:32:21 | access to indexer | Call without target $@. | Quality.cs:32:9:32:21 | access to indexer | access to indexer |
 | Quality.cs:38:16:38:26 | access to property MyProperty2 | Call without target $@. | Quality.cs:38:16:38:26 | access to property MyProperty2 | access to property MyProperty2 |
 | Quality.cs:50:20:50:26 | object creation of type T | Call without target $@. | Quality.cs:50:20:50:26 | object creation of type T | object creation of type T |
diff --git a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/Quality.cs b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/Quality.cs
index 31f4deda5df5..e10ce10f6c4b 100644
--- a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/Quality.cs
+++ b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/Quality.cs
@@ -29,7 +29,7 @@ public Test()
         var slice = sp[..3];        // TODO: this is not an indexer call, but rather a `sp.Slice(0, 3)` call.
 
         Span<byte> guidBytes = stackalloc byte[16];
-        guidBytes[08] = 1;          // TODO: this indexer call has no target, because the target is a `ref` returning getter.
+        guidBytes[08] = 1;
 
         new MyList([new(), new Test()]);
     }
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.25.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.25.5.rst
new file mode 100644
index 000000000000..96ccad2e93e4
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.25.5.rst
@@ -0,0 +1,88 @@
+.. _codeql-cli-2.25.5:
+
+==========================
+CodeQL 2.25.5 (2026-05-21)
+==========================
+
+.. 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/application-security/>`__, `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.25.5 runs a total of 496 security queries when configured with the Default suite (covering 169 CWE). The Extended suite enables an additional 131 queries (covering 32 more CWE).
+
+CodeQL CLI
+----------
+
+There are no user-facing CLI changes in this release.
+
+Query Packs
+-----------
+
+Bug Fixes
+~~~~~~~~~
+
+GitHub Actions
+""""""""""""""
+
+*   Fixed help file descriptions for queries: :code:`actions/untrusted-checkout/critical`, :code:`actions/untrusted-checkout/high`, :code:`actions/untrusted-checkout/medium`. Previously the messages were unclear as to why and how the vulnerabilities could occur.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The 'Cleartext transmission of sensitive information' query (:code:`cpp/cleartext-transmission`) no longer raises an alert on calls to :code:`fscanf` (and variants) when the call reads from an "obviously local" :code:`FILE` stream such as :code:`stdin`.
+
+Java/Kotlin
+"""""""""""
+
+*   The :code:`java/zipslip` query no longer reports archive entry names that flow only to read-only path sinks such as :code:`ClassLoader.getResource`, :code:`FileInputStream`, and :code:`FileReader`. The query now restricts its sinks to the :code:`path-injection` kind and deliberately excludes the new :code:`path-injection[read]` sub-kind, matching the Zip Slip threat model of unsafe archive extraction.
+
+GitHub Actions
+""""""""""""""
+
+*   The :code:`actions/unpinned-tag` query now analyzes composite action metadata (:code:`action.yml`\ /\ :code:`action.yaml` files) in addition to workflow files, providing more comprehensive detection of unpinned action references across the entire Actions ecosystem.
+
+Query Metadata Changes
+~~~~~~~~~~~~~~~~~~~~~~
+
+GitHub Actions
+""""""""""""""
+
+*   Adjusted the name of :code:`actions/untrusted-checkout/high` to more clearly describe which parts of the scenario are in a privileged context.
+
+Language Libraries
+------------------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The :code:`RemoteFlowSourceFunction` model for :code:`fscanf` (and variants) now implements :code:`hasSocketInput` to reflect that these functions may read from a socket.
+
+Java/Kotlin
+"""""""""""
+
+*   Introduced a new sink kind :code:`path-injection[read]` for Models-as-Data rows that only read from a path (such as :code:`ClassLoader.getResource`, :code:`FileInputStream`, :code:`FileReader`, :code:`Files.readAllBytes`, and related APIs). The general :code:`java/path-injection` query continues to consider both :code:`path-injection` and :code:`path-injection[read]` sinks.
+
+GitHub Actions
+""""""""""""""
+
+*   Altered 2 patterns in the :code:`poisonable_steps` modelling. Extra sinks are detected in the following cases: scripts executed via python modules and :code:`go run` in directories are detected as potential mechanisms of injection. For the go execution pattern, the pattern is updated to now ignore flags that occur between go and the specific command. This change may lead to more results being detected by the following queries: :code:`actions/untrusted-checkout/high`, :code:`actions/untrusted-checkout/critical`, :code:`actions/untrusted-checkout-toctou/high`, :code:`actions/untrusted-checkout-toctou/critical`, :code:`actions/cache-poisoning/poisonable-step`, :code:`actions/cache-poisoning/direct-cache` and :code:`actions/artifact-poisoning/path-traversal`.
+
+New Features
+~~~~~~~~~~~~
+
+Swift
+"""""
+
+*   The :code:`TypeDecl` class now defines a :code:`getDeclaredInterfaceType` predicate, which yields the declared interface type of the type declaration.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/index.rst b/docs/codeql/codeql-overview/codeql-changelog/index.rst
index c5d4fee45769..3ed98bad8d18 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.25.5
    codeql-cli-2.25.4
    codeql-cli-2.25.3
    codeql-cli-2.25.2
diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
index 3e1cd49b4ce5..b73c9d7e6e97 100644
--- a/docs/codeql/reusables/supported-versions-compilers.rst
+++ b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -11,23 +11,23 @@
    Microsoft extensions (up to VS 2022),
 
    Arm Compiler 5 [5]_","``.cpp``, ``.c++``, ``.cxx``, ``.hpp``, ``.hh``, ``.h++``, ``.hxx``, ``.c``, ``.cc``, ``.h``"
-   C#,C# up to 14 [6]_,"Microsoft Visual Studio up to 2019 with .NET up to 4.8,
+   C#,C# up to 14,"Microsoft Visual Studio up to 2019 with .NET up to 4.8,
 
    .NET Core up to 3.1
 
-   .NET 5, .NET 6, .NET 7, .NET 8, .NET 9, .NET 10 [6]_","``.sln``, ``.slnx``, ``.csproj``, ``.cs``, ``.cshtml``, ``.xaml``"
+   .NET 5, .NET 6, .NET 7, .NET 8, .NET 9, .NET 10","``.sln``, ``.slnx``, ``.csproj``, ``.cs``, ``.cshtml``, ``.xaml``"
    GitHub Actions,"Not applicable",Not applicable,"``.github/workflows/*.yml``, ``.github/workflows/*.yaml``, ``**/action.yml``, ``**/action.yaml``"
    Go (aka Golang), "Go up to 1.26", "Go 1.11 or more recent", ``.go``
-   Java,"Java 7 to 26 [7]_","javac (OpenJDK and Oracle JDK),
+   Java,"Java 7 to 26 [6]_","javac (OpenJDK and Oracle JDK),
 
-   Eclipse compiler for Java (ECJ) [8]_",``.java``
+   Eclipse compiler for Java (ECJ) [7]_",``.java``
    Kotlin,"Kotlin 1.8.0 to 2.3.2\ *x*","kotlinc",``.kt``
-   JavaScript,ECMAScript 2022 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhtm``, ``.xhtml``, ``.vue``, ``.hbs``, ``.ejs``, ``.njk``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [9]_"
-   Python [10]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13",Not applicable,``.py``
-   Ruby [11]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
-   Rust [12]_,"Rust editions 2021 and 2024","Rust compiler","``.rs``, ``Cargo.toml``"
-   Swift [13]_ [14]_,"Swift 5.4-6.3","Swift compiler","``.swift``"
-   TypeScript [15]_,"2.6-5.9",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
+   JavaScript,ECMAScript 2022 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhtm``, ``.xhtml``, ``.vue``, ``.hbs``, ``.ejs``, ``.njk``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [8]_"
+   Python [9]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13",Not applicable,``.py``
+   Ruby [10]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
+   Rust [11]_,"Rust editions 2021 and 2024","Rust compiler","``.rs``, ``Cargo.toml``"
+   Swift [12]_ [13]_,"Swift 5.4-6.3","Swift compiler","``.swift``"
+   TypeScript [14]_,"2.6-5.9",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
 
 .. container:: footnote-group
 
@@ -36,13 +36,12 @@
     .. [3] Objective-C, Objective-C++, C++/CLI, and C++/CX are not supported.
     .. [4] Support for the clang-cl compiler is preliminary.
     .. [5] Support for the Arm Compiler (armcc) is preliminary.
-    .. [6] Support for .NET 10 is preliminary and code that uses language features new to C# 14 is not yet fully supported for extraction and analysis.
-    .. [7] Builds that execute on Java 7 to 26 can be analyzed. The analysis understands standard language features in Java 8 to 26; "preview" and "incubator" features are not supported. Source code using Java language versions older than Java 8 are analyzed as Java 8 code.
-    .. [8] ECJ is supported when the build invokes it via the Maven Compiler plugin or the Takari Lifecycle plugin.
-    .. [9] JSX and Flow code, YAML, JSON, HTML, and XML files may also be analyzed with JavaScript files.
-    .. [10] The extractor requires Python 3 to run. To analyze Python 2.7 you should install both versions of Python.
-    .. [11] Requires glibc 2.17.
-    .. [12] Requires ``rustup`` and ``cargo`` to be installed. Features from nightly toolchains are not supported.
-    .. [13] Support for the analysis of Swift requires macOS.
-    .. [14] Embedded Swift is not supported.
-    .. [15] TypeScript analysis is performed by running the JavaScript extractor with TypeScript enabled. This is the default.
+    .. [6] Builds that execute on Java 7 to 26 can be analyzed. The analysis understands standard language features in Java 8 to 26; "preview" and "incubator" features are not supported. Source code using Java language versions older than Java 8 are analyzed as Java 8 code.
+    .. [7] ECJ is supported when the build invokes it via the Maven Compiler plugin or the Takari Lifecycle plugin.
+    .. [8] JSX and Flow code, YAML, JSON, HTML, and XML files may also be analyzed with JavaScript files.
+    .. [9] The extractor requires Python 3 to run. To analyze Python 2.7 you should install both versions of Python.
+    .. [10] Requires glibc 2.17.
+    .. [11] Requires ``rustup`` and ``cargo`` to be installed. Features from nightly toolchains are not supported.
+    .. [12] Support for the analysis of Swift requires macOS.
+    .. [13] Embedded Swift is not supported.
+    .. [14] TypeScript analysis is performed by running the JavaScript extractor with TypeScript enabled. This is the default.
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index 512a5732ccd9..14258018aea5 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.51.md b/go/ql/consistency-queries/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/codeql-pack.release.yml b/go/ql/consistency-queries/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/go/ql/consistency-queries/codeql-pack.release.yml
+++ b/go/ql/consistency-queries/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index a3f2fd4897a8..6938858c6ba2 100644
--- a/go/ql/consistency-queries/qlpack.yml
+++ b/go/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-go-consistency-queries
-version: 1.0.50
+version: 1.0.52-dev
 groups:
   - go
   - queries
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index 54afc3a977b8..0d5738ad0293 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 7.1.2
+
+No user-facing changes.
+
 ## 7.1.1
 
 No user-facing changes.
diff --git a/go/ql/lib/change-notes/released/7.1.2.md b/go/ql/lib/change-notes/released/7.1.2.md
new file mode 100644
index 000000000000..d55cf91e2492
--- /dev/null
+++ b/go/ql/lib/change-notes/released/7.1.2.md
@@ -0,0 +1,3 @@
+## 7.1.2
+
+No user-facing changes.
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index 8e970df6cae3..547681cc4408 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.1.1
+lastReleaseVersion: 7.1.2
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index 95fc95a0fc0a..6084bfbfee32 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 7.1.1
+version: 7.1.3-dev
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index 84d9ae7de593..c58883ee3c2a 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6.4
+
+No user-facing changes.
+
 ## 1.6.3
 
 No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.6.4.md b/go/ql/src/change-notes/released/1.6.4.md
new file mode 100644
index 000000000000..5c811dc46384
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.6.4.md
@@ -0,0 +1,3 @@
+## 1.6.4
+
+No user-facing changes.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index 00b51441d882..1910e09d6a6a 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.3
+lastReleaseVersion: 1.6.4
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index df9d76530855..3357004e4666 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.6.3
+version: 1.6.5-dev
 groups:
   - go
   - queries
diff --git a/java/documentation/library-coverage/coverage.csv b/java/documentation/library-coverage/coverage.csv
index f99bbd1ed975..bf78940aabce 100644
--- a/java/documentation/library-coverage/coverage.csv
+++ b/java/documentation/library-coverage/coverage.csv
@@ -1,296 +1,297 @@
-package,sink,source,summary,sink:bean-validation,sink:command-injection,sink:credentials-key,sink:credentials-password,sink:credentials-username,sink:encryption-iv,sink:encryption-salt,sink:environment-injection,sink:file-content-store,sink:fragment-injection,sink:groovy-injection,sink:hostname-verification,sink:html-injection,sink:information-leak,sink:intent-redirection,sink:jexl-injection,sink:jndi-injection,sink:js-injection,sink:ldap-injection,sink:log-injection,sink:mvel-injection,sink:notification,sink:ognl-injection,sink:path-injection,sink:path-injection[read],sink:pending-intents,sink:regex-use,sink:regex-use[-1],sink:regex-use[0],sink:regex-use[],sink:regex-use[f-1],sink:regex-use[f1],sink:regex-use[f],sink:request-forgery,sink:response-splitting,sink:sql-injection,sink:template-injection,sink:trust-boundary-violation,sink:unsafe-deserialization,sink:url-forward,sink:url-redirection,sink:xpath-injection,sink:xslt-injection,source:android-external-storage-dir,source:contentprovider,source:database,source:environment,source:file,source:remote,summary:taint,summary:value
-actions.osgi,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,
-android.app,77,,103,,,,,,,,,,11,,,,,7,,,,,,,42,,,,17,,,,,,,,,,,,,,,,,,,,,,,,18,85
-android.content,24,31,154,,,,,,,,,,,,,,,16,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,4,27,,,,,63,91
-android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,,,41,
-android.net,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,45,15
-android.os,1,2,122,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,2,,,,,,41,81
-android.support.v4.app,11,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-android.util,6,16,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,,
-android.webkit,3,2,,,,,,,,,,,,,,2,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
-android.widget,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,
-androidx.core.app,47,,95,,,,,,,,,,,,,,,,,,,,,,41,,,,6,,,,,,,,,,,,,,,,,,,,,,,,12,83
-androidx.fragment.app,11,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-androidx.slice,2,5,88,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,5,,,,,27,61
-antlr,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-ch.ethz.ssh2,2,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-cn.hutool.core.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.alibaba.com.caucho.hessian.io,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
-com.alibaba.druid.sql,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,1,
-com.alibaba.fastjson2,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.amazonaws.auth,2,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.auth0.jwt.algorithms,6,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.azure.identity,3,,,,,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.caucho.burlap.io,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
-com.caucho.hessian.io,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
-com.cedarsoftware.util.io,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
-com.couchbase.client.core.env,15,,1,,,,9,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.couchbase.client.java,10,,,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,
-com.esotericsoftware.kryo.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.esotericsoftware.kryo5.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.esotericsoftware.yamlbeans,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
-com.fasterxml.jackson.core,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.fasterxml.jackson.databind,2,,8,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,8,
-com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,,,,63,24
-com.google.common.cache,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17
-com.google.common.collect,,,553,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,551
-com.google.common.flogger,29,,,,,,,,,,,,,,,,,,,,,,29,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.google.common.io,10,,73,,,,,,,,,1,,,,,,,,,,,,,,,4,5,,,,,,,,,,,,,,,,,,,,,,,,,72,1
-com.google.gson,,,52,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,38,14
-com.hubspot.jinjava,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,
-com.jcraft.jsch,5,,1,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,1,
-com.microsoft.sqlserver.jdbc,4,,,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.mitchellbosecke.pebble,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,
-com.mongodb,10,,,,,,4,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.opensymphony.xwork2,56,,961,,,,,,,,,,,,,,,,,,,,,,,56,,,,,,,,,,,,,,,,,,,,,,,,,,,867,94
-com.rabbitmq.client,,21,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,7,
-com.sshtools.j2ssh.authentication,3,,,,,,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.sun.crypto.provider,19,,,,,17,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.sun.jndi.ldap,4,,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.sun.net.httpserver,3,,,,,,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.sun.net.ssl,3,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.sun.rowset,3,,,,,,2,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.sun.security.auth.module,2,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.sun.security.ntlm,5,,,,,,3,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.sun.security.sasl.digest,3,,,,,,2,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.thoughtworks.xstream,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.trilead.ssh2,13,,,,,2,4,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.unboundid.ldap.sdk,17,,,,,,,,,,,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-com.zaxxer.hikari,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,
-flexjson,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
-freemarker.cache,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
-freemarker.template,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,,,,
-groovy.lang,26,,,,,,,,,,,,,26,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-groovy.text,1,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-groovy.util,5,,,,,,,,,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-hudson,75,9,2648,,4,,,,,,3,2,,,,4,,,,,,,,,,,39,17,,,,,,,,,6,,,,,,,,,,,,,,5,4,2572,76
-io.jsonwebtoken,,2,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,4,
-io.netty.bootstrap,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,
-io.netty.buffer,,,207,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,130,77
-io.netty.channel,9,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,,,2,,
-io.netty.handler.codec,4,13,259,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,3,,,,,,,,,,,,,,,13,143,116
-io.netty.handler.ssl,4,,,,,,,,,,,,,,,,,,,,,,,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,
-io.netty.handler.stream,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
-io.netty.resolver,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-io.netty.util,2,,23,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,1,,,,,,,,,,,,,,,,21,2
-io.undertow.server.handlers.resource,1,,3,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,3,
-jakarta.activation,2,,2,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,1,,,,,,,,,,,,,,,,2,
-jakarta.faces.context,4,7,,,,,,,,,,,,,,2,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,7,,
-jakarta.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
-jakarta.persistence,2,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,1,
-jakarta.servlet,2,26,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,26,,
-jakarta.ws.rs.client,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-jakarta.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
-jakarta.ws.rs.core,2,,149,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,94,55
-jakarta.xml.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
-java.applet,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,
-java.awt,1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,3
-java.beans,1,,177,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,82,95
-java.io,66,1,225,,,,,,,,,22,,,,,,,,,,,,,,,29,15,,,,,,,,,,,,,,,,,,,,,,,1,,202,23
-java.lang,38,3,790,,13,,,,,,1,,,,,,,,,,,,8,,,,2,9,,,4,,,1,,,,,,,,,,,,,,,,3,,,510,280
-java.math,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9
-java.net,23,3,347,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,,,,,,,,,,,,,,,3,248,99
-java.nio,47,,499,,,,,,,,,5,,,,,,,,,,,,,,,25,16,,,,,,,,,1,,,,,,,,,,,,,,,,302,197
-java.rmi,,,68,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,45,23
-java.security,21,,583,,,11,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,285,298
-java.sql,15,1,292,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,9,,,,,,,,,,1,,,,274,18
-java.text,,,154,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,72,82
-java.time,,,131,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,104
-java.util,48,2,1340,,,,,,,,,1,,,,,,,,,,,34,,,,3,,,,,5,2,,1,2,,,,,,,,,,,,,,2,,,558,782
-javafx.scene.web,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-javax.accessibility,,,63,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,28,35
-javax.activation,2,,7,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,1,,,,,,,,,,,,,,,,7,
-javax.annotation.processing,,,28,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,25,3
-javax.crypto,19,,140,,,12,3,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,76,64
-javax.faces.context,4,7,,,,,,,,,,,,,,2,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,7,,
-javax.imageio,1,,304,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,138,166
-javax.jms,,9,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,57,
-javax.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
-javax.lang.model,,,277,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,217,60
-javax.management,2,,766,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,363,403
-javax.naming,7,,341,,,,,,,,,,,,,,,,,6,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,191,150
-javax.net,4,,136,,,,2,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,87,49
-javax.portlet,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
-javax.print,2,,133,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,102,31
-javax.rmi.ssl,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6
-javax.script,1,,50,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,36
-javax.security.auth,7,,147,,,4,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,50,97
-javax.security.cert,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,
-javax.security.sasl,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,42,7
-javax.servlet,10,29,3,,,,,,,,,,,,,,1,,,,,,,,,,,2,,,,,,,,,,3,,,2,,2,,,,,,,,,29,3,
-javax.smartcardio,,,34,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,10
-javax.sound.midi,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,51,9
-javax.sound.sampled,,,90,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,53,37
-javax.sql,7,,126,,,,4,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,68,58
-javax.tools,,,66,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,62,4
-javax.transaction.xa,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-javax.validation,1,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,
-javax.ws.rs.client,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-javax.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
-javax.ws.rs.core,3,,149,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,2,,,,,,,,,94,55
-javax.xml.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
-javax.xml.catalog,,,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,1
-javax.xml.crypto,,,269,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,172,97
-javax.xml.datatype,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,1
-javax.xml.namespace,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,10
-javax.xml.parsers,,,37,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,35,2
-javax.xml.stream,,,221,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,201,20
-javax.xml.transform,2,,134,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,1,,,,,,,72,62
-javax.xml.validation,,,29,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,29,
-javax.xml.xpath,3,,26,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,26,
-jenkins,,,523,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,500,23
-jodd.json,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10
-kotlin,16,,1849,,,,,,,,,,,,,,,,,,,,,,,,11,3,,,,,,,,,2,,,,,,,,,,,,,,,,1836,13
-liquibase.database.jvm,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-liquibase.statement.core,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-net.lingala.zip4j,2,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,
-net.schmizz.sshj,4,,,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-net.sf.json,2,,338,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,321,17
-net.sf.saxon.s9api,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,,,
-ognl,6,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-okhttp3,4,,50,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,23,27
-org.acegisecurity,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,49,
-org.antlr.runtime,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.codec,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,
-org.apache.commons.collections,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
-org.apache.commons.collections4,,,806,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,789
-org.apache.commons.compress.archivers.tar,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
-org.apache.commons.exec,10,,,,6,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.fileupload,,11,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,4,
-org.apache.commons.httpclient.util,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.commons.io,124,,570,,,,,,,,,4,,,,,,,,,,,,,,,102,3,,,,,,,,,15,,,,,,,,,,,,,,,,556,14
-org.apache.commons.jelly,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,
-org.apache.commons.jexl2,15,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.jexl3,15,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.lang,1,,767,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,596,171
-org.apache.commons.lang3,7,,425,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,1,,,,,,,,,,,294,131
-org.apache.commons.logging,6,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.net,13,12,,,,,2,2,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,6,,,,,,,,,,,,,,,12,,
-org.apache.commons.ognl,6,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.text,,,272,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,220,52
-org.apache.cxf.catalog,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-org.apache.cxf.common.classloader,3,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,2,,,,,,,,,,,,,,,,,
-org.apache.cxf.common.jaxb,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.common.logging,6,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.configuration.jsse,2,,,,,,,,,,,,,,1,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.helpers,10,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,,,,,,,,,,,,,5,,,,,,,,,
-org.apache.cxf.resource,9,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,5,,,,,,,,,,,,,,,,,
-org.apache.cxf.staxutils,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.tools.corba.utils,4,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.tools.util,10,,,,,,,,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.transform,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,
-org.apache.directory.ldap.client.api,1,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.hadoop.fs,3,,11,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,11,
-org.apache.hadoop.hive.metastore,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
-org.apache.hadoop.hive.ql.exec,1,,1,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.hadoop.hive.ql.metadata,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.hc.client5.http.async.methods,84,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,84,,,,,,,,,,,,,,,,,
-org.apache.hc.client5.http.classic.methods,37,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,37,,,,,,,,,,,,,,,,,
-org.apache.hc.client5.http.fluent,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,,,,
-org.apache.hc.core5.benchmark,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-org.apache.hc.core5.function,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.hc.core5.http,73,2,45,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,72,,,,,,,,,,,,,,,2,45,
-org.apache.hc.core5.net,,,18,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,
-org.apache.hc.core5.util,,,24,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,6
-org.apache.hive.hcatalog.templeton,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-org.apache.http,48,3,95,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,46,,,,,,,,,,,,,,,3,86,9
-org.apache.ibatis.jdbc,6,,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,57,
-org.apache.ibatis.mapping,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.log4j,11,,,,,,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.logging.log4j,359,,8,,,,,,,,,,,,,,,,,,,,359,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4
-org.apache.shiro.authc,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,
-org.apache.shiro.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.shiro.jndi,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.shiro.mgt,1,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.sshd.client.session,3,,,,,,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.struts.beanvalidation.validation.interceptor,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
-org.apache.struts2,14,,3873,,,,,,,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,,3,,,,,,,,,,,,3839,34
-org.apache.tools.ant,14,,,,1,,,,,,,,,,,,,,,,,,,,,,5,8,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.tools.zip,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.velocity.app,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,
-org.apache.velocity.runtime,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,
-org.codehaus.cargo.container.installer,3,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-org.codehaus.groovy.control,1,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.dom4j,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,,,
-org.eclipse.jetty.client,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,
-org.exolab.castor.xml,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
-org.fusesource.leveldbjni,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.geogebra.web.full.main,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,
-org.gradle.api.file,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
-org.hibernate,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,
-org.ho.yaml,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,,,,,
-org.influxdb,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-org.jabsorb,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
-org.jboss.logging,324,,,,,,,,,,,,,,,,,,,,,,324,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.jboss.vfs,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.jdbi.v3.core,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,
-org.jenkins.ui.icon,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,48,1
-org.jenkins.ui.symbol,,,33,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,25,8
-org.jooq,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-org.json,,,236,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,198,38
-org.keycloak.models.map.storage,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-org.kohsuke.stapler,20,24,363,,,,,,,,,,,,,2,,,,,,,,,,,8,1,,,,,,,,,3,,,,,,1,5,,,,,,,,24,352,11
-org.lastaflute.web,,1,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,4,
-org.mvel2,16,,,,,,,,,,,,,,,,,,,,,,,16,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.openjdk.jmh.runner.options,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.owasp.esapi,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.pac4j.jwt.config.encryption,4,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.pac4j.jwt.config.signature,4,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.scijava.log,13,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.slf4j,55,,6,,,,,,,,,,,,,,,,,,,,55,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,4
-org.springframework.beans,,,30,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,30
-org.springframework.boot.jdbc,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-org.springframework.cache,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13
-org.springframework.context,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
-org.springframework.core.io,17,,6,,,,,,,,,,,,,,,,,,,,,,,,16,,,,,,,,,,1,,,,,,,,,,,,,,,,6,
-org.springframework.data.repository,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
-org.springframework.http,14,,77,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,67,10
-org.springframework.jdbc.core,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,,
-org.springframework.jdbc.datasource,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,
-org.springframework.jdbc.object,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,,,
-org.springframework.jndi,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.springframework.ldap,47,,,,,,,,,,,,,,,,,,,33,,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.springframework.security.core.userdetails,2,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.springframework.security.web.savedrequest,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,
-org.springframework.ui,,,32,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,32
-org.springframework.util,10,,142,,,,,,,,,,,,,,,,,,,,,,,,9,1,,,,,,,,,,,,,,,,,,,,,,,,,90,52
-org.springframework.validation,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,
-org.springframework.web.client,13,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,3,,
-org.springframework.web.context.request,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,
-org.springframework.web.multipart,,12,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,
-org.springframework.web.portlet,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,
-org.springframework.web.reactive.function.client,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,
-org.springframework.web.servlet,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,
-org.springframework.web.socket,,8,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,6,
-org.springframework.web.util,,9,159,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,134,25
-org.thymeleaf,2,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,2,
-org.xml.sax,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.xmlpull.v1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,
-org.yaml.snakeyaml,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-play.libs.ws,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,
-play.mvc,1,13,24,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,13,24,
-ratpack.core.form,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
-ratpack.core.handling,,6,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,4,
-ratpack.core.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
-ratpack.exec,,,48,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,48
-ratpack.form,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
-ratpack.func,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,35
-ratpack.handling,,6,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,4,
-ratpack.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
-ratpack.util,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,35
-retrofit2,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,1,
-software.amazon.awssdk.transfer.s3.model,8,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.jvmstat.perfdata.monitor.protocol.local,3,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.jvmstat.perfdata.monitor.protocol.rmi,1,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.misc,3,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.net.ftp,5,,,,,,2,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.net.www.protocol.http,3,,,,,,2,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.security.acl,1,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.security.jgss.krb5,2,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.security.krb5,9,,,,,3,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.security.pkcs,4,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.security.pkcs11,3,,,,,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.security.provider,2,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.security.ssl,3,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.security.x509,1,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.tools.jconsole,28,,,,,,13,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+package,sink,source,summary,sink:bean-validation,sink:command-injection,sink:credentials-key,sink:credentials-password,sink:credentials-username,sink:encryption-iv,sink:encryption-salt,sink:environment-injection,sink:file-content-store,sink:fragment-injection,sink:groovy-injection,sink:hostname-verification,sink:html-injection,sink:information-leak,sink:intent-redirection,sink:jexl-injection,sink:jndi-injection,sink:js-injection,sink:ldap-injection,sink:log-injection,sink:mvel-injection,sink:notification,sink:ognl-injection,sink:path-injection,sink:path-injection[read],sink:pending-intents,sink:regex-use,sink:regex-use[-1],sink:regex-use[0],sink:regex-use[],sink:regex-use[f-1],sink:regex-use[f1],sink:regex-use[f],sink:request-forgery,sink:response-splitting,sink:sql-injection,sink:template-injection,sink:trust-boundary-violation,sink:unsafe-deserialization,sink:url-forward,sink:url-redirection,sink:xpath-injection,sink:xslt-injection,source:android-external-storage-dir,source:commandargs,source:contentprovider,source:database,source:environment,source:file,source:remote,summary:taint,summary:value
+actions.osgi,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,
+android.app,77,,103,,,,,,,,,,11,,,,,7,,,,,,,42,,,,17,,,,,,,,,,,,,,,,,,,,,,,,,18,85
+android.content,24,31,154,,,,,,,,,,,,,,,16,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,4,,27,,,,,63,91
+android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,,,,41,
+android.net,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,45,15
+android.os,1,2,122,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,2,,,,,,,41,81
+android.support.v4.app,11,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+android.util,6,16,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,,
+android.webkit,3,2,,,,,,,,,,,,,,2,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
+android.widget,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,
+androidx.core.app,47,,95,,,,,,,,,,,,,,,,,,,,,,41,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,12,83
+androidx.fragment.app,11,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+androidx.slice,2,5,88,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,5,,,,,27,61
+antlr,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+ch.ethz.ssh2,2,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+cn.hutool.core.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.alibaba.com.caucho.hessian.io,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,
+com.alibaba.druid.sql,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,1,
+com.alibaba.fastjson2,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.amazonaws.auth,2,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.auth0.jwt.algorithms,6,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.azure.identity,3,,,,,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.caucho.burlap.io,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
+com.caucho.hessian.io,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,
+com.cedarsoftware.util.io,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,
+com.couchbase.client.core.env,15,,1,,,,9,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.couchbase.client.java,10,,,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,
+com.esotericsoftware.kryo.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.esotericsoftware.kryo5.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.esotericsoftware.yamlbeans,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
+com.fasterxml.jackson.core,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.fasterxml.jackson.databind,2,,8,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,8,
+com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,,,,,63,24
+com.google.common.cache,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17
+com.google.common.collect,,,553,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,551
+com.google.common.flogger,29,,,,,,,,,,,,,,,,,,,,,,29,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.google.common.io,10,,73,,,,,,,,,1,,,,,,,,,,,,,,,4,5,,,,,,,,,,,,,,,,,,,,,,,,,,72,1
+com.google.gson,,,52,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,38,14
+com.hubspot.jinjava,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,
+com.jcraft.jsch,5,,1,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,1,
+com.microsoft.sqlserver.jdbc,4,,,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.mitchellbosecke.pebble,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,
+com.mongodb,10,,,,,,4,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.opensymphony.xwork2,56,,961,,,,,,,,,,,,,,,,,,,,,,,56,,,,,,,,,,,,,,,,,,,,,,,,,,,,867,94
+com.rabbitmq.client,,21,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,7,
+com.sshtools.j2ssh.authentication,3,,,,,,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.sun.crypto.provider,19,,,,,17,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.sun.jndi.ldap,4,,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.sun.net.httpserver,3,,,,,,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.sun.net.ssl,3,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.sun.rowset,3,,,,,,2,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.sun.security.auth.module,2,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.sun.security.ntlm,5,,,,,,3,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.sun.security.sasl.digest,3,,,,,,2,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.thoughtworks.xstream,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.trilead.ssh2,13,,,,,2,4,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.unboundid.ldap.sdk,17,,,,,,,,,,,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.zaxxer.hikari,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,
+flexjson,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
+freemarker.cache,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
+freemarker.template,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,,,,,
+groovy.lang,26,,,,,,,,,,,,,26,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+groovy.text,1,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+groovy.util,5,,,,,,,,,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+hudson,75,9,2648,,4,,,,,,3,2,,,,4,,,,,,,,,,,39,17,,,,,,,,,6,,,,,,,,,,,,,,,5,4,2572,76
+io.jsonwebtoken,,2,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,4,
+io.netty.bootstrap,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,
+io.netty.buffer,,,207,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,130,77
+io.netty.channel,9,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,,,,2,,
+io.netty.handler.codec,4,13,259,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,3,,,,,,,,,,,,,,,,13,143,116
+io.netty.handler.ssl,4,,,,,,,,,,,,,,,,,,,,,,,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,
+io.netty.handler.stream,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
+io.netty.resolver,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+io.netty.util,2,,23,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,1,,,,,,,,,,,,,,,,,21,2
+io.undertow.server.handlers.resource,1,,3,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+jakarta.activation,2,,2,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,1,,,,,,,,,,,,,,,,,2,
+jakarta.faces.context,4,7,,,,,,,,,,,,,,2,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,7,,
+jakarta.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
+jakarta.persistence,2,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,1,
+jakarta.servlet,2,26,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,26,,
+jakarta.ws.rs.client,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+jakarta.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
+jakarta.ws.rs.core,2,,149,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,94,55
+jakarta.xml.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
+java.applet,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,
+java.awt,1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,3
+java.beans,1,,177,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,82,95
+java.io,66,1,225,,,,,,,,,22,,,,,,,,,,,,,,,29,15,,,,,,,,,,,,,,,,,,,,,,,,1,,202,23
+java.lang,38,3,790,,13,,,,,,1,,,,,,,,,,,,8,,,,2,9,,,4,,,1,,,,,,,,,,,,,,,,,3,,,510,280
+java.math,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9
+java.net,23,3,347,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,,,,,,,,,,,,,,,,3,248,99
+java.nio,47,,499,,,,,,,,,5,,,,,,,,,,,,,,,25,16,,,,,,,,,1,,,,,,,,,,,,,,,,,302,197
+java.rmi,,,68,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,45,23
+java.security,21,,583,,,11,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,285,298
+java.sql,15,1,292,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,9,,,,,,,,,,,1,,,,274,18
+java.text,,,154,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,72,82
+java.time,,,131,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,104
+java.util,48,2,1340,,,,,,,,,1,,,,,,,,,,,34,,,,3,,,,,5,2,,1,2,,,,,,,,,,,,,,,2,,,558,782
+javafx.scene.web,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+javax.accessibility,,,63,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,28,35
+javax.activation,2,,7,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,1,,,,,,,,,,,,,,,,,7,
+javax.annotation.processing,,,28,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,25,3
+javax.crypto,19,,140,,,12,3,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,76,64
+javax.faces.context,4,7,,,,,,,,,,,,,,2,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,7,,
+javax.imageio,1,,304,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,138,166
+javax.jms,,9,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,57,
+javax.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
+javax.lang.model,,,277,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,217,60
+javax.management,2,,766,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,363,403
+javax.naming,7,,341,,,,,,,,,,,,,,,,,6,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,191,150
+javax.net,4,,136,,,,2,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,87,49
+javax.portlet,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
+javax.print,2,,133,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,102,31
+javax.rmi.ssl,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6
+javax.script,1,,50,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,36
+javax.security.auth,7,,147,,,4,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,50,97
+javax.security.cert,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,
+javax.security.sasl,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,42,7
+javax.servlet,10,29,3,,,,,,,,,,,,,,1,,,,,,,,,,,2,,,,,,,,,,3,,,2,,2,,,,,,,,,,29,3,
+javax.smartcardio,,,34,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,10
+javax.sound.midi,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,51,9
+javax.sound.sampled,,,90,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,53,37
+javax.sql,7,,126,,,,4,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,68,58
+javax.tools,,,66,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,62,4
+javax.transaction.xa,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+javax.validation,1,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,
+javax.ws.rs.client,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+javax.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
+javax.ws.rs.core,3,,149,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,2,,,,,,,,,,94,55
+javax.xml.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
+javax.xml.catalog,,,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,1
+javax.xml.crypto,,,269,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,172,97
+javax.xml.datatype,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,1
+javax.xml.namespace,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,10
+javax.xml.parsers,,,37,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,35,2
+javax.xml.stream,,,221,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,201,20
+javax.xml.transform,2,,134,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,72,62
+javax.xml.validation,,,29,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,29,
+javax.xml.xpath,3,,26,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,26,
+jenkins,,,523,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,500,23
+jodd.json,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10
+kotlin,16,,1849,,,,,,,,,,,,,,,,,,,,,,,,11,3,,,,,,,,,2,,,,,,,,,,,,,,,,,1836,13
+liquibase.database.jvm,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
+liquibase.statement.core,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
+net.lingala.zip4j,2,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+net.schmizz.sshj,4,,,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+net.sf.json,2,,338,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,321,17
+net.sf.saxon.s9api,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,,,,
+ognl,6,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+okhttp3,4,,50,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,23,27
+org.acegisecurity,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,49,
+org.antlr.runtime,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.avro,18,19,,,,,,,,,,,,,,,,,,,,,,,,,17,,,,,,,,,,1,,,,,,,,,,,1,,,,17,1,,
+org.apache.commons.codec,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,
+org.apache.commons.collections,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
+org.apache.commons.collections4,,,806,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,789
+org.apache.commons.compress.archivers.tar,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
+org.apache.commons.exec,10,,,,6,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.fileupload,,11,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,4,
+org.apache.commons.httpclient.util,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.commons.io,124,,570,,,,,,,,,4,,,,,,,,,,,,,,,102,3,,,,,,,,,15,,,,,,,,,,,,,,,,,556,14
+org.apache.commons.jelly,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,
+org.apache.commons.jexl2,15,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.jexl3,15,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.lang,1,,767,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,596,171
+org.apache.commons.lang3,7,,425,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,1,,,,,,,,,,,,294,131
+org.apache.commons.logging,6,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.net,13,12,,,,,2,2,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,6,,,,,,,,,,,,,,,,12,,
+org.apache.commons.ognl,6,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.text,,,272,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,220,52
+org.apache.cxf.catalog,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+org.apache.cxf.common.classloader,3,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,2,,,,,,,,,,,,,,,,,,
+org.apache.cxf.common.jaxb,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.common.logging,6,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.configuration.jsse,2,,,,,,,,,,,,,,1,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.helpers,10,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,,,,,,,,,,,,,5,,,,,,,,,,
+org.apache.cxf.resource,9,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,5,,,,,,,,,,,,,,,,,,
+org.apache.cxf.staxutils,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.tools.corba.utils,4,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.tools.util,10,,,,,,,,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.transform,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,
+org.apache.directory.ldap.client.api,1,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.hadoop.fs,3,,11,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,11,
+org.apache.hadoop.hive.metastore,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,
+org.apache.hadoop.hive.ql.exec,1,,1,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.hadoop.hive.ql.metadata,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.hc.client5.http.async.methods,84,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,84,,,,,,,,,,,,,,,,,,
+org.apache.hc.client5.http.classic.methods,37,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,37,,,,,,,,,,,,,,,,,,
+org.apache.hc.client5.http.fluent,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,,,,,
+org.apache.hc.core5.benchmark,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+org.apache.hc.core5.function,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.hc.core5.http,73,2,45,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,72,,,,,,,,,,,,,,,,2,45,
+org.apache.hc.core5.net,,,18,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,
+org.apache.hc.core5.util,,,24,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,6
+org.apache.hive.hcatalog.templeton,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
+org.apache.http,48,3,95,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,46,,,,,,,,,,,,,,,,3,86,9
+org.apache.ibatis.jdbc,6,,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,57,
+org.apache.ibatis.mapping,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.log4j,11,,,,,,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.logging.log4j,359,,8,,,,,,,,,,,,,,,,,,,,359,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4
+org.apache.shiro.authc,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,
+org.apache.shiro.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.shiro.jndi,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.shiro.mgt,1,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.sshd.client.session,3,,,,,,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.struts.beanvalidation.validation.interceptor,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
+org.apache.struts2,14,,3873,,,,,,,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,,3,,,,,,,,,,,,,3839,34
+org.apache.tools.ant,14,,,,1,,,,,,,,,,,,,,,,,,,,,,5,8,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.tools.zip,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.velocity.app,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,
+org.apache.velocity.runtime,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,
+org.codehaus.cargo.container.installer,3,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+org.codehaus.groovy.control,1,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.dom4j,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,,,,
+org.eclipse.jetty.client,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,
+org.exolab.castor.xml,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
+org.fusesource.leveldbjni,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.geogebra.web.full.main,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
+org.gradle.api.file,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+org.hibernate,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,
+org.ho.yaml,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,,,,,,
+org.influxdb,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+org.jabsorb,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
+org.jboss.logging,324,,,,,,,,,,,,,,,,,,,,,,324,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.jboss.vfs,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.jdbi.v3.core,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,
+org.jenkins.ui.icon,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,48,1
+org.jenkins.ui.symbol,,,33,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,25,8
+org.jooq,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
+org.json,,,236,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,198,38
+org.keycloak.models.map.storage,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
+org.kohsuke.stapler,20,24,363,,,,,,,,,,,,,2,,,,,,,,,,,8,1,,,,,,,,,3,,,,,,1,5,,,,,,,,,24,352,11
+org.lastaflute.web,,1,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,4,
+org.mvel2,16,,,,,,,,,,,,,,,,,,,,,,,16,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.openjdk.jmh.runner.options,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.owasp.esapi,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.pac4j.jwt.config.encryption,4,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.pac4j.jwt.config.signature,4,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.scijava.log,13,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.slf4j,55,,6,,,,,,,,,,,,,,,,,,,,55,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,4
+org.springframework.beans,,,30,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,30
+org.springframework.boot.jdbc,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+org.springframework.cache,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13
+org.springframework.context,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+org.springframework.core.io,17,,6,,,,,,,,,,,,,,,,,,,,,,,,16,,,,,,,,,,1,,,,,,,,,,,,,,,,,6,
+org.springframework.data.repository,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
+org.springframework.http,14,,77,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,67,10
+org.springframework.jdbc.core,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,,,
+org.springframework.jdbc.datasource,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,
+org.springframework.jdbc.object,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,,,,
+org.springframework.jndi,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.springframework.ldap,47,,,,,,,,,,,,,,,,,,,33,,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.springframework.security.core.userdetails,2,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.springframework.security.web.savedrequest,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,
+org.springframework.ui,,,32,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,32
+org.springframework.util,10,,142,,,,,,,,,,,,,,,,,,,,,,,,9,1,,,,,,,,,,,,,,,,,,,,,,,,,,90,52
+org.springframework.validation,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,
+org.springframework.web.client,13,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,3,,
+org.springframework.web.context.request,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,
+org.springframework.web.multipart,,12,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,
+org.springframework.web.portlet,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
+org.springframework.web.reactive.function.client,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,
+org.springframework.web.servlet,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
+org.springframework.web.socket,,8,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,6,
+org.springframework.web.util,,9,159,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,134,25
+org.thymeleaf,2,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,2,
+org.xml.sax,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.xmlpull.v1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,
+org.yaml.snakeyaml,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+play.libs.ws,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,
+play.mvc,1,13,24,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,13,24,
+ratpack.core.form,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+ratpack.core.handling,,6,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,4,
+ratpack.core.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
+ratpack.exec,,,48,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,48
+ratpack.form,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+ratpack.func,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,35
+ratpack.handling,,6,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,4,
+ratpack.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
+ratpack.util,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,35
+retrofit2,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,1,
+software.amazon.awssdk.transfer.s3.model,8,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.jvmstat.perfdata.monitor.protocol.local,3,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.jvmstat.perfdata.monitor.protocol.rmi,1,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.misc,3,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.net.ftp,5,,,,,,2,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.net.www.protocol.http,3,,,,,,2,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.security.acl,1,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.security.jgss.krb5,2,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.security.krb5,9,,,,,3,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.security.pkcs,4,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.security.pkcs11,3,,,,,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.security.provider,2,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.security.ssl,3,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.security.x509,1,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+sun.tools.jconsole,28,,,,,,13,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/java/documentation/library-coverage/coverage.rst b/java/documentation/library-coverage/coverage.rst
index 5a3c8f168942..6b02a86a3c95 100644
--- a/java/documentation/library-coverage/coverage.rst
+++ b/java/documentation/library-coverage/coverage.rst
@@ -40,6 +40,6 @@ Java framework & library support
    `Spring <https://spring.io/>`_,``org.springframework.*``,46,494,143,26,,28,14,,35
    `Thymeleaf <https://www.thymeleaf.org/>`_,``org.thymeleaf``,,2,2,,,,,,
    `jOOQ <https://www.jooq.org/>`_,``org.jooq``,,,1,,,1,,,
-   Others,"``actions.osgi``, ``antlr``, ``ch.ethz.ssh2``, ``cn.hutool.core.codec``, ``com.alibaba.com.caucho.hessian.io``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.amazonaws.auth``, ``com.auth0.jwt.algorithms``, ``com.azure.identity``, ``com.caucho.burlap.io``, ``com.caucho.hessian.io``, ``com.cedarsoftware.util.io``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.esotericsoftware.yamlbeans``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.microsoft.sqlserver.jdbc``, ``com.mitchellbosecke.pebble``, ``com.opensymphony.xwork2``, ``com.sshtools.j2ssh.authentication``, ``com.sun.crypto.provider``, ``com.sun.jndi.ldap``, ``com.sun.net.httpserver``, ``com.sun.net.ssl``, ``com.sun.rowset``, ``com.sun.security.auth.module``, ``com.sun.security.ntlm``, ``com.sun.security.sasl.digest``, ``com.thoughtworks.xstream``, ``com.trilead.ssh2``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``hudson``, ``io.jsonwebtoken``, ``io.undertow.server.handlers.resource``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``liquibase.database.jvm``, ``liquibase.statement.core``, ``net.lingala.zip4j``, ``net.schmizz.sshj``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.fileupload``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hadoop.hive.ql.exec``, ``org.apache.hadoop.hive.ql.metadata``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.ibatis.mapping``, ``org.apache.log4j``, ``org.apache.shiro.authc``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.shiro.mgt``, ``org.apache.sshd.client.session``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.codehaus.cargo.container.installer``, ``org.dom4j``, ``org.exolab.castor.xml``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.ho.yaml``, ``org.influxdb``, ``org.jabsorb``, ``org.jboss.vfs``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.keycloak.models.map.storage``, ``org.kohsuke.stapler``, ``org.lastaflute.web``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.pac4j.jwt.config.encryption``, ``org.pac4j.jwt.config.signature``, ``org.scijava.log``, ``org.xml.sax``, ``org.xmlpull.v1``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``software.amazon.awssdk.transfer.s3.model``, ``sun.jvmstat.perfdata.monitor.protocol.local``, ``sun.jvmstat.perfdata.monitor.protocol.rmi``, ``sun.misc``, ``sun.net.ftp``, ``sun.net.www.protocol.http``, ``sun.security.acl``, ``sun.security.jgss.krb5``, ``sun.security.krb5``, ``sun.security.pkcs``, ``sun.security.pkcs11``, ``sun.security.provider``, ``sun.security.ssl``, ``sun.security.x509``, ``sun.tools.jconsole``",108,6034,757,131,6,14,18,,185
-   Totals,,363,26381,2684,404,16,137,33,1,409
+   Others,"``actions.osgi``, ``antlr``, ``ch.ethz.ssh2``, ``cn.hutool.core.codec``, ``com.alibaba.com.caucho.hessian.io``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.amazonaws.auth``, ``com.auth0.jwt.algorithms``, ``com.azure.identity``, ``com.caucho.burlap.io``, ``com.caucho.hessian.io``, ``com.cedarsoftware.util.io``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.esotericsoftware.yamlbeans``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.microsoft.sqlserver.jdbc``, ``com.mitchellbosecke.pebble``, ``com.opensymphony.xwork2``, ``com.sshtools.j2ssh.authentication``, ``com.sun.crypto.provider``, ``com.sun.jndi.ldap``, ``com.sun.net.httpserver``, ``com.sun.net.ssl``, ``com.sun.rowset``, ``com.sun.security.auth.module``, ``com.sun.security.ntlm``, ``com.sun.security.sasl.digest``, ``com.thoughtworks.xstream``, ``com.trilead.ssh2``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``hudson``, ``io.jsonwebtoken``, ``io.undertow.server.handlers.resource``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``liquibase.database.jvm``, ``liquibase.statement.core``, ``net.lingala.zip4j``, ``net.schmizz.sshj``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.avro``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.fileupload``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hadoop.hive.ql.exec``, ``org.apache.hadoop.hive.ql.metadata``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.ibatis.mapping``, ``org.apache.log4j``, ``org.apache.shiro.authc``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.shiro.mgt``, ``org.apache.sshd.client.session``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.codehaus.cargo.container.installer``, ``org.dom4j``, ``org.exolab.castor.xml``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.ho.yaml``, ``org.influxdb``, ``org.jabsorb``, ``org.jboss.vfs``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.keycloak.models.map.storage``, ``org.kohsuke.stapler``, ``org.lastaflute.web``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.pac4j.jwt.config.encryption``, ``org.pac4j.jwt.config.signature``, ``org.scijava.log``, ``org.xml.sax``, ``org.xmlpull.v1``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``software.amazon.awssdk.transfer.s3.model``, ``sun.jvmstat.perfdata.monitor.protocol.local``, ``sun.jvmstat.perfdata.monitor.protocol.rmi``, ``sun.misc``, ``sun.net.ftp``, ``sun.net.www.protocol.http``, ``sun.security.acl``, ``sun.security.jgss.krb5``, ``sun.security.krb5``, ``sun.security.pkcs``, ``sun.security.pkcs11``, ``sun.security.provider``, ``sun.security.ssl``, ``sun.security.x509``, ``sun.tools.jconsole``",127,6034,775,148,6,14,18,,186
+   Totals,,382,26381,2702,421,16,137,33,1,410
 
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/maven-fetches.expected b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/maven-fetches.expected
index f4c4dab94565..208ca501487a 100644
--- a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/maven-fetches.expected
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/maven-fetches.expected
@@ -1,18 +1,18 @@
 Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.pom
 Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
 Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-base/2.14.1/jackson-base-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-bom/2.14.1/jackson-bom-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-parent/2.14/jackson-parent-2.14.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/oss-parent/48/oss-parent-48.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL/depgraph-maven-plugin-4.0.3-CodeQL.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL/depgraph-maven-plugin-4.0.3-CodeQL.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.18.6/jackson-annotations-2.18.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.18.6/jackson-annotations-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.18.6/jackson-core-2.18.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.18.6/jackson-core-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.18.6/jackson-databind-2.18.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.18.6/jackson-databind-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-base/2.18.6/jackson-base-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-bom/2.18.6/jackson-bom-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-parent/2.18.4/jackson-parent-2.18.4.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/oss-parent/69/oss-parent-69.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL-2/depgraph-maven-plugin-4.0.3-CodeQL-2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL-2/depgraph-maven-plugin-4.0.3-CodeQL-2.pom
 Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
 Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.pom
 Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_annotations/2.36.0/error_prone_annotations-2.36.0.jar
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/maven-fetches.expected b/java/ql/integration-tests/java/buildless-maven-mirrorof/maven-fetches.expected
index de38626f4d84..cffdda2891e3 100644
--- a/java/ql/integration-tests/java/buildless-maven-mirrorof/maven-fetches.expected
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/maven-fetches.expected
@@ -1,15 +1,15 @@
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-base/2.14.1/jackson-base-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-bom/2.14.1/jackson-bom-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-parent/2.14/jackson-parent-2.14.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/oss-parent/48/oss-parent-48.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL/depgraph-maven-plugin-4.0.3-CodeQL.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL/depgraph-maven-plugin-4.0.3-CodeQL.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.18.6/jackson-annotations-2.18.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.18.6/jackson-annotations-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.18.6/jackson-core-2.18.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.18.6/jackson-core-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.18.6/jackson-databind-2.18.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.18.6/jackson-databind-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-base/2.18.6/jackson-base-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-bom/2.18.6/jackson-bom-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-parent/2.18.4/jackson-parent-2.18.4.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/oss-parent/69/oss-parent-69.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL-2/depgraph-maven-plugin-4.0.3-CodeQL-2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL-2/depgraph-maven-plugin-4.0.3-CodeQL-2.pom
 Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
 Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.pom
 Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_annotations/2.36.0/error_prone_annotations-2.36.0.jar
diff --git a/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected
index 94b25c68a00d..5a30189b5e30 100644
--- a/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected
+++ b/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected
@@ -83,7 +83,7 @@
   }
 }
 {
-  "markdownMessage": "Running the Maven plugin `com.github.ferstl:depgraph-maven-plugin:4.0.3-CodeQL:graph` failed. This means precise dependency information will be unavailable, and so dependencies will be guessed based on Java package names. Consider investigating why this plugin fails to run.",
+  "markdownMessage": "Running the Maven plugin `com.github.ferstl:depgraph-maven-plugin:4.0.3-CodeQL-2:graph` failed. This means precise dependency information will be unavailable, and so dependencies will be guessed based on Java package names. Consider investigating why this plugin fails to run.",
   "severity": "note",
   "source": {
     "extractorName": "java",
diff --git a/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected
index c65231eccd00..0ef924eb7c11 100644
--- a/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected
+++ b/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected
@@ -97,7 +97,7 @@
   }
 }
 {
-  "markdownMessage": "Running the Maven plugin `com.github.ferstl:depgraph-maven-plugin:4.0.3-CodeQL:graph` yielded an artifact transfer exception. This means some dependency information will be unavailable, and so some dependencies will be guessed based on Java package names. Consider investigating why this plugin encountered errors retrieving dependencies.",
+  "markdownMessage": "Running the Maven plugin `com.github.ferstl:depgraph-maven-plugin:4.0.3-CodeQL-2:graph` yielded an artifact transfer exception. This means some dependency information will be unavailable, and so some dependencies will be guessed based on Java package names. Consider investigating why this plugin encountered errors retrieving dependencies.",
   "severity": "note",
   "source": {
     "extractorName": "java",
diff --git a/java/ql/integration-tests/java/buildless-maven/maven-fetches.expected b/java/ql/integration-tests/java/buildless-maven/maven-fetches.expected
index f4c4dab94565..208ca501487a 100644
--- a/java/ql/integration-tests/java/buildless-maven/maven-fetches.expected
+++ b/java/ql/integration-tests/java/buildless-maven/maven-fetches.expected
@@ -1,18 +1,18 @@
 Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.pom
 Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
 Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-base/2.14.1/jackson-base-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-bom/2.14.1/jackson-bom-2.14.1.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-parent/2.14/jackson-parent-2.14.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/oss-parent/48/oss-parent-48.pom
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL/depgraph-maven-plugin-4.0.3-CodeQL.jar
-Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL/depgraph-maven-plugin-4.0.3-CodeQL.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.18.6/jackson-annotations-2.18.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.18.6/jackson-annotations-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.18.6/jackson-core-2.18.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.18.6/jackson-core-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.18.6/jackson-databind-2.18.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.18.6/jackson-databind-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-base/2.18.6/jackson-base-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-bom/2.18.6/jackson-bom-2.18.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-parent/2.18.4/jackson-parent-2.18.4.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/oss-parent/69/oss-parent-69.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL-2/depgraph-maven-plugin-4.0.3-CodeQL-2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL-2/depgraph-maven-plugin-4.0.3-CodeQL-2.pom
 Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
 Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.pom
 Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_annotations/2.36.0/error_prone_annotations-2.36.0.jar
diff --git a/java/ql/integration-tests/update-ferstl-depgraph-dependencies.sh b/java/ql/integration-tests/update-ferstl-depgraph-dependencies.sh
new file mode 100755
index 000000000000..19d8167be740
--- /dev/null
+++ b/java/ql/integration-tests/update-ferstl-depgraph-dependencies.sh
@@ -0,0 +1,330 @@
+#!/usr/bin/env bash
+# Upgrades the ferstl-depgraph-dependencies bundle used by the buildless Java extractor.
+#
+# This script:
+#   1. Clones ferstl/depgraph-maven-plugin at the upstream 4.0.3 tag.
+#   2. Applies the CodeQL patches: version suffix, Guava bump, Jackson bump.
+#   3. Builds the plugin (skipping tests) into a throwaway build repo.
+#   4. Resolves only the plugin's runtime deps into a clean dist repo and zips it.
+#   5. Updates the *.expected integration-test files in this directory.
+#
+# The generated zip file must be placed (in the companion semmle-code PR) at:
+#   resources/lib/ferstl-depgraph-dependencies/ferstl-depgraph-dependencies.zip
+#
+# Usage:
+#   ./update-ferstl-depgraph-dependencies.sh [JACKSON_VERSION [GUAVA_VERSION]]
+#
+# Output:
+#   ferstl-depgraph-dependencies.zip  (written to the current working directory)
+#
+# Defaults:
+#   JACKSON_VERSION = 2.18.6
+#   GUAVA_VERSION   = 33.4.0-jre
+#
+# Requirements:
+#   - JDK 17 (or JDK 11+; the plugin targets Java 8+)
+#   - Maven 3.9.x  (do NOT use Maven 4.x)
+#   - git, python3, zip, sha1sum (or shasum on macOS)
+
+set -euo pipefail
+
+# ---------------------------------------------------------------------------
+# Configuration
+# ---------------------------------------------------------------------------
+JACKSON_VERSION="${1:-2.18.6}"
+GUAVA_VERSION="${2:-33.4.0-jre}"
+
+PLUGIN_UPSTREAM_VERSION="4.0.3"
+PLUGIN_CODEQL_VERSION="${PLUGIN_UPSTREAM_VERSION}-CodeQL-2"
+UPSTREAM_TAG="depgraph-maven-plugin-${PLUGIN_UPSTREAM_VERSION}"
+UPSTREAM_REPO="https://github.com/ferstl/depgraph-maven-plugin.git"
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+WORK_DIR="$(mktemp -d)"
+# The zip is written to the caller's working directory so the cleanup trap can
+# safely remove the entire temporary work tree.
+ZIP_OUT="$(pwd)/ferstl-depgraph-dependencies.zip"
+trap 'rm -rf "${WORK_DIR}"' EXIT
+
+echo "=== ferstl-depgraph-dependencies update ==="
+echo "  Jackson:        ${JACKSON_VERSION}"
+echo "  Guava:          ${GUAVA_VERSION}"
+echo "  Plugin version: ${PLUGIN_CODEQL_VERSION}"
+echo "  Work dir:       ${WORK_DIR}"
+echo ""
+
+# ---------------------------------------------------------------------------
+# Step 1 — Clone plugin source
+# ---------------------------------------------------------------------------
+echo "[1/5] Cloning ${UPSTREAM_REPO} at tag ${UPSTREAM_TAG} ..."
+git clone --depth=1 --branch "${UPSTREAM_TAG}" "${UPSTREAM_REPO}" "${WORK_DIR}/plugin-src"
+
+# ---------------------------------------------------------------------------
+# Step 2 — Patch pom.xml
+# ---------------------------------------------------------------------------
+echo "[2/5] Patching pom.xml ..."
+python3 - \
+    "${WORK_DIR}/plugin-src/pom.xml" \
+    "${PLUGIN_UPSTREAM_VERSION}" \
+    "${PLUGIN_CODEQL_VERSION}" \
+    "${GUAVA_VERSION}" \
+    "${JACKSON_VERSION}" << 'PYEOF'
+import sys
+
+pom_path, old_version, new_version, new_guava, new_jackson = sys.argv[1:]
+
+with open(pom_path) as f:
+    content = f.read()
+
+# 1. Version suffix: 4.0.3 -> 4.0.3-CodeQL-2  (first occurrence only — the <version> element)
+content = content.replace(f'<version>{old_version}</version>', f'<version>{new_version}</version>', 1)
+
+# 2. Guava
+content = content.replace('<version>31.1-jre</version>', f'<version>{new_guava}</version>')
+
+# 3. Jackson (jackson-databind drives the transitive jackson-core / jackson-annotations versions)
+content = content.replace('<version>2.14.1</version>', f'<version>{new_jackson}</version>')
+
+with open(pom_path, 'w') as f:
+    f.write(content)
+
+print(f'  pom.xml patched: version={new_version}, guava={new_guava}, jackson={new_jackson}')
+PYEOF
+
+# ---------------------------------------------------------------------------
+# Step 3 — Build the plugin, then resolve its runtime deps into a clean repo
+# ---------------------------------------------------------------------------
+#
+# Two separate local repos:
+#
+#   BUILD_REPO  Throwaway cache for the plugin's own `mvn package install` —
+#               accumulates build-lifecycle plugins (compiler, surefire, jar,
+#               plugin-plugin, etc.) that the extractor never invokes at
+#               runtime.  Discarded after this step.
+#
+#   DIST_REPO   Clean repo seeded with the freshly built plugin, then
+#               populated only with the plugin's runtime transitive deps by
+#               invoking the :graph goal against a minimal stub project.
+#               This is what gets zipped.
+#
+BUILD_REPO="${WORK_DIR}/build-repo"
+DIST_REPO="${WORK_DIR}/dist-repo"
+
+echo "[3/5] Building plugin (mvn package + install, skipping tests) ..."
+cd "${WORK_DIR}/plugin-src"
+mvn package install -DskipTests -q -Dmaven.repo.local="${BUILD_REPO}"
+
+echo "      Resolving runtime dependencies into clean dist repo ..."
+
+# Seed DIST_REPO with the freshly built plugin jar+pom so the :graph
+# invocation below can resolve its transitive runtime deps without hitting
+# Central for the plugin artifact itself.
+PLUGIN_REL="com/github/ferstl/depgraph-maven-plugin/${PLUGIN_CODEQL_VERSION}"
+mkdir -p "${DIST_REPO}/${PLUGIN_REL}"
+cp "${BUILD_REPO}/${PLUGIN_REL}/depgraph-maven-plugin-${PLUGIN_CODEQL_VERSION}.jar" \
+   "${BUILD_REPO}/${PLUGIN_REL}/depgraph-maven-plugin-${PLUGIN_CODEQL_VERSION}.pom" \
+   "${DIST_REPO}/${PLUGIN_REL}/"
+
+# Create a minimal stub project with no dependencies.  Using an empty project
+# avoids polluting DIST_REPO with the stub's own deps (e.g. junit from the
+# quickstart archetype).  The sole purpose of this project is to give Maven a
+# valid reactor context in which to load and execute the plugin.
+mkdir -p "${WORK_DIR}/stub-project"
+cat > "${WORK_DIR}/stub-project/pom.xml" << 'STUBPOM'
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.example</groupId>
+  <artifactId>stub</artifactId>
+  <version>1.0-SNAPSHOT</version>
+</project>
+STUBPOM
+
+cd "${WORK_DIR}/stub-project"
+mvn -q "com.github.ferstl:depgraph-maven-plugin:${PLUGIN_CODEQL_VERSION}:graph" \
+    -Dmaven.repo.local="${DIST_REPO}"
+
+# ---------------------------------------------------------------------------
+# Step 4 — Package local-repo zip
+# ---------------------------------------------------------------------------
+echo "[4/5] Packaging local Maven repo into zip ..."
+
+# Remove build-time-only noise (but keep _remote.repositories for Maven
+# cache-validation compatibility).
+find "${DIST_REPO}" \( \
+    -name "resolver-status.properties" \
+    -o -name "*.lastUpdated" \
+    -o -name "m2e-lastUpdated.properties" \
+    \) -delete
+
+# Add missing SHA-1 files (mvn install doesn't always write them for locally
+# built artifacts; they are needed to suppress Maven checksum warnings).
+if command -v sha1sum &>/dev/null; then
+    SHA1_CMD="sha1sum"
+elif command -v shasum &>/dev/null; then
+    SHA1_CMD="shasum -a 1"
+else
+    echo "WARNING: Neither sha1sum nor shasum found; .sha1 files will not be generated." >&2
+    SHA1_CMD=""
+fi
+
+if [[ -n "${SHA1_CMD}" ]]; then
+    while IFS= read -r -d '' f; do
+        if [[ ! -f "${f}.sha1" ]]; then
+            ${SHA1_CMD} "${f}" | awk '{print $1}' > "${f}.sha1"
+        fi
+    done < <(find "${DIST_REPO}" \( -name "*.jar" -o -name "*.pom" \) -print0)
+fi
+
+(cd "${DIST_REPO}" && zip -r -q "${ZIP_OUT}" .)
+
+echo ""
+echo "  Zip created: ${ZIP_OUT}"
+echo ""
+echo "  *** Place this file in semmle-code at:"
+echo "      resources/lib/ferstl-depgraph-dependencies/ferstl-depgraph-dependencies.zip"
+echo ""
+
+# ---------------------------------------------------------------------------
+# Step 5 — Update integration-test *.expected files
+# ---------------------------------------------------------------------------
+echo "[5/5] Updating integration-test expected files ..."
+
+# Python helpers are written to files to avoid heredocs inside $(...), which
+# are not reliably parsed by macOS bash 3.2.
+EXPECTED_FILE="${SCRIPT_DIR}/java/buildless-maven/maven-fetches.expected"
+
+# Script: extract current versions from the expected file
+cat > "${WORK_DIR}/extract_versions.py" << 'PYEOF'
+import sys, re
+
+with open(sys.argv[1]) as f:
+    content = f.read()
+
+def extract(pattern):
+    m = re.search(pattern, content)
+    return m.group(1) if m else ''
+
+print(
+    extract(r'jackson-core/([^/]+)/'),
+    extract(r'depgraph-maven-plugin/([^/]+)/'),
+    extract(r'fasterxml/oss-parent/([^/]+)/'),
+    extract(r'jackson-parent/([^/]+)/'),
+)
+PYEOF
+
+read -r OLD_JACKSON OLD_PLUGIN OLD_OSS_PARENT OLD_JACKSON_PARENT \
+    <<< "$(python3 "${WORK_DIR}/extract_versions.py" "${EXPECTED_FILE}")"
+
+# Script: find the highest-version POM in each parent directory
+cat > "${WORK_DIR}/max_versions.py" << 'PYEOF'
+import sys, os, re
+
+def max_version(directory, name_prefix, name_suffix):
+    try:
+        entries = os.listdir(directory)
+    except FileNotFoundError:
+        return ''
+    versions = []
+    for e in entries:
+        pom = os.path.join(directory, e, f'{name_prefix}{e}{name_suffix}')
+        if os.path.isfile(pom):
+            versions.append(e)
+    if not versions:
+        return ''
+    def version_key(v):
+        parts = re.split(r'[.\-]', v)
+        numeric = tuple(int(p) for p in parts if p.isdigit())
+        # A release version (all-numeric parts) beats a snapshot/qualifier with
+        # the same numeric prefix; append 1 for pure-release, 0 otherwise.
+        is_release = int(all(p.isdigit() for p in parts if p))
+        return (numeric, is_release)
+    return max(versions, key=version_key)
+
+jackson_parent_dir, oss_parent_dir = sys.argv[1], sys.argv[2]
+print(
+    max_version(jackson_parent_dir, 'jackson-parent-', '.pom'),
+    max_version(oss_parent_dir,     'oss-parent-',     '.pom'),
+)
+PYEOF
+
+# Capture python output into a variable first to avoid backslash continuation
+# inside $(...), which is not reliably handled by macOS bash 3.2.
+_max_versions_out="$(python3 "${WORK_DIR}/max_versions.py" "${DIST_REPO}/com/fasterxml/jackson/jackson-parent" "${DIST_REPO}/com/fasterxml/oss-parent")"
+read -r NEW_JACKSON_PARENT NEW_OSS_PARENT <<< "${_max_versions_out}"
+
+echo "  Jackson:        ${OLD_JACKSON} -> ${JACKSON_VERSION}"
+echo "  jackson-parent: ${OLD_JACKSON_PARENT} -> ${NEW_JACKSON_PARENT}"
+echo "  oss-parent:     ${OLD_OSS_PARENT} -> ${NEW_OSS_PARENT}"
+echo "  Plugin:         ${OLD_PLUGIN} -> ${PLUGIN_CODEQL_VERSION}"
+
+# Script: update all *.expected files in-place
+cat > "${WORK_DIR}/update_expected.py" << 'PYEOF'
+import os, sys, glob
+
+(script_dir,
+ old_jackson, new_jackson,
+ old_jackson_parent, new_jackson_parent,
+ old_oss_parent, new_oss_parent,
+ old_plugin, new_plugin) = sys.argv[1:]
+
+# Substitutions applied to maven-fetches.expected files
+fetch_substitutions = [
+    (f"jackson-annotations/{old_jackson}/jackson-annotations-{old_jackson}",
+     f"jackson-annotations/{new_jackson}/jackson-annotations-{new_jackson}"),
+    (f"jackson-core/{old_jackson}/jackson-core-{old_jackson}",
+     f"jackson-core/{new_jackson}/jackson-core-{new_jackson}"),
+    (f"jackson-databind/{old_jackson}/jackson-databind-{old_jackson}",
+     f"jackson-databind/{new_jackson}/jackson-databind-{new_jackson}"),
+    (f"jackson-base/{old_jackson}/jackson-base-{old_jackson}",
+     f"jackson-base/{new_jackson}/jackson-base-{new_jackson}"),
+    (f"jackson-bom/{old_jackson}/jackson-bom-{old_jackson}",
+     f"jackson-bom/{new_jackson}/jackson-bom-{new_jackson}"),
+    (f"jackson-parent/{old_jackson_parent}/jackson-parent-{old_jackson_parent}.pom",
+     f"jackson-parent/{new_jackson_parent}/jackson-parent-{new_jackson_parent}.pom"),
+    (f"com/fasterxml/oss-parent/{old_oss_parent}/oss-parent-{old_oss_parent}.pom",
+     f"com/fasterxml/oss-parent/{new_oss_parent}/oss-parent-{new_oss_parent}.pom"),
+    (f"depgraph-maven-plugin/{old_plugin}/depgraph-maven-plugin-{old_plugin}.",
+     f"depgraph-maven-plugin/{new_plugin}/depgraph-maven-plugin-{new_plugin}."),
+]
+
+# Substitutions applied to diagnostics.expected files
+diagnostics_substitutions = [
+    (f"depgraph-maven-plugin:{old_plugin}:graph",
+     f"depgraph-maven-plugin:{new_plugin}:graph"),
+]
+
+def update(filepath, substitutions):
+    with open(filepath) as f:
+        content = f.read()
+    updated = content
+    for old, new in substitutions:
+        updated = updated.replace(old, new)
+    if updated != content:
+        with open(filepath, 'w') as f:
+            f.write(updated)
+        print(f"  Updated: {os.path.relpath(filepath, script_dir)}")
+
+for fp in glob.glob(os.path.join(script_dir, "java", "**", "maven-fetches.expected"), recursive=True):
+    update(fp, fetch_substitutions)
+
+for fp in glob.glob(os.path.join(script_dir, "java", "**", "diagnostics.expected"), recursive=True):
+    update(fp, diagnostics_substitutions)
+
+print("  Expected files updated.")
+PYEOF
+
+python3 "${WORK_DIR}/update_expected.py" \
+    "${SCRIPT_DIR}" \
+    "${OLD_JACKSON}" "${JACKSON_VERSION}" \
+    "${OLD_JACKSON_PARENT}" "${NEW_JACKSON_PARENT}" \
+    "${OLD_OSS_PARENT}" "${NEW_OSS_PARENT}" \
+    "${OLD_PLUGIN}" "${PLUGIN_CODEQL_VERSION}"
+
+echo ""
+echo "=== Update complete ==="
+echo ""
+echo "Next steps:"
+echo "  1. Copy ${ZIP_OUT} -> semmle-code resources/lib/ferstl-depgraph-dependencies/ferstl-depgraph-dependencies.zip"
+echo "  2. In semmle-code, update autobuild/src/com/semmle/util/build/Maven.java:"
+echo "     bump the plugin version constant to '${PLUGIN_CODEQL_VERSION}'"
+echo "  3. Commit and raise PRs in both repositories."
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index a6c0cfc278ad..2e702064d7f8 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 9.1.2
+
+### Minor Analysis Improvements
+
+* Added LLM-generated source and sink models for `org.apache.avro`.
+
 ## 9.1.1
 
 ### Minor Analysis Improvements
diff --git a/java/ql/lib/change-notes/released/9.1.2.md b/java/ql/lib/change-notes/released/9.1.2.md
new file mode 100644
index 000000000000..c10b69f0fe9d
--- /dev/null
+++ b/java/ql/lib/change-notes/released/9.1.2.md
@@ -0,0 +1,5 @@
+## 9.1.2
+
+### Minor Analysis Improvements
+
+* Added LLM-generated source and sink models for `org.apache.avro`.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index 02e630d33846..1fd7d868f4ed 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 9.1.1
+lastReleaseVersion: 9.1.2
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.file.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.file.model.yml
new file mode 100644
index 000000000000..185d396fd72e
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.file.model.yml
@@ -0,0 +1,29 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#68da8fb99da5c482f17853e01e79f714e3717b42 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro.file", "DataFileReader", True, "openReader", "(File,DatumReader)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileWriter", True, "appendTo", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileWriter", True, "create", "(Schema,File)", "", "Argument[1]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "SeekableFileInput", True, "SeekableFileInput", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "SyncableFileOutputStream", True, "SyncableFileOutputStream", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "SyncableFileOutputStream", True, "SyncableFileOutputStream", "(File,boolean)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "SyncableFileOutputStream", True, "SyncableFileOutputStream", "(String)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "SyncableFileOutputStream", True, "SyncableFileOutputStream", "(String,boolean)", "", "Argument[0]", "path-injection", "ai-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["org.apache.avro.file", "DataFileReader12", True, "getMeta", "(String)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileReader12", True, "getMetaString", "(String)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileReader12", True, "next", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileReader12", True, "next", "(Object)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "getMeta", "(String)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "getMetaString", "(String)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "next", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "next", "(Object)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "nextBlock", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "FileReader", True, "next", "(Object)", "", "ReturnValue", "file", "ai-generated"]
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.model.yml
new file mode 100644
index 000000000000..e6b5048429c5
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.model.yml
@@ -0,0 +1,29 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#68da8fb99da5c482f17853e01e79f714e3717b42 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro", "Protocol", True, "parse", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "Schema", True, "parse", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "Schema$Parser", True, "parse", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(File,Charset)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(Path)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(Path,Charset)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(URI,Charset)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(URI,Charset)", "", "Argument[0]", "request-forgery", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parseSingle", "(Path)", "", "Argument[0]", "path-injection", "ai-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["org.apache.avro", "Protocol", True, "parse", "(File)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro", "Schema", True, "parse", "(File)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(File)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(File,Charset)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(Path)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(Path,Charset)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(URI,Charset)", "", "ReturnValue", "remote", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parseSingle", "(Path)", "", "ReturnValue", "file", "ai-generated"]
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.util.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.util.model.yml
new file mode 100644
index 000000000000..31ca686c9f9d
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.util.model.yml
@@ -0,0 +1,8 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#68da8fb99da5c482f17853e01e79f714e3717b42 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["org.apache.avro.util", "RandomData", True, "main", "(String[])", "", "Argument[0]", "commandargs", "ai-generated"]
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 5f6482c1ae2b..18948bf45f52 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 9.1.1
+version: 9.1.3-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
index 27f0102b3cfb..3407a43403e8 100644
--- a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
+++ b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -84,7 +84,13 @@ private module Ast implements AstSig<Location> {
 
   class DoStmt = J::DoStmt;
 
-  class ForStmt = J::ForStmt;
+  final private class FinalForStmt = J::ForStmt;
+
+  class ForStmt extends FinalForStmt {
+    AstNode getInit(int index) { result = super.getInit(index) }
+
+    AstNode getUpdate(int index) { result = super.getUpdate(index) }
+  }
 
   final private class FinalEnhancedForStmt = J::EnhancedForStmt;
 
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index fbbc339797b2..e013e79ce9e8 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.11.4
+
+No user-facing changes.
+
 ## 1.11.3
 
 ### Minor Analysis Improvements
diff --git a/java/ql/src/change-notes/released/1.11.4.md b/java/ql/src/change-notes/released/1.11.4.md
new file mode 100644
index 000000000000..3ebd37b0be7a
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.11.4.md
@@ -0,0 +1,3 @@
+## 1.11.4
+
+No user-facing changes.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index 220561dc648b..813a925461f3 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.11.3
+lastReleaseVersion: 1.11.4
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index 1d3c3c5b7163..ac5194842252 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.11.3
+version: 1.11.5-dev
 groups:
   - java
   - queries
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index c201b3a4b134..6471aa3fe68f 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.7.2
+
+### Minor Analysis Improvements
+
+* The sensitive data heuristics used to identify code that handles passwords and private data have been improved. Most of the changes permit more variations of established patterns, thereby finding more sensitive data. Queries that use the sensitive data library (for example `js/clear-text-logging`) may find more correct results and fewer false positive results after these changes.
+
 ## 2.7.1
 
 No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.7.2.md b/javascript/ql/lib/change-notes/released/2.7.2.md
new file mode 100644
index 000000000000..9d0eca2cb4eb
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.7.2.md
@@ -0,0 +1,5 @@
+## 2.7.2
+
+### Minor Analysis Improvements
+
+* The sensitive data heuristics used to identify code that handles passwords and private data have been improved. Most of the changes permit more variations of established patterns, thereby finding more sensitive data. Queries that use the sensitive data library (for example `js/clear-text-logging`) may find more correct results and fewer false positive results after these changes.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index 820fb65a5c74..5160df7b1b70 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.7.1
+lastReleaseVersion: 2.7.2
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index ff45431ce7a4..870ad58a1b83 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.7.1
+version: 2.7.3-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index 1a69291d1453..b3a62befc5e8 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.3.11
+
+No user-facing changes.
+
 ## 2.3.10
 
 No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/2.3.11.md b/javascript/ql/src/change-notes/released/2.3.11.md
new file mode 100644
index 000000000000..31b11998b741
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.3.11.md
@@ -0,0 +1,3 @@
+## 2.3.11
+
+No user-facing changes.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index a4a2f98d5094..5ac091006e8c 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.3.10
+lastReleaseVersion: 2.3.11
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index ad653e83497a..09303bab573a 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 2.3.10
+version: 2.3.12-dev
 groups:
   - javascript
   - queries
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index 8e20945c6bfd..8f96c9ba8dd0 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.51.md b/misc/suite-helpers/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index 4d751d815ec5..7ac4b0e1dc3e 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.50
+version: 1.0.52-dev
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/extractor/cli-integration-test/writing-diagnostics/diagnostics.expected b/python/extractor/cli-integration-test/writing-diagnostics/diagnostics.expected
index de218a50e1e3..12a241ad7b68 100644
--- a/python/extractor/cli-integration-test/writing-diagnostics/diagnostics.expected
+++ b/python/extractor/cli-integration-test/writing-diagnostics/diagnostics.expected
@@ -17,13 +17,13 @@
     ]
   },
   "location": {
-    "file": "<test-root-directory>/repo_dir/syntaxerror3.py",
+    "file": "syntaxerror3.py",
     "startColumn": 0,
     "endColumn": 0,
     "startLine": 1,
     "endLine": 1
   },
-  "markdownMessage": "A parse error occurred while processing `<test-root-directory>/repo_dir/syntaxerror3.py`, and as a result this file could not be analyzed. Check the syntax of the file using the `python -m py_compile` command and correct any invalid syntax.",
+  "markdownMessage": "A parse error occurred while processing `syntaxerror3.py`, and as a result this file could not be analyzed. Check the syntax of the file using the `python -m py_compile` command and correct any invalid syntax.",
   "severity": "warning",
   "source": {
     "extractorName": "python",
@@ -56,13 +56,13 @@
     ]
   },
   "location": {
-    "file": "<test-root-directory>/repo_dir/syntaxerror1.py",
+    "file": "syntaxerror1.py",
     "startColumn": 0,
     "endColumn": 0,
     "startLine": 3,
     "endLine": 3
   },
-  "markdownMessage": "A parse error occurred while processing `<test-root-directory>/repo_dir/syntaxerror1.py`, and as a result this file could not be analyzed. Check the syntax of the file using the `python -m py_compile` command and correct any invalid syntax.",
+  "markdownMessage": "A parse error occurred while processing `syntaxerror1.py`, and as a result this file could not be analyzed. Check the syntax of the file using the `python -m py_compile` command and correct any invalid syntax.",
   "severity": "warning",
   "source": {
     "extractorName": "python",
@@ -95,13 +95,13 @@
     ]
   },
   "location": {
-    "file": "<test-root-directory>/repo_dir/syntaxerror2.py",
+    "file": "syntaxerror2.py",
     "startColumn": 0,
     "endColumn": 0,
     "startLine": 5,
     "endLine": 5
   },
-  "markdownMessage": "A parse error occurred while processing `<test-root-directory>/repo_dir/syntaxerror2.py`, and as a result this file could not be analyzed. Check the syntax of the file using the `python -m py_compile` command and correct any invalid syntax.",
+  "markdownMessage": "A parse error occurred while processing `syntaxerror2.py`, and as a result this file could not be analyzed. Check the syntax of the file using the `python -m py_compile` command and correct any invalid syntax.",
   "severity": "warning",
   "source": {
     "extractorName": "python",
@@ -145,7 +145,7 @@
     ]
   },
   "location": {
-    "file": "<test-root-directory>/repo_dir/recursion_error.py"
+    "file": "recursion_error.py"
   },
   "plaintextMessage": "maximum recursion depth exceeded while calling a Python object",
   "severity": "error",
diff --git a/python/extractor/semmle/logging.py b/python/extractor/semmle/logging.py
index 0e0b173a4d7d..31805040bf6d 100644
--- a/python/extractor/semmle/logging.py
+++ b/python/extractor/semmle/logging.py
@@ -359,11 +359,30 @@ def get_stack_trace_lines():
             return lines[:i]
     return lines
 
+def _get_source_root():
+    """Get the source root directory for relativizing diagnostic paths."""
+    return os.environ.get("LGTM_SRC", os.getcwd())
+
+def _relative_path(path):
+    """Make a path relative to the source root for use in diagnostic locations.
+    If the path is not under the source root, return it unchanged."""
+    source_root = os.path.abspath(_get_source_root())
+    abs_path = os.path.abspath(path)
+    try:
+        relpath = os.path.relpath(abs_path, source_root)
+    except ValueError:
+        # On Windows, relpath raises ValueError for paths on different drives
+        return path
+    if relpath.startswith(os.pardir):
+        return path
+    return relpath.replace(os.sep, "/")
+
 def syntax_error_message(exception, unit):
-    l = Location(file=unit.path, startLine=exception.lineno, startColumn=exception.offset)
+    diag_path = _relative_path(unit.path)
+    l = Location(file=diag_path, startLine=exception.lineno, startColumn=exception.offset)
     error = (DiagnosticMessage(Source("py/diagnostics/syntax-error", "Could not process some files due to syntax errors"), Severity.WARNING)
              .with_location(l)
-             .markdown("A parse error occurred while processing `{}`, and as a result this file could not be analyzed. Check the syntax of the file using the `python -m py_compile` command and correct any invalid syntax.".format(unit.path))
+             .markdown("A parse error occurred while processing `{}`, and as a result this file could not be analyzed. Check the syntax of the file using the `python -m py_compile` command and correct any invalid syntax.".format(diag_path))
              .attribute("traceback", get_stack_trace_lines())
              .attribute("args", exception.args)
              .status_page()
@@ -374,7 +393,7 @@ def syntax_error_message(exception, unit):
 
 def recursion_error_message(exception, unit):
     # if unit is a BuiltinModuleExtractable, there will be no path attribute
-    l = Location(file=unit.path) if hasattr(unit, "path") else None
+    l = Location(file=_relative_path(unit.path)) if hasattr(unit, "path") else None
     return (DiagnosticMessage(Source("py/diagnostics/recursion-error", "Recursion error in Python extractor"), Severity.ERROR)
             .with_location(l)
             .text(exception.args[0])
@@ -385,7 +404,7 @@ def recursion_error_message(exception, unit):
 
 def internal_error_message(exception, unit):
     # if unit is a BuiltinModuleExtractable, there will be no path attribute
-    l = Location(file=unit.path) if hasattr(unit, "path") else None
+    l = Location(file=_relative_path(unit.path)) if hasattr(unit, "path") else None
     return (DiagnosticMessage(Source("py/diagnostics/internal-error", "Internal error in Python extractor"), Severity.ERROR)
             .with_location(l)
             .text("Internal error")
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index 3d09821803b5..3efb4e574825 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.1.2
+
+### Minor Analysis Improvements
+
+* The sensitive data heuristics used to identify code that handles passwords and private data have been improved. Most of the changes permit more variations of established patterns, thereby finding more sensitive data. Queries that use the sensitive data library (for example `py/clear-text-logging-sensitive-data`) may find more correct results and less fewer positive results after these changes.
+
 ## 7.1.1
 
 No user-facing changes.
diff --git a/python/ql/lib/change-notes/released/7.1.2.md b/python/ql/lib/change-notes/released/7.1.2.md
new file mode 100644
index 000000000000..523a14edfbe0
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.1.2.md
@@ -0,0 +1,5 @@
+## 7.1.2
+
+### Minor Analysis Improvements
+
+* The sensitive data heuristics used to identify code that handles passwords and private data have been improved. Most of the changes permit more variations of established patterns, thereby finding more sensitive data. Queries that use the sensitive data library (for example `py/clear-text-logging-sensitive-data`) may find more correct results and less fewer positive results after these changes.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index 8e970df6cae3..547681cc4408 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.1.1
+lastReleaseVersion: 7.1.2
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 826b35068691..210e683a54fc 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 7.1.1
+version: 7.1.3-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index 544b9778d4dd..27698f1d3df9 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.4
+
+No user-facing changes.
+
 ## 1.8.3
 
 No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.8.4.md b/python/ql/src/change-notes/released/1.8.4.md
new file mode 100644
index 000000000000..9aef6d10d1c8
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.8.4.md
@@ -0,0 +1,3 @@
+## 1.8.4
+
+No user-facing changes.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index 8071ef421ab4..f2a60cd13271 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.8.3
+lastReleaseVersion: 1.8.4
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index ee265ad65e9f..0eba954079ea 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.8.3
+version: 1.8.5-dev
 groups:
   - python
   - queries
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/AllLiveReachable.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/AllLiveReachable.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/AllLiveReachable.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/AllLiveReachable.ql
new file mode 100644
index 000000000000..886ccb4c3489
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/AllLiveReachable.ql
@@ -0,0 +1,17 @@
+/**
+ * Checks that every live (non-dead) annotation in the test function's
+ * own scope is reachable from the function entry in the CFG.
+ * Annotations in nested scopes (generators, async, lambdas, comprehensions)
+ * have separate CFGs and are excluded from this check.
+ */
+
+import OldCfgImpl
+
+private module Utils = EvalOrderCfgUtils<OldCfg>;
+
+private import Utils
+private import Utils::CfgTests
+
+from TimerCfgNode a, TestFunction f
+where allLiveReachable(a, f)
+select a, "Unreachable live annotation; entry of $@ does not reach this node", f, f.getName()
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/AnnotationHasCfgNode.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/AnnotationHasCfgNode.expected
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/AnnotationHasCfgNode.expected
@@ -0,0 +1 @@
+
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/AnnotationHasCfgNode.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/AnnotationHasCfgNode.ql
new file mode 100644
index 000000000000..04c01abf8a67
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/AnnotationHasCfgNode.ql
@@ -0,0 +1,14 @@
+/**
+ * Checks that every timer annotation has a corresponding CFG node.
+ */
+
+import OldCfgImpl
+
+private module Utils = EvalOrderCfgUtils<OldCfg>;
+
+private import Utils::CfgTests
+
+from TimerAnnotation ann
+where annotationWithoutCfgNode(ann)
+select ann, "Annotation in $@ has no CFG node", ann.getTestFunction(),
+  ann.getTestFunction().getName()
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockAnnotationGap.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockAnnotationGap.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockAnnotationGap.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockAnnotationGap.ql
new file mode 100644
index 000000000000..691144e06e4f
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockAnnotationGap.ql
@@ -0,0 +1,21 @@
+/**
+ * Checks that within a basic block, if a node is annotated then its
+ * successor is also annotated (or excluded). A gap in annotations
+ * within a basic block indicates a missing annotation, since there
+ * are no branches to justify the gap.
+ *
+ * Nodes with exceptional successors are excluded, as the exception
+ * edge leaves the basic block and the normal successor may be dead.
+ */
+
+import OldCfgImpl
+
+private module Utils = EvalOrderCfgUtils<OldCfg>;
+
+private import Utils
+private import Utils::CfgTests
+
+from TimerCfgNode a, CfgNode succ
+where basicBlockAnnotationGap(a, succ)
+select a, "Annotated node followed by unannotated $@ in the same basic block", succ,
+  succ.getNode().toString()
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockOrdering.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockOrdering.expected
new file mode 100644
index 000000000000..910fd3c8a80d
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockOrdering.expected
@@ -0,0 +1,14 @@
+| test_boolean.py:9:10:9:43 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:9:59:9:59 | IntegerLiteral | timestamp 2 | test_boolean.py:9:19:9:19 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:15:10:15:43 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:15:50:15:50 | IntegerLiteral | timestamp 1 | test_boolean.py:15:20:15:20 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:21:10:21:42 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:21:49:21:49 | IntegerLiteral | timestamp 1 | test_boolean.py:21:19:21:19 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:27:10:27:34 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:27:50:27:50 | IntegerLiteral | timestamp 2 | test_boolean.py:27:20:27:20 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:40:10:40:61 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:40:86:40:86 | IntegerLiteral | timestamp 3 | test_boolean.py:40:16:40:16 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:46:10:46:61 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:46:86:46:86 | IntegerLiteral | timestamp 3 | test_boolean.py:46:16:46:16 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:52:10:52:95 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:52:120:52:120 | IntegerLiteral | timestamp 4 | test_boolean.py:52:20:52:20 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:52:10:52:95 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:52:120:52:120 | IntegerLiteral | timestamp 4 | test_boolean.py:52:63:52:63 | IntegerLiteral | timestamp 2 |
+| test_boolean.py:52:11:52:47 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:52:63:52:63 | IntegerLiteral | timestamp 2 | test_boolean.py:52:20:52:20 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:64:10:64:52 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:64:59:64:59 | IntegerLiteral | timestamp 6 | test_boolean.py:64:17:64:17 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:64:10:64:52 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:64:59:64:59 | IntegerLiteral | timestamp 6 | test_boolean.py:64:27:64:27 | IntegerLiteral | timestamp 2 |
+| test_boolean.py:76:10:76:51 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:76:58:76:58 | IntegerLiteral | timestamp 6 | test_boolean.py:76:17:76:17 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:76:10:76:51 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_boolean.py:76:58:76:58 | IntegerLiteral | timestamp 6 | test_boolean.py:76:27:76:27 | IntegerLiteral | timestamp 2 |
+| test_if.py:96:9:96:29 | ControlFlowNode for BoolExpr | Basic block ordering: $@ appears before $@ | test_if.py:96:36:96:36 | IntegerLiteral | timestamp 4 | test_if.py:96:15:96:15 | IntegerLiteral | timestamp 2 |
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockOrdering.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockOrdering.ql
new file mode 100644
index 000000000000..6c08d44a5a59
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/BasicBlockOrdering.ql
@@ -0,0 +1,16 @@
+/**
+ * Checks that within a single basic block, annotations appear in
+ * increasing minimum-timestamp order.
+ */
+
+import OldCfgImpl
+
+private module Utils = EvalOrderCfgUtils<OldCfg>;
+
+private import Utils
+private import Utils::CfgTests
+
+from TimerCfgNode a, TimerCfgNode b, int minA, int minB
+where basicBlockOrdering(a, b, minA, minB)
+select a, "Basic block ordering: $@ appears before $@", a.getTimestampExpr(minA),
+  "timestamp " + minA, b.getTimestampExpr(minB), "timestamp " + minB
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/ConsecutiveTimestamps.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/ConsecutiveTimestamps.expected
new file mode 100644
index 000000000000..ed22c971ecbc
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/ConsecutiveTimestamps.expected
@@ -0,0 +1,12 @@
+| test_boolean.py:9:26:9:27 | IntegerLiteral | $@ in $@ has no consecutive successor (expected 2) | test_boolean.py:9:33:9:33 | IntegerLiteral | Timestamp 1 | test_boolean.py:7:1:7:27 | Function test_and_both_sides | test_and_both_sides |
+| test_boolean.py:15:10:15:14 | False | $@ in $@ has no consecutive successor (expected 1) | test_boolean.py:15:20:15:20 | IntegerLiteral | Timestamp 0 | test_boolean.py:13:1:13:30 | Function test_and_short_circuit | test_and_short_circuit |
+| test_boolean.py:21:10:21:13 | True | $@ in $@ has no consecutive successor (expected 1) | test_boolean.py:21:19:21:19 | IntegerLiteral | Timestamp 0 | test_boolean.py:19:1:19:29 | Function test_or_short_circuit | test_or_short_circuit |
+| test_boolean.py:27:26:27:27 | IntegerLiteral | $@ in $@ has no consecutive successor (expected 2) | test_boolean.py:27:33:27:33 | IntegerLiteral | Timestamp 1 | test_boolean.py:25:1:25:26 | Function test_or_both_sides | test_or_both_sides |
+| test_boolean.py:40:45:40:45 | IntegerLiteral | $@ in $@ has no consecutive successor (expected 3) | test_boolean.py:40:51:40:51 | IntegerLiteral | Timestamp 2 | test_boolean.py:38:1:38:24 | Function test_chained_and | test_chained_and |
+| test_boolean.py:46:44:46:45 | IntegerLiteral | $@ in $@ has no consecutive successor (expected 3) | test_boolean.py:46:51:46:51 | IntegerLiteral | Timestamp 2 | test_boolean.py:44:1:44:23 | Function test_chained_or | test_chained_or |
+| test_boolean.py:52:11:52:47 | BoolExpr | $@ in $@ has no consecutive successor (expected 3) | test_boolean.py:52:63:52:63 | IntegerLiteral | Timestamp 2 | test_boolean.py:50:1:50:25 | Function test_mixed_and_or | test_mixed_and_or |
+| test_boolean.py:52:27:52:31 | False | $@ in $@ has no consecutive successor (expected 2) | test_boolean.py:52:37:52:37 | IntegerLiteral | Timestamp 1 | test_boolean.py:50:1:50:25 | Function test_mixed_and_or | test_mixed_and_or |
+| test_boolean.py:52:78:52:79 | IntegerLiteral | $@ in $@ has no consecutive successor (expected 4) | test_boolean.py:52:85:52:85 | IntegerLiteral | Timestamp 3 | test_boolean.py:50:1:50:25 | Function test_mixed_and_or | test_mixed_and_or |
+| test_if.py:95:9:95:13 | False | $@ in $@ has no consecutive successor (expected 2) | test_if.py:95:19:95:19 | IntegerLiteral | Timestamp 1 | test_if.py:93:1:93:34 | Function test_if_compound_condition | test_if_compound_condition |
+| test_if.py:96:9:96:29 | BoolExpr | $@ in $@ has no consecutive successor (expected 5) | test_if.py:96:36:96:36 | IntegerLiteral | Timestamp 4 | test_if.py:93:1:93:34 | Function test_if_compound_condition | test_if_compound_condition |
+| test_if.py:96:22:96:22 | y | $@ in $@ has no consecutive successor (expected 4) | test_if.py:96:28:96:28 | IntegerLiteral | Timestamp 3 | test_if.py:93:1:93:34 | Function test_if_compound_condition | test_if_compound_condition |
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/ConsecutiveTimestamps.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/ConsecutiveTimestamps.ql
new file mode 100644
index 000000000000..01ff59b49bf6
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/ConsecutiveTimestamps.ql
@@ -0,0 +1,24 @@
+/**
+ * Checks that consecutive annotated nodes have consecutive timestamps:
+ * for each annotation with timestamp `a`, some CFG node for that annotation
+ * must have a next annotation containing `a + 1`.
+ *
+ * Handles CFG splitting (e.g., finally blocks duplicated for normal/exceptional
+ * flow) by checking that at least one split has the required successor.
+ *
+ * Only applies to functions where all annotations are in the function's
+ * own scope (excludes tests with generators, async, comprehensions, or
+ * lambdas that have annotations in nested scopes).
+ */
+
+import OldCfgImpl
+
+private module Utils = EvalOrderCfgUtils<OldCfg>;
+
+private import Utils
+private import Utils::CfgTests
+
+from TimerAnnotation ann, int a
+where consecutiveTimestamps(ann, a)
+select ann, "$@ in $@ has no consecutive successor (expected " + (a + 1) + ")",
+  ann.getTimestampExpr(a), "Timestamp " + a, ann.getTestFunction(), ann.getTestFunction().getName()
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/ContiguousTimestamps.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/ContiguousTimestamps.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/ContiguousTimestamps.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/ContiguousTimestamps.ql
new file mode 100644
index 000000000000..f18c52750b52
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/ContiguousTimestamps.ql
@@ -0,0 +1,17 @@
+/**
+ * Checks that timestamps form a contiguous sequence {0, 1, ..., max}
+ * within each test function. Every integer in the range must appear
+ * in at least one annotation (live or dead).
+ */
+
+import TimerUtils
+
+from TestFunction f, int missing, int maxTs, TimerAnnotation maxAnn
+where
+  maxTs = max(TimerAnnotation a | a.getTestFunction() = f | a.getATimestamp()) and
+  maxAnn.getTestFunction() = f and
+  maxAnn.getATimestamp() = maxTs and
+  missing = [0 .. maxTs] and
+  not exists(TimerAnnotation a | a.getTestFunction() = f and a.getATimestamp() = missing)
+select f, "Missing timestamp " + missing + " (max is $@)", maxAnn.getTimestampExpr(maxTs),
+  maxTs.toString()
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/MissingAnnotations.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/MissingAnnotations.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/MissingAnnotations.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/MissingAnnotations.ql
new file mode 100644
index 000000000000..51f324e9399c
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/MissingAnnotations.ql
@@ -0,0 +1,15 @@
+/**
+ * Finds expressions in test functions that lack a timer annotation
+ * and are not part of the timer mechanism or otherwise excluded.
+ * An empty result means every annotatable expression is covered.
+ */
+
+import python
+import TimerUtils
+
+from TestFunction f, Expr e
+where
+  e.getScope().getEnclosingScope*() = f and
+  not isTimerMechanism(e, f) and
+  not isUnannotatable(e)
+select e, "Missing annotation in $@", f, f.getName()
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/NeverReachable.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/NeverReachable.expected
new file mode 100644
index 000000000000..874a7dfb0960
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/NeverReachable.expected
@@ -0,0 +1,2 @@
+| test_match.py:159:13:159:13 | IntegerLiteral | Node annotated with t.never is reachable in $@ | test_match.py:151:1:151:42 | Function test_match_exhaustive_return_first | test_match_exhaustive_return_first |
+| test_match.py:172:13:172:13 | IntegerLiteral | Node annotated with t.never is reachable in $@ | test_match.py:164:1:164:45 | Function test_match_exhaustive_return_wildcard | test_match_exhaustive_return_wildcard |
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/NeverReachable.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/NeverReachable.ql
new file mode 100644
index 000000000000..9fbb9115814a
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/NeverReachable.ql
@@ -0,0 +1,16 @@
+/**
+ * Checks that expressions annotated with `t.never` either have no CFG
+ * node, or if they do, that the node is not reachable from its scope's
+ * entry (including within the same basic block).
+ */
+
+import OldCfgImpl
+
+private module Utils = EvalOrderCfgUtils<OldCfg>;
+
+private import Utils::CfgTests
+
+from TimerAnnotation ann
+where neverReachable(ann)
+select ann, "Node annotated with t.never is reachable in $@", ann.getTestFunction(),
+  ann.getTestFunction().getName()
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBackwardFlow.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBackwardFlow.expected
new file mode 100644
index 000000000000..6e8ea12c9dd4
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBackwardFlow.expected
@@ -0,0 +1,11 @@
+| test_boolean.py:9:10:9:43 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_boolean.py:9:59:9:59 | IntegerLiteral | 2 | test_boolean.py:9:10:9:13 | ControlFlowNode for True | True | test_boolean.py:9:19:9:19 | IntegerLiteral | 0 |
+| test_boolean.py:15:10:15:43 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_boolean.py:15:50:15:50 | IntegerLiteral | 1 | test_boolean.py:15:10:15:14 | ControlFlowNode for False | False | test_boolean.py:15:20:15:20 | IntegerLiteral | 0 |
+| test_boolean.py:21:10:21:42 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_boolean.py:21:49:21:49 | IntegerLiteral | 1 | test_boolean.py:21:10:21:13 | ControlFlowNode for True | True | test_boolean.py:21:19:21:19 | IntegerLiteral | 0 |
+| test_boolean.py:27:10:27:34 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_boolean.py:27:50:27:50 | IntegerLiteral | 2 | test_boolean.py:27:10:27:14 | ControlFlowNode for False | False | test_boolean.py:27:20:27:20 | IntegerLiteral | 0 |
+| test_boolean.py:40:10:40:61 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_boolean.py:40:86:40:86 | IntegerLiteral | 3 | test_boolean.py:40:10:40:10 | ControlFlowNode for IntegerLiteral | IntegerLiteral | test_boolean.py:40:16:40:16 | IntegerLiteral | 0 |
+| test_boolean.py:46:10:46:61 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_boolean.py:46:86:46:86 | IntegerLiteral | 3 | test_boolean.py:46:10:46:10 | ControlFlowNode for IntegerLiteral | IntegerLiteral | test_boolean.py:46:16:46:16 | IntegerLiteral | 0 |
+| test_boolean.py:52:10:52:95 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_boolean.py:52:120:52:120 | IntegerLiteral | 4 | test_boolean.py:52:11:52:47 | ControlFlowNode for BoolExpr | BoolExpr | test_boolean.py:52:63:52:63 | IntegerLiteral | 2 |
+| test_boolean.py:52:11:52:47 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_boolean.py:52:63:52:63 | IntegerLiteral | 2 | test_boolean.py:52:11:52:14 | ControlFlowNode for True | True | test_boolean.py:52:20:52:20 | IntegerLiteral | 0 |
+| test_boolean.py:64:10:64:52 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_boolean.py:64:59:64:59 | IntegerLiteral | 6 | test_boolean.py:64:11:64:11 | ControlFlowNode for f | f | test_boolean.py:64:17:64:17 | IntegerLiteral | 0 |
+| test_boolean.py:76:10:76:51 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_boolean.py:76:58:76:58 | IntegerLiteral | 6 | test_boolean.py:76:11:76:11 | ControlFlowNode for f | f | test_boolean.py:76:17:76:17 | IntegerLiteral | 0 |
+| test_if.py:96:9:96:29 | ControlFlowNode for BoolExpr | Backward flow: $@ flows to $@ (max timestamp $@) | test_if.py:96:36:96:36 | IntegerLiteral | 4 | test_if.py:96:9:96:9 | ControlFlowNode for x | x | test_if.py:96:15:96:15 | IntegerLiteral | 2 |
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBackwardFlow.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBackwardFlow.ql
new file mode 100644
index 000000000000..e9926284295f
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBackwardFlow.ql
@@ -0,0 +1,17 @@
+/**
+ * Checks that time never flows backward between consecutive timer annotations
+ * in the CFG. For each pair of consecutive annotated nodes (A -> B), there must
+ * exist timestamps a in A and b in B with a < b.
+ */
+
+import OldCfgImpl
+
+private module Utils = EvalOrderCfgUtils<OldCfg>;
+
+private import Utils
+private import Utils::CfgTests
+
+from TimerCfgNode a, TimerCfgNode b, int minA, int maxB
+where noBackwardFlow(a, b, minA, maxB)
+select a, "Backward flow: $@ flows to $@ (max timestamp $@)", a.getTimestampExpr(minA),
+  minA.toString(), b, b.getNode().toString(), b.getTimestampExpr(maxB), maxB.toString()
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBasicBlock.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBasicBlock.expected
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBasicBlock.expected
@@ -0,0 +1 @@
+
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBasicBlock.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBasicBlock.ql
new file mode 100644
index 000000000000..82d9589a9750
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoBasicBlock.ql
@@ -0,0 +1,14 @@
+/**
+ * Checks that every annotated CFG node belongs to a basic block.
+ */
+
+import OldCfgImpl
+
+private module Utils = EvalOrderCfgUtils<OldCfg>;
+
+private import Utils
+private import Utils::CfgTests
+
+from CfgNode n, TestFunction f
+where noBasicBlock(n, f)
+select n, "CFG node in $@ does not belong to any basic block", f, f.getName()
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/NoSharedReachable.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoSharedReachable.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/NoSharedReachable.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoSharedReachable.ql
new file mode 100644
index 000000000000..e9f685e8ffae
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/NoSharedReachable.ql
@@ -0,0 +1,16 @@
+/**
+ * Checks that two annotations sharing a timestamp value are on
+ * mutually exclusive CFG paths (neither can reach the other).
+ */
+
+import OldCfgImpl
+
+private module Utils = EvalOrderCfgUtils<OldCfg>;
+
+private import Utils
+private import Utils::CfgTests
+
+from TimerCfgNode a, TimerCfgNode b, int ts
+where noSharedReachable(a, b, ts)
+select a, "Shared timestamp $@ but this node reaches $@", a.getTimestampExpr(ts), ts.toString(), b,
+  b.getNode().toString()
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/OldCfgImpl.qll b/python/ql/test/library-tests/ControlFlow/evaluation-order/OldCfgImpl.qll
new file mode 100644
index 000000000000..cb7bbb495b87
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/OldCfgImpl.qll
@@ -0,0 +1,16 @@
+/**
+ * Implementation of the evaluation-order CFG signature using the existing
+ * Python control flow graph.
+ */
+
+private import python as PY
+import TimerUtils
+
+/** Existing Python CFG implementation of the evaluation-order signature. */
+module OldCfg implements EvalOrderCfgSig {
+  class CfgNode = PY::ControlFlowNode;
+
+  class BasicBlock = PY::BasicBlock;
+
+  CfgNode scopeGetEntryNode(PY::Scope s) { result = s.getEntryNode() }
+}
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/StrictForward.expected b/python/ql/test/library-tests/ControlFlow/evaluation-order/StrictForward.expected
new file mode 100644
index 000000000000..6562ff9f7b2f
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/StrictForward.expected
@@ -0,0 +1,11 @@
+| test_boolean.py:9:10:9:43 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_boolean.py:9:59:9:59 | IntegerLiteral | timestamp 2 | test_boolean.py:9:19:9:19 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:15:10:15:43 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_boolean.py:15:50:15:50 | IntegerLiteral | timestamp 1 | test_boolean.py:15:20:15:20 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:21:10:21:42 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_boolean.py:21:49:21:49 | IntegerLiteral | timestamp 1 | test_boolean.py:21:19:21:19 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:27:10:27:34 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_boolean.py:27:50:27:50 | IntegerLiteral | timestamp 2 | test_boolean.py:27:20:27:20 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:40:10:40:61 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_boolean.py:40:86:40:86 | IntegerLiteral | timestamp 3 | test_boolean.py:40:16:40:16 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:46:10:46:61 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_boolean.py:46:86:46:86 | IntegerLiteral | timestamp 3 | test_boolean.py:46:16:46:16 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:52:10:52:95 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_boolean.py:52:120:52:120 | IntegerLiteral | timestamp 4 | test_boolean.py:52:63:52:63 | IntegerLiteral | timestamp 2 |
+| test_boolean.py:52:11:52:47 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_boolean.py:52:63:52:63 | IntegerLiteral | timestamp 2 | test_boolean.py:52:20:52:20 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:64:10:64:52 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_boolean.py:64:59:64:59 | IntegerLiteral | timestamp 6 | test_boolean.py:64:17:64:17 | IntegerLiteral | timestamp 0 |
+| test_boolean.py:76:10:76:51 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_boolean.py:76:58:76:58 | IntegerLiteral | timestamp 6 | test_boolean.py:76:17:76:17 | IntegerLiteral | timestamp 0 |
+| test_if.py:96:9:96:29 | ControlFlowNode for BoolExpr | Strict forward violation: $@ flows to $@ | test_if.py:96:36:96:36 | IntegerLiteral | timestamp 4 | test_if.py:96:15:96:15 | IntegerLiteral | timestamp 2 |
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/StrictForward.ql b/python/ql/test/library-tests/ControlFlow/evaluation-order/StrictForward.ql
new file mode 100644
index 000000000000..79b383a4acfa
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/StrictForward.ql
@@ -0,0 +1,17 @@
+/**
+ * Stronger version of NoBackwardFlow: for consecutive annotated nodes
+ * A -> B that both have a single timestamp (non-loop code) and B does
+ * NOT dominate A (forward edge), requires max(A) < min(B).
+ */
+
+import OldCfgImpl
+
+private module Utils = EvalOrderCfgUtils<OldCfg>;
+
+private import Utils
+private import Utils::CfgTests
+
+from TimerCfgNode a, TimerCfgNode b, int maxA, int minB
+where strictForward(a, b, maxA, minB)
+select a, "Strict forward violation: $@ flows to $@", a.getTimestampExpr(maxA), "timestamp " + maxA,
+  b.getTimestampExpr(minB), "timestamp " + minB
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/TimerUtils.qll b/python/ql/test/library-tests/ControlFlow/evaluation-order/TimerUtils.qll
new file mode 100644
index 000000000000..23f8f3a50a0a
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/TimerUtils.qll
@@ -0,0 +1,614 @@
+/**
+ * Utility library for identifying timer annotations in evaluation-order tests.
+ *
+ * Identifies `expr @ t[n]` (matmul) and `t(expr, n)` (call) patterns,
+ * including `dead(n)` and `never` markers within subscripts, extracts
+ * timestamp values, and provides predicates for traversing consecutive
+ * annotated CFG nodes.
+ */
+
+import python
+
+/**
+ * A function decorated with `@test` from the timer module.
+ * The first parameter is the timer object.
+ */
+class TestFunction extends Function {
+  TestFunction() {
+    this.getADecorator().(Name).getId() = "test" and
+    this.getPositionalParameterCount() >= 1
+  }
+
+  /** Gets the name of the timer parameter (first parameter). */
+  string getTimerParamName() { result = this.getArgName(0) }
+}
+
+/**
+ * Gets an element from a timestamp subscript index. Each element is either
+ * an `IntegerLiteral` (live), a `Call` to `dead` (dead), a `Name("never")`
+ * (never), or a tuple containing any mix of these.
+ */
+private Expr timestampElement(Expr timestamps) {
+  result = timestamps and not timestamps instanceof Tuple
+  or
+  result = timestamps.(Tuple).getAnElt()
+}
+
+/** Gets a live timestamp value from a subscript index expression. */
+private IntegerLiteral liveTimestampLiteral(Expr timestamps) {
+  result = timestampElement(timestamps) and
+  not result = any(Call c).getAnArg()
+}
+
+/** Gets a dead timestamp value from a subscript index expression. */
+private IntegerLiteral deadTimestampLiteral(Expr timestamps) {
+  exists(Call c |
+    c = timestampElement(timestamps) and
+    c.getFunc().(Name).getId() = "dead" and
+    result = c.getArg(0)
+  )
+}
+
+/** Holds if the subscript index contains `never`. */
+private predicate hasNever(Expr timestamps) {
+  timestampElement(timestamps).(Name).getId() = "never"
+}
+
+/** A timer annotation in the AST. */
+private newtype TTimerAnnotation =
+  /** `expr @ t[n]` or `expr @ t[n, m, ...]` or `expr @ t[dead(n), m, never]` */
+  TMatmulAnnotation(TestFunction func, Expr annotated, Expr timestamps) {
+    exists(BinaryExpr be |
+      be.getOp() instanceof MatMult and
+      be.getRight().(Subscript).getObject().(Name).getId() = func.getTimerParamName() and
+      be.getScope().getEnclosingScope*() = func and
+      annotated = be.getLeft() and
+      timestamps = be.getRight().(Subscript).getIndex()
+    )
+  } or
+  /** `t(expr, n)` */
+  TCallAnnotation(TestFunction func, Expr annotated, Expr timestamps) {
+    exists(Call call |
+      call.getFunc().(Name).getId() = func.getTimerParamName() and
+      call.getScope().getEnclosingScope*() = func and
+      annotated = call.getArg(0) and
+      timestamps = call.getArg(1)
+    )
+  }
+
+/** A timer annotation (wrapping the newtype for a clean API). */
+class TimerAnnotation extends TTimerAnnotation {
+  /** Gets a live timestamp value from this annotation. */
+  int getATimestamp() { exists(this.getTimestampExpr(result)) }
+
+  /** Gets the source expression for live timestamp value `ts`. */
+  IntegerLiteral getTimestampExpr(int ts) {
+    result = liveTimestampLiteral(this.getTimestampsExpr()) and
+    result.getValue() = ts
+  }
+
+  /** Gets a dead timestamp value from this annotation. */
+  int getADeadTimestamp() { exists(this.getDeadTimestampExpr(result)) }
+
+  /** Gets the source expression for dead timestamp value `ts`. */
+  IntegerLiteral getDeadTimestampExpr(int ts) {
+    result = deadTimestampLiteral(this.getTimestampsExpr()) and
+    result.getValue() = ts
+  }
+
+  /** Gets the raw timestamp expression (single element or tuple). */
+  abstract Expr getTimestampsExpr();
+
+  /** Gets the test function this annotation belongs to. */
+  abstract TestFunction getTestFunction();
+
+  /** Gets the annotated expression (the LHS of `@` or the first arg of `t(...)`). */
+  abstract Expr getAnnotatedExpr();
+
+  /** Gets the enclosing annotation expression (the `BinaryExpr` or `Call`). */
+  abstract Expr getTimerExpr();
+
+  /** Holds if timestamp `ts` is marked as dead in this annotation. */
+  predicate isDeadTimestamp(int ts) { ts = this.getADeadTimestamp() }
+
+  /** Holds if all timestamps in this annotation are dead (no live timestamps). */
+  predicate isDead() {
+    not exists(this.getATimestamp()) and
+    not this.isNever() and
+    exists(this.getADeadTimestamp())
+  }
+
+  /** Holds if this is a never-evaluated annotation (contains `never`). */
+  predicate isNever() { hasNever(this.getTimestampsExpr()) }
+
+  string toString() { result = this.getAnnotatedExpr().toString() }
+
+  Location getLocation() { result = this.getAnnotatedExpr().getLocation() }
+}
+
+/** A matmul-based timer annotation: `expr @ t[...]`. */
+class MatmulTimerAnnotation extends TMatmulAnnotation, TimerAnnotation {
+  TestFunction func;
+  Expr annotated;
+  Expr timestamps;
+
+  MatmulTimerAnnotation() { this = TMatmulAnnotation(func, annotated, timestamps) }
+
+  override Expr getTimestampsExpr() { result = timestamps }
+
+  override TestFunction getTestFunction() { result = func }
+
+  override Expr getAnnotatedExpr() { result = annotated }
+
+  override BinaryExpr getTimerExpr() { result.getLeft() = annotated }
+}
+
+/** A call-based timer annotation: `t(expr, n)`. */
+class CallTimerAnnotation extends TCallAnnotation, TimerAnnotation {
+  TestFunction func;
+  Expr annotated;
+  Expr timestamps;
+
+  CallTimerAnnotation() { this = TCallAnnotation(func, annotated, timestamps) }
+
+  override Expr getTimestampsExpr() { result = timestamps }
+
+  override TestFunction getTestFunction() { result = func }
+
+  override Expr getAnnotatedExpr() { result = annotated }
+
+  override Call getTimerExpr() { result.getArg(0) = annotated }
+}
+
+/**
+ * Signature module defining the CFG interface needed by evaluation-order tests.
+ * This allows the test utilities to be instantiated with different CFG implementations.
+ */
+signature module EvalOrderCfgSig {
+  /** A control flow node. */
+  class CfgNode {
+    /** Gets a textual representation of this node. */
+    string toString();
+
+    /** Gets the location of this node. */
+    Location getLocation();
+
+    /** Gets the AST node corresponding to this CFG node, if any. */
+    AstNode getNode();
+
+    /** Gets a successor of this CFG node (including exceptional). */
+    CfgNode getASuccessor();
+
+    /** Gets a true-branch successor of this CFG node, if any. */
+    CfgNode getATrueSuccessor();
+
+    /** Gets a false-branch successor of this CFG node, if any. */
+    CfgNode getAFalseSuccessor();
+
+    /** Gets an exceptional successor of this CFG node. */
+    CfgNode getAnExceptionalSuccessor();
+
+    /** Gets the scope containing this CFG node. */
+    Scope getScope();
+
+    /** Gets the basic block containing this CFG node. */
+    BasicBlock getBasicBlock();
+  }
+
+  /** A basic block in the control flow graph. */
+  class BasicBlock {
+    /** Gets the CFG node at position `n` in this basic block. */
+    CfgNode getNode(int n);
+
+    /** Holds if this basic block reaches `bb` (reflexive). */
+    predicate reaches(BasicBlock bb);
+
+    /** Holds if this basic block strictly reaches `bb` (non-reflexive). */
+    predicate strictlyReaches(BasicBlock bb);
+
+    /** Holds if this basic block strictly dominates `bb`. */
+    predicate strictlyDominates(BasicBlock bb);
+  }
+
+  /** Gets the entry CFG node for scope `s`. */
+  CfgNode scopeGetEntryNode(Scope s);
+}
+
+/**
+ * Parameterised module providing CFG-dependent utilities for evaluation-order tests.
+ * Instantiate with a specific CFG implementation to get `TimerCfgNode` and related predicates.
+ */
+module EvalOrderCfgUtils<EvalOrderCfgSig Input> {
+  /** The CFG node type from the underlying implementation. */
+  final class CfgNode = Input::CfgNode;
+
+  /** The basic block type from the underlying implementation (named to avoid clash with `python::BasicBlock`). */
+  final class CfgBasicBlock = Input::BasicBlock;
+
+  /** Gets the entry CFG node for scope `s`. */
+  CfgNode scopeGetEntryNode(Scope s) { result = Input::scopeGetEntryNode(s) }
+
+  /**
+   * A CFG node corresponding to a timer annotation.
+   */
+  class TimerCfgNode extends CfgNode {
+    private TimerAnnotation annot;
+
+    TimerCfgNode() { annot.getAnnotatedExpr() = this.getNode() }
+
+    /** Gets a timestamp value from this annotation. */
+    int getATimestamp() { result = annot.getATimestamp() }
+
+    /** Gets the source expression for timestamp value `ts`. */
+    IntegerLiteral getTimestampExpr(int ts) { result = annot.getTimestampExpr(ts) }
+
+    /** Gets the test function this annotation belongs to. */
+    TestFunction getTestFunction() { result = annot.getTestFunction() }
+
+    /** Holds if timestamp `ts` is marked as dead. */
+    predicate isDeadTimestamp(int ts) { annot.isDeadTimestamp(ts) }
+
+    /** Holds if all timestamps in this annotation are dead. */
+    predicate isDead() { annot.isDead() }
+
+    /** Holds if this is a never-evaluated annotation. */
+    predicate isNever() { annot.isNever() }
+  }
+
+  /**
+   * Holds if `next` is the next timer annotation reachable from `n` via
+   * CFG successors (both normal and exceptional), skipping non-annotated
+   * intermediaries within the same scope.
+   */
+  predicate nextTimerAnnotation(CfgNode n, TimerCfgNode next) {
+    next = n.getASuccessor() and
+    next.getScope() = n.getScope()
+    or
+    exists(CfgNode mid |
+      mid = n.getASuccessor() and
+      not mid instanceof TimerCfgNode and
+      mid.getScope() = n.getScope() and
+      nextTimerAnnotation(mid, next)
+    )
+  }
+
+  /**
+   * Holds if `next` is the next timer annotation reachable from `n` via
+   * the true branch, skipping non-annotated intermediaries and after-value
+   * nodes for the same AST node.
+   */
+  predicate nextTimerAnnotationFromTrue(CfgNode n, TimerCfgNode next) {
+    exists(CfgNode trueSucc |
+      trueSucc = n.getATrueSuccessor() and
+      trueSucc.getScope() = n.getScope()
+    |
+      // If the true successor is a different annotated node, use it
+      next = trueSucc and next.getNode() != n.getNode()
+      or
+      // Otherwise skip through it (it's an after-value node for the same expr)
+      nextTimerAnnotation(trueSucc, next)
+    )
+  }
+
+  /**
+   * Holds if `next` is the next timer annotation reachable from `n` via
+   * the false branch, skipping non-annotated intermediaries and after-value
+   * nodes for the same AST node.
+   */
+  predicate nextTimerAnnotationFromFalse(CfgNode n, TimerCfgNode next) {
+    exists(CfgNode falseSucc |
+      falseSucc = n.getAFalseSuccessor() and
+      falseSucc.getScope() = n.getScope()
+    |
+      // If the false successor is a different annotated node, use it
+      next = falseSucc and next.getNode() != n.getNode()
+      or
+      // Otherwise skip through it (it's an after-value node for the same expr)
+      nextTimerAnnotation(falseSucc, next)
+    )
+  }
+
+  /** CFG-dependent test predicates, one per evaluation-order query. */
+  module CfgTests {
+    /**
+     * Holds if live annotation `a` in function `f` is unreachable from
+     * the function entry in the CFG.
+     */
+    predicate allLiveReachable(TimerCfgNode a, TestFunction f) {
+      not a.isDead() and
+      f = a.getTestFunction() and
+      a.getScope() = f and
+      not scopeGetEntryNode(f).getBasicBlock().reaches(a.getBasicBlock())
+    }
+
+    /**
+     * Holds if annotated node `a` is followed by unannotated `succ` in the
+     * same basic block.
+     */
+    predicate basicBlockAnnotationGap(TimerCfgNode a, CfgNode succ) {
+      exists(CfgBasicBlock bb, int i |
+        a = bb.getNode(i) and
+        succ = bb.getNode(i + 1)
+      ) and
+      not succ instanceof TimerCfgNode and
+      not isUnannotatable(succ.getNode()) and
+      not isTimerMechanism(succ.getNode(), a.getTestFunction()) and
+      not exists(a.getAnExceptionalSuccessor()) and
+      succ.getNode() instanceof Expr
+    }
+
+    /**
+     * Holds if annotations `a` and `b` appear in the same basic block with
+     * `a` before `b`, but `a`'s minimum timestamp is not less than `b`'s.
+     */
+    predicate basicBlockOrdering(TimerCfgNode a, TimerCfgNode b, int minA, int minB) {
+      exists(CfgBasicBlock bb, int i, int j | a = bb.getNode(i) and b = bb.getNode(j) and i < j) and
+      minA = min(a.getATimestamp()) and
+      minB = min(b.getATimestamp()) and
+      minA >= minB
+    }
+
+    /**
+     * Holds if function `f` has an annotation in a nested scope
+     * (generator, async function, comprehension, lambda).
+     */
+    private predicate hasNestedScopeAnnotation(TestFunction f) {
+      exists(TimerAnnotation a |
+        a.getTestFunction() = f and
+        a.getAnnotatedExpr().getScope() != f
+      )
+    }
+
+    /**
+     * Holds if annotation `ann` with timestamp `a` has no consecutive
+     * successor (expected `a + 1`) in the CFG.
+     */
+    predicate consecutiveTimestamps(TimerAnnotation ann, int a) {
+      not hasNestedScopeAnnotation(ann.getTestFunction()) and
+      not ann.isDead() and
+      a = ann.getATimestamp() and
+      not exists(TimerCfgNode x, TimerCfgNode y |
+        ann.getAnnotatedExpr() = x.getNode() and
+        nextTimerAnnotation(x, y) and
+        (a + 1) = y.getATimestamp()
+      ) and
+      // Exclude the maximum timestamp in the function (it has no successor)
+      not a =
+        max(TimerAnnotation other |
+          other.getTestFunction() = ann.getTestFunction()
+        |
+          other.getATimestamp()
+        )
+    }
+
+    /**
+     * Holds if the expression annotated with `t.never` is reachable from
+     * its scope's entry.
+     */
+    predicate neverReachable(TimerAnnotation ann) {
+      ann.isNever() and
+      exists(CfgNode n, Scope s |
+        n.getNode() = ann.getAnnotatedExpr() and
+        s = n.getScope() and
+        (
+          // Reachable via inter-block path (includes same block)
+          scopeGetEntryNode(s).getBasicBlock().reaches(n.getBasicBlock())
+          or
+          // In same block as entry but at a later index
+          exists(CfgBasicBlock bb, int i, int j |
+            bb.getNode(i) = scopeGetEntryNode(s) and bb.getNode(j) = n and i < j
+          )
+        )
+      )
+    }
+
+    /**
+     * Holds if consecutive annotated nodes `a` -> `b` have backward time
+     * flow (`minA >= maxB`).
+     */
+    predicate noBackwardFlow(TimerCfgNode a, TimerCfgNode b, int minA, int maxB) {
+      nextTimerAnnotation(a, b) and
+      not a.isDead() and
+      not b.isDead() and
+      minA = min(a.getATimestamp()) and
+      maxB = max(b.getATimestamp()) and
+      minA >= maxB
+    }
+
+    /**
+     * Holds if annotations `a` and `b` share timestamp `ts` but `a`
+     * can reach `b` in the CFG.
+     */
+    predicate noSharedReachable(TimerCfgNode a, TimerCfgNode b, int ts) {
+      a != b and
+      not a.isDead() and
+      not b.isDead() and
+      a.getTestFunction() = b.getTestFunction() and
+      ts = a.getATimestamp() and
+      ts = b.getATimestamp() and
+      (
+        a.getBasicBlock().strictlyReaches(b.getBasicBlock())
+        or
+        exists(CfgBasicBlock bb, int i, int j | a = bb.getNode(i) and b = bb.getNode(j) and i < j)
+      )
+    }
+
+    /**
+     * Holds if consecutive single-timestamp annotations `a` -> `b` on a
+     * forward edge have `maxA >= minB`.
+     */
+    predicate strictForward(TimerCfgNode a, TimerCfgNode b, int maxA, int minB) {
+      nextTimerAnnotation(a, b) and
+      not a.isDead() and
+      not b.isDead() and
+      // Only apply to non-loop code (single timestamps on both sides)
+      strictcount(a.getATimestamp()) = 1 and
+      strictcount(b.getATimestamp()) = 1 and
+      // Forward edge: B does not strictly dominate A (excludes loop back-edges
+      // but still checks same-basic-block pairs)
+      not b.getBasicBlock().strictlyDominates(a.getBasicBlock()) and
+      maxA = max(a.getATimestamp()) and
+      minB = min(b.getATimestamp()) and
+      maxA >= minB
+    }
+
+    /**
+     * Holds if CFG node `n` in test function `f` does not belong to any basic block.
+     */
+    predicate noBasicBlock(CfgNode n, TestFunction f) {
+      n.getScope() = f and
+      not exists(n.getBasicBlock())
+    }
+
+    /**
+     * Holds if non-dead annotation `ann` has no corresponding CFG node.
+     */
+    predicate annotationWithoutCfgNode(TimerAnnotation ann) {
+      not ann.isDead() and
+      not ann.isNever() and
+      not exists(CfgNode n | n.getNode() = ann.getAnnotatedExpr())
+    }
+
+    predicate annotationWithCfgNode(TimerAnnotation ann) {
+      exists(CfgNode n | n.getNode() = ann.getAnnotatedExpr())
+    }
+
+    /**
+     * Holds if annotation `ann` with timestamp `a` has no consecutive
+     * predecessor (expected `a - 1`) in the CFG.
+     */
+    predicate consecutivePredecessorTimestamps(TimerAnnotation ann, int a) {
+      not hasNestedScopeAnnotation(ann.getTestFunction()) and
+      not ann.isDead() and
+      a = ann.getATimestamp() and
+      not exists(TimerCfgNode x, TimerCfgNode y |
+        ann.getAnnotatedExpr() = y.getNode() and
+        nextTimerAnnotation(x, y) and
+        (a - 1) = x.getATimestamp()
+      ) and
+      // Exclude the minimum timestamp in the function (it has no predecessor)
+      not a =
+        min(TimerAnnotation other |
+          other.getTestFunction() = ann.getTestFunction() and
+          not other.isDead()
+        |
+          other.getATimestamp()
+        )
+    }
+
+    /**
+     * Holds if `node` has both a true and false successor, but the true
+     * successor's timestamp `ts` is not marked as dead on the false
+     * successor (or vice versa).
+     *
+     * This checks that boolean branches are properly annotated: when a
+     * condition splits into true/false paths, the next annotated node
+     * on each side should account for the other side's timestamps as dead.
+     */
+    predicate missingBranchTimestamp(TimerCfgNode node, int ts, string branch) {
+      not hasNestedScopeAnnotation(node.getTestFunction()) and
+      exists(TimerCfgNode trueNext, TimerCfgNode falseNext |
+        nextTimerAnnotationFromTrue(node, trueNext) and
+        nextTimerAnnotationFromFalse(node, falseNext) and
+        trueNext != falseNext
+      |
+        // True successor has live timestamp ts, but false successor
+        // doesn't have it as dead
+        ts = trueNext.getATimestamp() and
+        not falseNext.isDeadTimestamp(ts) and
+        not ts = falseNext.getATimestamp() and
+        branch = "false"
+        or
+        // False successor has live timestamp ts, but true successor
+        // doesn't have it as dead
+        ts = falseNext.getATimestamp() and
+        not trueNext.isDeadTimestamp(ts) and
+        not ts = trueNext.getATimestamp() and
+        branch = "true"
+      )
+    }
+  }
+}
+
+/**
+ * Holds if `e` is part of the timer mechanism: a top-level timer
+ * expression or a (transitive) sub-expression of one.
+ */
+predicate isTimerMechanism(Expr e, TestFunction f) {
+  exists(TimerAnnotation a |
+    a.getTestFunction() = f and
+    e = a.getTimerExpr().getASubExpression*()
+  )
+}
+
+/**
+ * Holds if expression `e` cannot be annotated due to Python syntax
+ * limitations (e.g., it is a definition target, a pattern, or part
+ * of a decorator application).
+ */
+predicate isUnannotatable(Expr e) {
+  // Function/class definitions
+  e instanceof FunctionExpr
+  or
+  e instanceof ClassExpr
+  or
+  // Docstrings are string literals used as expression statements
+  e instanceof StringLiteral and e.getParent() instanceof ExprStmt
+  or
+  // Function parameters are bound by the call, not evaluated in the body
+  e instanceof Parameter
+  or
+  // Name nodes that are definitions or deletions (assignment targets, def/class
+  // name bindings, augmented assignment targets, for-loop targets, del targets)
+  e.(Name).isDefinition()
+  or
+  e.(Name).isDeletion()
+  or
+  // Tuple/List/Starred nodes in assignment or for-loop targets are
+  // structural unpack patterns, not evaluations
+  (e instanceof Tuple or e instanceof List or e instanceof Starred) and
+  e = any(AssignStmt a).getATarget().getASubExpression*()
+  or
+  (e instanceof Tuple or e instanceof List or e instanceof Starred) and
+  e = any(For f).getTarget().getASubExpression*()
+  or
+  // The decorator call node wrapping a function/class definition,
+  // and its sub-expressions (the decorator name itself)
+  e = any(FunctionExpr func).getADecoratorCall().getASubExpression*()
+  or
+  e = any(ClassExpr cls).getADecoratorCall().getASubExpression*()
+  or
+  // Augmented assignment (x += e): the implicit BinaryExpr for the operation
+  e = any(AugAssign aug).getOperation()
+  or
+  // with-statement `as` variables are bindings
+  (e instanceof Name or e instanceof Tuple or e instanceof List) and
+  e = any(With w).getOptionalVars().getASubExpression*()
+  or
+  // except-clause exception type and `as` variable are part of except syntax
+  exists(ExceptStmt ex | e = ex.getType() or e = ex.getName())
+  or
+  // match/case pattern expressions are part of pattern syntax
+  e.getParent+() instanceof Pattern
+  or
+  // Subscript/Attribute nodes on the LHS of an assignment are store
+  // operations, not value expressions (including nested ones like d["a"][1])
+  (e instanceof Subscript or e instanceof Attribute) and
+  e = any(AssignStmt a).getATarget().getASubExpression*()
+  or
+  // Match/case guard nodes are part of case syntax
+  e instanceof Guard
+  or
+  // Yield/YieldFrom in statement position — the return value is
+  // discarded and cannot be meaningfully annotated
+  (e instanceof Yield or e instanceof YieldFrom) and
+  e.getParent() instanceof ExprStmt
+  or
+  // Synthetic nodes inside desugared comprehensions
+  e.getScope() = any(Comp c).getFunction() and
+  (
+    e.(Name).getId() = ".0"
+    or
+    e instanceof Tuple and e.getParent() instanceof Yield
+  )
+}
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_assert_raise.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_assert_raise.py
new file mode 100644
index 000000000000..692a9c6e407c
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_assert_raise.py
@@ -0,0 +1,56 @@
+"""Assert and raise statement evaluation order."""
+
+from timer import test, dead
+
+
+@test
+def test_assert_true(t):
+    x = True @ t[0]
+    assert x @ t[1]
+    y = 1 @ t[2]
+
+
+@test
+def test_assert_true_with_message(t):
+    x = True @ t[0]
+    assert x @ t[1], "msg" @ t[dead(2)]
+    y = 1 @ t[2]
+
+
+@test
+def test_assert_false_caught(t):
+    try:
+        x = False @ t[0]
+        assert x @ t[1], "fail" @ t[2]
+    except AssertionError:
+        y = 1 @ t[3]
+
+
+@test
+def test_raise_caught(t):
+    try:
+        x = 1 @ t[0]
+        raise ((ValueError @ t[1])("test" @ t[2]) @ t[3])
+    except ValueError:
+        y = 2 @ t[4]
+
+
+@test
+def test_raise_from_caught(t):
+    try:
+        x = 1 @ t[0]
+        raise ((ValueError @ t[1])("test" @ t[2]) @ t[3]) from ((RuntimeError @ t[4])("cause" @ t[5]) @ t[6])
+    except ValueError:
+        y = 2 @ t[7]
+
+
+@test
+def test_bare_reraise(t):
+    try:
+        try:
+            raise ((ValueError @ t[0])("test" @ t[1]) @ t[2])
+        except ValueError:
+            x = 1 @ t[3]
+            raise
+    except ValueError:
+        y = 2 @ t[4]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_async.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_async.py
new file mode 100644
index 000000000000..0c9b08e3e9eb
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_async.py
@@ -0,0 +1,97 @@
+"""Async/await evaluation order tests.
+
+Coroutine bodies are lazy — like generators, the body runs only when
+awaited (or driven by the event loop).  asyncio.run() drives the
+coroutine to completion synchronously from the caller's perspective.
+"""
+
+import asyncio
+from contextlib import asynccontextmanager
+from timer import test
+
+
+@test
+def test_simple_async(t):
+    """Simple async function: body runs inside asyncio.run()."""
+    async def coro():
+        x = 1 @ t[4]
+        return x @ t[5]
+
+    result = ((asyncio @ t[0]).run @ t[1])((coro @ t[2])() @ t[3]) @ t[6]
+
+
+@test
+def test_await_expression(t):
+    """await suspends the caller until the inner coroutine completes."""
+    async def helper():
+        return 1 @ t[4]
+
+    async def main():
+        x = await helper() @ t[5]
+        return x @ t[6]
+
+    result = ((asyncio @ t[0]).run @ t[1])((main @ t[2])() @ t[3]) @ t[7]
+
+
+@test
+def test_async_for(t):
+    """async for iterates an async generator."""
+    async def agen():
+        yield 1 @ t[5]
+        yield 2 @ t[7]
+
+    async def main():
+        async for val in agen() @ t[4]:
+            val @ t[6, 8]
+
+    ((asyncio @ t[0]).run @ t[1])((main @ t[2])() @ t[3]) @ t[9]
+
+
+@test
+def test_async_with(t):
+    """async with enters/exits an async context manager."""
+    @asynccontextmanager
+    async def ctx():
+        yield 1 @ t[5]
+
+    async def main():
+        async with ctx() @ t[4] as val:
+            val @ t[6]
+
+    ((asyncio @ t[0]).run @ t[1])((main @ t[2])() @ t[3]) @ t[7]
+
+
+@test
+def test_multiple_awaits(t):
+    """Sequential awaits in one coroutine."""
+    async def task_a():
+        return 10 @ t[4]
+
+    async def task_b():
+        return 20 @ t[6]
+
+    async def main():
+        a = await task_a() @ t[5]
+        b = await task_b() @ t[7]
+        return (a @ t[8] + b @ t[9]) @ t[10]
+
+    result = ((asyncio @ t[0]).run @ t[1])((main @ t[2])() @ t[3]) @ t[11]
+
+
+@test
+def test_gather(t):
+    """asyncio.gather schedules coroutines as concurrent tasks."""
+    async def task_a():
+        return 1 @ t[6]
+
+    async def task_b():
+        return 2 @ t[7]
+
+    async def main():
+        results = await asyncio.gather(
+            task_a() @ t[4],
+            task_b() @ t[5],
+        ) @ t[8]
+        return results @ t[9]
+
+    result = ((asyncio @ t[0]).run @ t[1])((main @ t[2])() @ t[3]) @ t[10]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_augassign.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_augassign.py
new file mode 100644
index 000000000000..2f1d5eb5c3e6
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_augassign.py
@@ -0,0 +1,53 @@
+"""Augmented assignment evaluation order."""
+
+from timer import test
+
+
+@test
+def test_plus_equals(t):
+    x = 1 @ t[0]
+    x += 2 @ t[1]
+    y = x @ t[2]
+
+
+@test
+def test_sub_mul_div(t):
+    x = 20 @ t[0]
+    x -= 5 @ t[1]
+    x *= 2 @ t[2]
+    x /= 6 @ t[3]
+    x = 17 @ t[4]
+    x //= 3 @ t[5]
+    x %= 3 @ t[6]
+    y = x @ t[7]
+
+
+@test
+def test_power_equals(t):
+    x = 2 @ t[0]
+    x **= 3 @ t[1]
+    y = x @ t[2]
+
+
+@test
+def test_bitwise_equals(t):
+    x = 0b1111 @ t[0]
+    x &= 0b1010 @ t[1]
+    x |= 0b0101 @ t[2]
+    x ^= 0b0011 @ t[3]
+    y = x @ t[4]
+
+
+@test
+def test_shift_equals(t):
+    x = 1 @ t[0]
+    x <<= 4 @ t[1]
+    x >>= 2 @ t[2]
+    y = x @ t[3]
+
+
+@test
+def test_list_extend(t):
+    x = [1 @ t[0], 2 @ t[1]] @ t[2]
+    x += [3 @ t[3], 4 @ t[4]] @ t[5]
+    y = x @ t[6]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_basic.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_basic.py
new file mode 100644
index 000000000000..efea733b0d97
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_basic.py
@@ -0,0 +1,223 @@
+"""Basic expression evaluation order.
+
+These tests verify that sub-expressions within a single expression
+are evaluated in the expected order (typically left to right for
+operands of binary operators, elements of collection literals, etc.)
+
+Every evaluated expression has a timestamp annotation, except the
+timer mechanism itself (t[n], t[dead(n)], t[never]).
+"""
+
+from timer import test, never
+
+
+@test
+def test_sequential_statements(t):
+    """Statements execute top to bottom."""
+    x = 1 @ t[0]
+    y = 2 @ t[1]
+    z = 3 @ t[2]
+
+
+@test
+def test_binary_add(t):
+    """In a + b, left operand evaluates before right."""
+    x = (1 @ t[0] + 2 @ t[1]) @ t[2]
+
+
+@test
+def test_binary_subtract(t):
+    """In a - b, left operand evaluates before right."""
+    x = (10 @ t[0] - 3 @ t[1]) @ t[2]
+
+
+@test
+def test_binary_multiply(t):
+    """In a * b, left operand evaluates before right."""
+    x = ((3 @ t[0]) * (4 @ t[1])) @ t[2]
+
+
+@test
+def test_nested_binary(t):
+    """Sub-expressions evaluate before their containing expression."""
+    x = ((1 @ t[0] + 2 @ t[1]) @ t[2] + (3 @ t[3] + 4 @ t[4]) @ t[5]) @ t[6]
+
+
+@test
+def test_chained_add(t):
+    """a + b + c is (a + b) + c: left to right."""
+    x = (1 @ t[0] + 2 @ t[1] + 3 @ t[2]) @ t[3]
+
+
+@test
+def test_mixed_precedence(t):
+    """In a + b * c, all operands still evaluate left to right."""
+    x = (1 @ t[0] + ((2 @ t[1]) * (3 @ t[2])) @ t[3]) @ t[4]
+
+
+@test
+def test_string_concat(t):
+    """String concatenation operands: left to right."""
+    x = ("hello" @ t[0] + " " @ t[1] + "world" @ t[2]) @ t[3]
+
+
+@test
+def test_comparison(t):
+    """In a < b, left operand evaluates before right."""
+    x = (1 @ t[0] < 2 @ t[1]) @ t[2]
+
+
+@test
+def test_chained_comparison(t):
+    """Chained a < b < c: all evaluated left to right (b only once)."""
+    x = (1 @ t[0] < 2 @ t[1] < 3 @ t[2]) @ t[3]
+
+
+@test
+def test_list_elements(t):
+    """List elements evaluate left to right."""
+    x = [1 @ t[0], 2 @ t[1], 3 @ t[2]] @ t[3]
+
+
+@test
+def test_dict_entries(t):
+    """Dict: key before value, entries left to right."""
+    d = {1 @ t[0]: "a" @ t[1], 2 @ t[2]: "b" @ t[3]} @ t[4]
+
+
+@test
+def test_tuple_elements(t):
+    """Tuple elements evaluate left to right."""
+    x = (1 @ t[0], 2 @ t[1], 3 @ t[2]) @ t[3]
+
+
+@test
+def test_set_elements(t):
+    """Set elements evaluate left to right."""
+    x = {1 @ t[0], 2 @ t[1], 3 @ t[2]} @ t[3]
+
+
+@test
+def test_subscript(t):
+    """In obj[idx], object evaluates before index."""
+    x = ([10 @ t[0], 20 @ t[1], 30 @ t[2]] @ t[3])[1 @ t[4]] @ t[5]
+
+
+@test
+def test_slice(t):
+    """Slice parameters: object, then start, then stop."""
+    x = ([1 @ t[0], 2 @ t[1], 3 @ t[2], 4 @ t[3], 5 @ t[4]] @ t[5])[1 @ t[6]:3 @ t[7]] @ t[8]
+
+
+@test
+def test_method_call(t):
+    """Object evaluated, then attribute lookup, then arguments left to right, then call."""
+    x = (("hello world" @ t[0]).replace @ t[1])("world" @ t[2], "there" @ t[3]) @ t[4]
+
+
+@test
+def test_method_chaining(t):
+    """Chained method calls: left to right."""
+    x = ((((" hello " @ t[0]).strip @ t[1])() @ t[2]).upper @ t[3])() @ t[4]
+
+
+@test
+def test_unary_not(t):
+    """Unary not: operand evaluated first."""
+    x = (not True @ t[0]) @ t[1]
+
+
+@test
+def test_unary_neg(t):
+    """Unary negation: operand evaluated first."""
+    x = (-(3 @ t[0])) @ t[1]
+
+
+@test
+def test_multiple_assignment(t):
+    """RHS evaluated once in x = y = expr."""
+    x = y = (1 @ t[0] + 2 @ t[1]) @ t[2]
+
+
+@test
+def test_callable_syntax(t):
+    """t(value, n) is equivalent to value @ t[n]."""
+    x = t(t(1, 0) + t(2, 1), 2)
+    y = t(t(x, 3) * t(3, 4), 5)
+
+
+@test
+def test_subscript_assign(t):
+    """In obj[idx] = val, value is evaluated before target sub-expressions."""
+    lst = [0 @ t[0], 0 @ t[1], 0 @ t[2]] @ t[3]
+    (lst @ t[5])[1 @ t[6]] = 42 @ t[4]
+    x = lst @ t[7]
+
+
+@test
+def test_attribute_assign(t):
+    """In obj.attr = val, value is evaluated before the object."""
+    class Obj:
+        pass
+    o = (Obj @ t[0])() @ t[1]
+    (o @ t[3]).x = 42 @ t[2]
+    y = (o @ t[4]).x @ t[5]
+
+
+@test
+def test_nested_subscript_assign(t):
+    """Nested subscript assignment: val, then outer obj, then keys."""
+    d = {"a" @ t[0]: [0 @ t[1], 0 @ t[2]] @ t[3]} @ t[4]
+    (d @ t[6])["a" @ t[7]][1 @ t[8]] = 99 @ t[5]
+    x = d @ t[9]
+
+
+@test
+def test_unreachable_after_return(t):
+    """Code after return has no CFG node."""
+    def f():
+        x = 1 @ t[1]
+        return x @ t[2]
+        y = 2 @ t[never]
+    result = (f @ t[0])() @ t[3]
+
+
+@test
+def test_none_literal(t):
+    """None is a name constant."""
+    x = None @ t[0]
+    y = (x @ t[1] is None @ t[2]) @ t[3]
+
+
+@test
+def test_delete(t):
+    """del statement removes a variable binding."""
+    x = 1 @ t[0]
+    del x
+    y = 2 @ t[1]
+
+
+@test
+def test_global(t):
+    """global statement allows writing to module-level variable."""
+    global _test_global_var
+    _test_global_var = 1 @ t[0]
+    x = _test_global_var @ t[1]
+
+
+@test
+def test_nonlocal(t):
+    """nonlocal statement allows inner function to rebind outer variable."""
+    x = 0 @ t[0]
+    def inner():
+        nonlocal x
+        x = 1 @ t[2]
+    (inner @ t[1])() @ t[3]
+    y = x @ t[4]
+
+
+@test
+def test_walrus(t):
+    """Walrus operator := evaluates the RHS and binds it."""
+    if (y := 1 @ t[0]) @ t[1]:
+        z = y @ t[2]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_boolean.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_boolean.py
new file mode 100644
index 000000000000..a12975634f49
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_boolean.py
@@ -0,0 +1,76 @@
+"""Short-circuit boolean operators and evaluation order."""
+
+from timer import test, dead
+
+
+@test
+def test_and_both_sides(t):
+    # True and X — both operands evaluated, result is X
+    x = (True @ t[0] and 42 @ t[1, dead(2)]) @ t[dead(1), 2]
+
+
+@test
+def test_and_short_circuit(t):
+    # False and ... — right side never evaluated
+    x = (False @ t[0] and True @ t[dead(1)]) @ t[1, dead(2)]
+
+
+@test
+def test_or_short_circuit(t):
+    # True or ... — right side never evaluated
+    x = (True @ t[0] or False @ t[dead(1)]) @ t[1, dead(2)]
+
+
+@test
+def test_or_both_sides(t):
+    # False or X — both operands evaluated, result is X
+    x = (False @ t[0] or 42 @ t[1]) @ t[dead(1), 2]
+
+
+@test
+def test_not(t):
+    # not evaluates its operand, then negates
+    x = (not True @ t[0]) @ t[1]
+    y = (not False @ t[2]) @ t[3]
+
+
+@test
+def test_chained_and(t):
+    # 1 and 2 and 3 — all truthy, all evaluated left-to-right
+    x = (1 @ t[0] and 2 @ t[1, dead(3)] and 3 @ t[2, dead(3)]) @ t[dead(1), dead(2), 3]
+
+
+@test
+def test_chained_or(t):
+    # 0 or "" or 42 — first two falsy, all evaluated until truthy found
+    x = (0 @ t[0] or "" @ t[1, dead(3)] or 42 @ t[2, dead(3)]) @ t[dead(1), dead(2), 3]
+
+
+@test
+def test_mixed_and_or(t):
+    # True and False or 42 => (True and False) or 42 => False or 42 => 42
+    x = ((True @ t[0] and False @ t[1, dead(2)]) @ t[dead(1), 2, dead(4)] or 42 @ t[3, dead(4)]) @ t[dead(2), dead(3), 4]
+
+
+@test
+def test_and_side_effects(t):
+    # Both functions called when left side is truthy
+    def f():
+        return 10 @ t[1]
+
+    def g():
+        return 20 @ t[4]
+
+    x = ((f @ t[0])() @ t[2] and (g @ t[3])() @ t[5]) @ t[6]
+
+
+@test
+def test_or_side_effects(t):
+    # Both functions called when left side is falsy
+    def f():
+        return 0 @ t[1]
+
+    def g():
+        return 20 @ t[4]
+
+    x = ((f @ t[0])() @ t[2] or (g @ t[3])() @ t[5]) @ t[6]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_classes.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_classes.py
new file mode 100644
index 000000000000..92313b5073c3
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_classes.py
@@ -0,0 +1,74 @@
+"""Class definitions — evaluation order."""
+
+from timer import test
+
+
+@test
+def test_simple_class(t):
+    """Simple class definition and instantiation."""
+    class Foo:
+        pass
+    obj = (Foo @ t[0])() @ t[1]
+
+
+@test
+def test_class_with_bases(t):
+    """Base class expressions evaluated at class definition time."""
+    class Base:
+        pass
+    class Derived(Base @ t[0]):
+        pass
+    obj = (Derived @ t[1])() @ t[2]
+
+
+@test
+def test_class_with_methods(t):
+    """Object evaluated before method is called."""
+    class Foo:
+        def greet(self, name):
+            return ("hello " @ t[5] + name @ t[6]) @ t[7]
+    obj = (Foo @ t[0])() @ t[1]
+    msg = ((obj @ t[2]).greet @ t[3])("world" @ t[4]) @ t[8]
+
+
+@test
+def test_class_instantiation(t):
+    """Arguments to __init__ evaluate before instantiation completes."""
+    class Foo:
+        def __init__(self, x):
+            (self @ t[3]).x = x @ t[2]
+    obj = (Foo @ t[0])(42 @ t[1]) @ t[4]
+    val = (obj @ t[5]).x @ t[6]
+
+
+@test
+def test_method_call(t):
+    """Method arguments evaluate left-to-right before the call."""
+    class Calculator:
+        def __init__(self, value):
+            (self @ t[3]).value = value @ t[2]
+        def add(self, x):
+            return ((self @ t[8]).value @ t[9] + x @ t[10]) @ t[11]
+    calc = (Calculator @ t[0])(10 @ t[1]) @ t[4]
+    result = ((calc @ t[5]).add @ t[6])(5 @ t[7]) @ t[12]
+
+
+@test
+def test_class_level_attribute(t):
+    """Multiple attribute accesses in a single expression."""
+    class Config:
+        debug = True @ t[0]
+        version = 1 @ t[1]
+    x = ((Config @ t[2]).debug @ t[3], (Config @ t[4]).version @ t[5]) @ t[6]
+
+
+@test
+def test_class_decorator(t):
+    """Decorator expression evaluated, class defined, then decorator called."""
+    def add_marker(cls):
+        (cls @ t[2]).marked = True @ t[1]
+        return cls @ t[3]
+    @(add_marker @ t[0])
+    class Foo:
+        pass
+    result = (Foo @ t[4]).marked @ t[5]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_comprehensions.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_comprehensions.py
new file mode 100644
index 000000000000..8ce8ca6e4c46
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_comprehensions.py
@@ -0,0 +1,46 @@
+"""Evaluation order tests for comprehensions and generator expressions."""
+
+from timer import test
+
+
+@test
+def test_list_comprehension(t):
+    items = [1 @ t[0], 2 @ t[1], 3 @ t[2]] @ t[3]
+    result = [x @ t[5, 6, 7] for x in items @ t[4]] @ t[8]
+
+
+@test
+def test_filtered_comprehension(t):
+    items = [1 @ t[0], 2 @ t[1], 3 @ t[2], 4 @ t[3]] @ t[4]
+    result = [x @ t[14, 23] for x in items @ t[5] if (x @ t[6, 10, 15, 19] % 2 @ t[7, 11, 16, 20] == 0 @ t[8, 12, 17, 21]) @ t[9, 13, 18, 22]] @ t[24]
+
+
+@test
+def test_dict_comprehension(t):
+    items = [("a" @ t[0], 1 @ t[1]) @ t[2], ("b" @ t[3], 2 @ t[4]) @ t[5]] @ t[6]
+    result = {k @ t[8, 10]: v @ t[9, 11] for k, v in items @ t[7]} @ t[12]
+
+
+@test
+def test_set_comprehension(t):
+    items = [1 @ t[0], 2 @ t[1], 3 @ t[2]] @ t[3]
+    result = {x @ t[5, 6, 7] for x in items @ t[4]} @ t[8]
+
+
+@test
+def test_generator_expression(t):
+    items = [1 @ t[0], 2 @ t[1], 3 @ t[2]] @ t[3]
+    gen = (x @ t[8, 9, 10] for x in items @ t[4]) @ t[5]
+    result = (list @ t[6])(gen @ t[7]) @ t[11]
+
+
+@test
+def test_nested_comprehension(t):
+    matrix = [[1 @ t[0], 2 @ t[1]] @ t[2], [3 @ t[3], 4 @ t[4]] @ t[5]] @ t[6]
+    result = [x @ t[9, 10, 12, 13] for row in matrix @ t[7] for x in row @ t[8, 11]] @ t[14]
+
+
+@test
+def test_comprehension_with_call(t):
+    items = [1 @ t[0], 2 @ t[1], 3 @ t[2]] @ t[3]
+    result = [(str @ t[5, 8, 11])(x @ t[6, 9, 12]) @ t[7, 10, 13] for x in items @ t[4]] @ t[14]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_conditional.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_conditional.py
new file mode 100644
index 000000000000..48d45a779583
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_conditional.py
@@ -0,0 +1,44 @@
+"""Ternary conditional expressions and evaluation order."""
+
+from timer import test, dead
+
+
+@test
+def test_ternary_true(t):
+    # Condition is True — consequent evaluated, alternative skipped
+    x = (1 @ t[1] if True @ t[0] else 2 @ t[dead(1)]) @ t[2]
+
+
+@test
+def test_ternary_false(t):
+    # Condition is False — alternative evaluated, consequent skipped
+    x = (1 @ t[dead(1)] if False @ t[0] else 2 @ t[1]) @ t[2]
+
+
+@test
+def test_ternary_nested(t):
+    # Nested: outer condition True, inner condition True
+    # ((10 if C1 else 20) if C2 else 30) — C2 first, then C1, then 10
+    x = ((10 @ t[2] if True @ t[1] else 20 @ t[dead(2)]) @ t[3] if True @ t[0] else 30 @ t[dead(1)]) @ t[4]
+
+
+@test
+def test_ternary_assignment(t):
+    # Ternary result assigned, then used in later expression
+    value = (100 @ t[1] if True @ t[0] else 200 @ t[dead(1)]) @ t[2]
+    result = (value @ t[3] + 1 @ t[4]) @ t[5]
+
+
+@test
+def test_ternary_complex_expressions(t):
+    # Complex sub-expressions in condition and consequent
+    x = ((1 @ t[3] + 2 @ t[4]) @ t[5] if (3 @ t[0] > 2 @ t[1]) @ t[2] else (4 @ t[dead(3)] + 5 @ t[dead(4)]) @ t[dead(5)]) @ t[6]
+
+
+@test
+def test_ternary_as_argument(t):
+    # Ternary used as a function argument
+    def f(a):
+        return a @ t[4]
+
+    result = (f @ t[0])((1 @ t[2] if True @ t[1] else 2 @ t[dead(2)]) @ t[3]) @ t[5]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_fstring.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_fstring.py
new file mode 100644
index 000000000000..2dd36f6ef36a
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_fstring.py
@@ -0,0 +1,34 @@
+"""F-string evaluation order."""
+
+from timer import test
+
+
+@test
+def test_simple_fstring(t):
+    name = "world" @ t[0]
+    s = f"hello {name @ t[1]}" @ t[2]
+
+
+@test
+def test_multi_expr_fstring(t):
+    a = "hello" @ t[0]
+    b = "world" @ t[1]
+    s = f"{a @ t[2]} {b @ t[3]}" @ t[4]
+
+
+@test
+def test_nested_fstring(t):
+    inner = "world" @ t[0]
+    s = f"hello {f'dear {inner @ t[1]}' @ t[2]}" @ t[3]
+
+
+@test
+def test_format_spec(t):
+    x = 3.14159 @ t[0]
+    s = f"{x @ t[1]:.2f}" @ t[2]
+
+
+@test
+def test_method_in_fstring(t):
+    name = "world" @ t[0]
+    s = f"hello {((name @ t[1]).upper @ t[2])() @ t[3]}" @ t[4]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_functions.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_functions.py
new file mode 100644
index 000000000000..e19b944c4cef
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_functions.py
@@ -0,0 +1,85 @@
+"""Function calls and definitions — evaluation order."""
+
+from timer import test
+
+
+@test
+def test_argument_order(t):
+    """Arguments evaluate left-to-right before the call."""
+    def add(a, b):
+        return (a @ t[3] + b @ t[4]) @ t[5]
+    result = (add @ t[0])(1 @ t[1], 2 @ t[2]) @ t[6]
+
+
+@test
+def test_multiple_arguments(t):
+    """All arguments left-to-right, then the call."""
+    def f(a, b, c):
+        return ((a @ t[4] + b @ t[5]) @ t[6] + c @ t[7]) @ t[8]
+    result = (f @ t[0])(1 @ t[1], 2 @ t[2], 3 @ t[3]) @ t[9]
+
+
+@test
+def test_default_arguments(t):
+    """Default expressions are evaluated at definition time."""
+    val = 5 @ t[0]
+    def f(a, b=val @ t[1]):
+        return (a @ t[4] + b @ t[5]) @ t[6]
+    result = (f @ t[2])(10 @ t[3]) @ t[7]
+
+
+@test
+def test_args_kwargs(t):
+    """*args and **kwargs — expressions evaluated before the call."""
+    def f(*args, **kwargs):
+        return ((sum @ t[9])(args @ t[10]) @ t[11] + (sum @ t[12])(((kwargs @ t[13]).values @ t[14])() @ t[15]) @ t[16]) @ t[17]
+    args = [1 @ t[0], 2 @ t[1]] @ t[2]
+    kwargs = {"c" @ t[3]: 3 @ t[4]} @ t[5]
+    result = (f @ t[6])(*args @ t[7], **kwargs @ t[8]) @ t[18]
+
+
+@test
+def test_nested_calls(t):
+    """Inner call completes before becoming an argument to outer call."""
+    def f(x):
+        return (x @ t[7] + 1 @ t[8]) @ t[9]
+    def g(x):
+        return (x @ t[3] * 2 @ t[4]) @ t[5]
+    result = (f @ t[0])((g @ t[1])(1 @ t[2]) @ t[6]) @ t[10]
+
+
+@test
+def test_function_as_argument(t):
+    """Function object is just another argument, evaluated left-to-right."""
+    def apply(fn, x):
+        return (fn @ t[3])(x @ t[4]) @ t[8]
+    def double(x):
+        return (x @ t[5] * 2 @ t[6]) @ t[7]
+    result = (apply @ t[0])(double @ t[1], 5 @ t[2]) @ t[9]
+
+
+@test
+def test_decorator(t):
+    """Decorator: expression evaluated, function defined, decorator called."""
+    def my_decorator(fn):
+        return fn @ t[1]
+    @(my_decorator @ t[0])
+    def f():
+        return 42 @ t[3]
+    result = (f @ t[2])() @ t[4]
+
+
+@test
+def test_keyword_arguments(t):
+    """Keyword argument values evaluate left-to-right."""
+    def f(a, b):
+        return (a @ t[3] + b @ t[4]) @ t[5]
+    result = (f @ t[0])(a=1 @ t[1], b=2 @ t[2]) @ t[6]
+
+
+@test
+def test_return_value(t):
+    """The return value is just the result of the call expression."""
+    def f(x):
+        return (x @ t[2] * 2 @ t[3]) @ t[4]
+    result = (f @ t[0])(3 @ t[1]) @ t[5]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_if.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_if.py
new file mode 100644
index 000000000000..8880aaaef348
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_if.py
@@ -0,0 +1,108 @@
+"""If/elif/else control flow evaluation order."""
+
+from timer import test, dead
+
+
+@test
+def test_if_true(t):
+    x = True @ t[0]
+    if x @ t[1]:
+        y = 1 @ t[2]
+    z = 0 @ t[3]
+
+
+@test
+def test_if_false(t):
+    x = False @ t[0]
+    if x @ t[1]:
+        y = 1 @ t[dead(2)]
+    z = 0 @ t[2]
+
+
+@test
+def test_if_else_true(t):
+    x = True @ t[0]
+    if x @ t[1]:
+        y = 1 @ t[2]
+    else:
+        y = 2 @ t[dead(2)]
+    z = 0 @ t[3]
+
+
+@test
+def test_if_else_false(t):
+    x = False @ t[0]
+    if x @ t[1]:
+        y = 1 @ t[dead(2)]
+    else:
+        y = 2 @ t[2]
+    z = 0 @ t[3]
+
+
+@test
+def test_if_elif_else_first(t):
+    x = 1 @ t[0]
+    if (x @ t[1] == 1 @ t[2]) @ t[3]:
+        y = "first" @ t[4]
+    elif (x @ t[dead(4)] == 2 @ t[dead(5)]) @ t[dead(6)]:
+        y = "second" @ t[dead(4)]
+    else:
+        y = "third" @ t[dead(4)]
+    z = 0 @ t[5]
+
+
+@test
+def test_if_elif_else_second(t):
+    x = 2 @ t[0]
+    if (x @ t[1] == 1 @ t[2]) @ t[3]:
+        y = "first" @ t[dead(7)]
+    elif (x @ t[4] == 2 @ t[5]) @ t[6]:
+        y = "second" @ t[7]
+    else:
+        y = "third" @ t[dead(7)]
+    z = 0 @ t[8]
+
+
+@test
+def test_if_elif_else_third(t):
+    x = 3 @ t[0]
+    if (x @ t[1] == 1 @ t[2]) @ t[3]:
+        y = "first" @ t[dead(7)]
+    elif (x @ t[4] == 2 @ t[5]) @ t[6]:
+        y = "second" @ t[dead(7)]
+    else:
+        y = "third" @ t[7]
+    z = 0 @ t[8]
+
+
+@test
+def test_nested_if_else(t):
+    x = True @ t[0]
+    y = True @ t[1]
+    if x @ t[2]:
+        if y @ t[3]:
+            z = 1 @ t[4]
+        else:
+            z = 2 @ t[dead(4)]
+    else:
+        z = 3 @ t[dead(4)]
+    w = 0 @ t[5]
+
+
+@test
+def test_if_compound_condition(t):
+    x = True @ t[0]
+    y = False @ t[1]
+    if (x @ t[2] and y @ t[3]) @ t[4]:
+        z = 1 @ t[dead(5)]
+    else:
+        z = 2 @ t[5]
+    w = 0 @ t[6]
+
+
+@test
+def test_if_pass(t):
+    x = True @ t[0]
+    if x @ t[1]:
+        pass
+    z = 0 @ t[2]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_lambda.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_lambda.py
new file mode 100644
index 000000000000..c60cbb5b3172
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_lambda.py
@@ -0,0 +1,46 @@
+"""Lambda expressions — evaluation order."""
+
+from timer import test
+
+
+@test
+def test_simple_lambda(t):
+    """Lambda creates a function object in one step."""
+    f = (lambda x: (x @ t[3] + 1 @ t[4]) @ t[5]) @ t[0]
+    result = (f @ t[1])(10 @ t[2]) @ t[6]
+
+
+@test
+def test_lambda_multiple_args(t):
+    """Lambda call: arguments evaluate left to right."""
+    f = (lambda a, b, c: ((a @ t[5] + b @ t[6]) @ t[7] + c @ t[8]) @ t[9]) @ t[0]
+    result = (f @ t[1])(1 @ t[2], 2 @ t[3], 3 @ t[4]) @ t[10]
+
+
+@test
+def test_lambda_default(t):
+    """Default argument evaluated at lambda creation time."""
+    val = 5 @ t[0]
+    f = (lambda x, y=val @ t[1]: (x @ t[5] + y @ t[6]) @ t[7]) @ t[2]
+    result = (f @ t[3])(10 @ t[4]) @ t[8]
+
+
+@test
+def test_lambda_map(t):
+    """Lambda body runs once per element when consumed by list(map(...))."""
+    f = (lambda x: (x @ t[9, 12, 15] * 2 @ t[10, 13, 16]) @ t[11, 14, 17]) @ t[0]
+    result = (list @ t[1])((map @ t[2])(f @ t[3], [1 @ t[4], 2 @ t[5], 3 @ t[6]] @ t[7]) @ t[8]) @ t[18]
+
+
+@test
+def test_immediately_invoked(t):
+    """Arguments evaluated, then immediately-invoked lambda called."""
+    result = ((lambda x: (x @ t[2] + 1 @ t[3]) @ t[4]) @ t[0])(10 @ t[1]) @ t[5]
+
+
+@test
+def test_lambda_closure(t):
+    """Lambda captures enclosing scope; body runs at call time."""
+    x = 10 @ t[0]
+    f = (lambda: x @ t[3]) @ t[1]
+    result = (f @ t[2])() @ t[4]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_loops.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_loops.py
new file mode 100644
index 000000000000..17df7a4703a3
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_loops.py
@@ -0,0 +1,146 @@
+"""Loop control flow evaluation order tests."""
+
+from timer import test, dead
+
+
+# 1. Simple while loop (fixed iterations)
+@test
+def test_while_loop(t):
+    i = 0 @ t[0]
+    while (i @ t[1, 7, 13, 19] < 3 @ t[2, 8, 14, 20]) @ t[3, 9, 15, 21]:  # 4 checks: 3 true + 1 false
+        i = (i @ t[4, 10, 16] + 1 @ t[5, 11, 17]) @ t[6, 12, 18]
+    done = True @ t[22]
+
+
+# 2. While loop with break
+@test
+def test_while_break(t):
+    i = 0 @ t[0]
+    while (i @ t[1, 10, 19] < 5 @ t[2, 11, 20]) @ t[3, 12, 21]:
+        if (i @ t[4, 13, 22] == 2 @ t[5, 14, 23]) @ t[6, 15, 24]:
+            break
+        i = (i @ t[7, 16] + 1 @ t[8, 17]) @ t[9, 18]
+    done = True @ t[25]
+
+
+# 3. While loop with continue
+@test
+def test_while_continue(t):
+    i = 0 @ t[0]
+    total = 0 @ t[1]
+    while (i @ t[2, 14, 23, 35] < 3 @ t[3, 15, 24, 36]) @ t[4, 16, 25, 37]:
+        i = (i @ t[5, 17, 26] + 1 @ t[6, 18, 27]) @ t[7, 19, 28]
+        if (i @ t[8, 20, 29] == 2 @ t[9, 21, 30]) @ t[10, 22, 31]:
+            continue
+        total = (total @ t[11, 32] + i @ t[12, 33]) @ t[13, 34]
+    done = True @ t[38]
+
+
+# 4. While/else (no break — else executes)
+@test
+def test_while_else(t):
+    i = 0 @ t[0]
+    while (i @ t[1, 7, 13] < 2 @ t[2, 8, 14]) @ t[3, 9, 15]:
+        i = (i @ t[4, 10] + 1 @ t[5, 11]) @ t[6, 12]
+    else:
+        done = True @ t[16]
+
+
+# 5. While/else (with break — else skipped)
+@test
+def test_while_else_break(t):
+    i = 0 @ t[0]
+    while (i @ t[1, 10] < 5 @ t[2, 11]) @ t[3, 12]:
+        if (i @ t[4, 13] == 1 @ t[5, 14]) @ t[6, 15]:
+            break
+        i = (i @ t[7] + 1 @ t[8]) @ t[9]
+    else:
+        never = True @ t[dead(16)]
+    after = True @ t[16]
+
+
+# 6. Simple for loop over a list
+@test
+def test_for_list(t):
+    for x in [1 @ t[0], 2 @ t[1], 3 @ t[2]] @ t[3]:
+        x @ t[4, 5, 6]
+    done = True @ t[7]
+
+
+# 7. For loop with range
+@test
+def test_for_range(t):
+    for i in (range @ t[0])(3 @ t[1]) @ t[2]:
+        i @ t[3, 4, 5]
+    done = True @ t[6]
+
+
+# 8. For loop with break
+@test
+def test_for_break(t):
+    for x in [1 @ t[0], 2 @ t[1], 3 @ t[2], 4 @ t[3]] @ t[4]:
+        if (x @ t[5, 9, 13] == 3 @ t[6, 10, 14]) @ t[7, 11, 15]:
+            break
+        x @ t[8, 12]
+    done = True @ t[16]
+
+
+# 9. For loop with continue
+@test
+def test_for_continue(t):
+    total = 0 @ t[0]
+    for x in [1 @ t[1], 2 @ t[2], 3 @ t[3]] @ t[4]:
+        if (x @ t[5, 11, 14] == 2 @ t[6, 12, 15]) @ t[7, 13, 16]:
+            continue
+        total = (total @ t[8, 17] + x @ t[9, 18]) @ t[10, 19]
+    done = True @ t[20]
+
+
+# 10. For/else (no break — else executes)
+@test
+def test_for_else(t):
+    for x in [1 @ t[0], 2 @ t[1]] @ t[2]:
+        x @ t[3, 4]
+    else:
+        done = True @ t[5]
+
+
+# 11. For/else (with break — else skipped)
+@test
+def test_for_else_break(t):
+    for x in [1 @ t[0], 2 @ t[1], 3 @ t[2]] @ t[3]:
+        if (x @ t[4, 8] == 2 @ t[5, 9]) @ t[6, 10]:
+            break
+        x @ t[7]
+    else:
+        never = True @ t[dead(11)]
+    after = True @ t[11]
+
+
+# 12. Nested loops
+@test
+def test_nested_loops(t):
+    for i in [1 @ t[0], 2 @ t[1]] @ t[2]:
+        for j in [10 @ t[3, 12], 20 @ t[4, 13]] @ t[5, 14]:
+            (i @ t[6, 9, 15, 18, dead(21)] + j @ t[7, 10, 16, 19]) @ t[8, 11, 17, 20]
+    done = True @ t[dead(3), dead(6), dead(9), dead(12), dead(15), dead(18), 21]
+
+
+# 13. While True with conditional break
+@test
+def test_while_true_break(t):
+    i = 0 @ t[0]
+    while True @ t[1, 8, 15]:
+        i = (i @ t[2, 9, 16] + 1 @ t[3, 10, 17]) @ t[4, 11, 18]
+        if (i @ t[5, 12, 19] == 3 @ t[6, 13, 20]) @ t[7, 14, 21]:
+            break
+    done = True @ t[22]
+
+
+# 14. For with enumerate
+@test
+def test_for_enumerate(t):
+    for idx, val in (enumerate @ t[0])(["a" @ t[1], "b" @ t[2], "c" @ t[3]] @ t[4]) @ t[5]:
+        idx @ t[6, 8, 10]
+        val @ t[7, 9, 11]
+    done = True @ t[12]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_match.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_match.py
new file mode 100644
index 000000000000..ba15a2d7c857
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_match.py
@@ -0,0 +1,173 @@
+"""Evaluation order for match/case (structural pattern matching, Python 3.10+)."""
+
+import sys
+if sys.version_info < (3, 10):
+    print("Skipping match/case tests (requires Python 3.10+)")
+    print("---")
+    print("0/0 tests passed")
+    sys.exit(0)
+
+from timer import test, dead, never
+
+
+@test
+def test_match_literal(t):
+    x = 1 @ t[0]
+    match x @ t[1]:
+        case 1:
+            y = "one" @ t[2]
+        case 2:
+            y = "two" @ t[dead(2)]
+    z = y @ t[3]
+
+
+@test
+def test_match_literal_fallthrough(t):
+    x = 3 @ t[0]
+    match x @ t[1]:
+        case 1:
+            y = "one" @ t[dead(2)]
+        case 2:
+            y = "two" @ t[dead(2)]
+        case 3:
+            y = "three" @ t[2]
+    z = y @ t[3]
+
+
+@test
+def test_match_wildcard(t):
+    x = 42 @ t[0]
+    match x @ t[1]:
+        case 1:
+            y = "one" @ t[dead(2)]
+        case _:
+            y = "other" @ t[2]
+    z = y @ t[3]
+
+
+@test
+def test_match_capture(t):
+    x = 42 @ t[0]
+    match x @ t[1]:
+        case n:
+            y = n @ t[2]
+    z = y @ t[3]
+
+
+@test
+def test_match_or_pattern(t):
+    x = 2 @ t[0]
+    match x @ t[1]:
+        case 1 | 2:
+            y = "low" @ t[2]
+        case _:
+            y = "other" @ t[dead(2)]
+    z = y @ t[3]
+
+
+@test
+def test_match_guard(t):
+    x = 5 @ t[0]
+    match x @ t[1]:
+        case n if (n @ t[2] > 3 @ t[3]) @ t[4]:
+            y = n @ t[5]
+        case _:
+            y = 0 @ t[dead(5)]
+    z = y @ t[6]
+
+
+@test
+def test_match_class_pattern(t):
+    x = 42 @ t[0]
+    match x @ t[1]:
+        case int():
+            y = "integer" @ t[2]
+        case str():
+            y = "string" @ t[dead(2)]
+    z = y @ t[3]
+
+
+@test
+def test_match_sequence(t):
+    x = [1 @ t[0], 2 @ t[1]] @ t[2]
+    match x @ t[3]:
+        case [a, b]:
+            y = (a @ t[4] + b @ t[5]) @ t[6]
+        case _:
+            y = 0 @ t[dead(6)]
+    z = y @ t[7]
+
+
+@test
+def test_match_mapping(t):
+    x = {"key" @ t[0]: 42 @ t[1]} @ t[2]
+    match x @ t[3]:
+        case {"key": value}:
+            y = value @ t[4]
+        case _:
+            y = 0 @ t[dead(4)]
+    z = y @ t[5]
+
+
+@test
+def test_match_nested(t):
+    x = {"users" @ t[0]: [{"name" @ t[1]: "Alice" @ t[2]} @ t[3]] @ t[4]} @ t[5]
+    match x @ t[6]:
+        case {"users": [{"name": name}]}:
+            y = name @ t[7]
+        case _:
+            y = "unknown" @ t[dead(7)]
+    z = y @ t[8]
+
+
+@test
+def test_match_or_pattern_with_as(t):
+    """OR pattern with `as` binding and method call on the result."""
+    clause = "foo@bar" @ t[0]
+    match clause @ t[1]:
+        case (str() as uses) | {"uses": uses}:
+            result = ((uses @ t[2]).partition @ t[3])("@" @ t[4]) @ t[5]
+            x = (result @ t[6])[0 @ t[7]] @ t[8]
+        case _:
+            raise ((ValueError @ t[dead(2)])(clause @ t[dead(3)]) @ t[dead(4)])
+    y = x @ t[9]
+
+
+@test
+def test_match_wildcard_raise(t):
+    """Wildcard case that raises, with OR pattern on the other branch."""
+    clause = 42 @ t[0]
+    try:
+        match clause @ t[1]:
+            case (str() as uses) | {"uses": uses}:
+                result = uses @ t[dead(2)]
+            case _:
+                raise ((ValueError @ t[2])(f"Invalid: {clause @ t[3]}" @ t[4]) @ t[5])
+    except ValueError:
+        y = 0 @ t[6]
+
+
+@test
+def test_match_exhaustive_return_first(t):
+    """Every case returns; code after match is unreachable (first case taken)."""
+    def f(x):
+        match x @ t[2]:
+            case 1:
+                return "one" @ t[3]
+            case _:
+                return "other" @ t[dead(3)]
+        y = 0 @ t[never]
+    result = (f @ t[0])(1 @ t[1]) @ t[4]
+
+
+@test
+def test_match_exhaustive_return_wildcard(t):
+    """Every case returns; code after match is unreachable (wildcard taken)."""
+    def f(x):
+        match x @ t[2]:
+            case 1:
+                return "one" @ t[dead(3)]
+            case _:
+                return "other" @ t[3]
+        y = 0 @ t[never]
+    result = (f @ t[0])(99 @ t[1]) @ t[4]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_try.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_try.py
new file mode 100644
index 000000000000..dd0b15457d69
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_try.py
@@ -0,0 +1,182 @@
+"""Exception handling control flow: try/except/else/finally evaluation order."""
+
+from timer import test, dead, never
+
+
+# 1. try/except — no exception raised (except block skipped)
+@test
+def test_try_no_exception(t):
+    try:
+        x = 1 @ t[0]
+        y = 2 @ t[1]
+    except ValueError:
+        z = 3 @ t[dead(2)]
+    after = 0 @ t[2]
+
+
+# 2. try/except — exception raised and caught
+@test
+def test_try_with_exception(t):
+    try:
+        x = 1 @ t[0]
+        raise ((ValueError @ t[1])() @ t[2])
+        y = 2 @ t[never]
+    except ValueError:
+        z = 3 @ t[3]
+    after = 0 @ t[4]
+
+
+# 3. try/except/else — no exception (else runs)
+@test
+def test_try_except_else_no_exception(t):
+    try:
+        x = 1 @ t[0]
+    except ValueError:
+        y = 2 @ t[dead(1)]
+    else:
+        z = 3 @ t[1]
+    after = 0 @ t[2]
+
+
+# 4. try/except/else — exception raised (else skipped)
+@test
+def test_try_except_else_with_exception(t):
+    try:
+        x = 1 @ t[0]
+        raise ((ValueError @ t[1])() @ t[2])
+    except ValueError:
+        y = 2 @ t[3]
+    else:
+        z = 3 @ t[dead(3)]
+    after = 0 @ t[4]
+
+
+# 5. try/finally — no exception
+@test
+def test_try_finally_no_exception(t):
+    try:
+        x = 1 @ t[0]
+        y = 2 @ t[1]
+    finally:
+        z = 3 @ t[2]
+    after = 0 @ t[3]
+
+
+# 6. try/finally — exception raised (finally runs, then exception propagates)
+@test
+def test_try_finally_exception(t):
+    try:
+        try:
+            x = 1 @ t[0]
+            raise ((ValueError @ t[1])() @ t[2])
+        finally:
+            y = 2 @ t[3]
+    except ValueError:
+        z = 3 @ t[4]
+
+
+# 7. try/except/finally — no exception
+@test
+def test_try_except_finally_no_exception(t):
+    try:
+        x = 1 @ t[0]
+    except ValueError:
+        y = 2 @ t[dead(1)]
+    finally:
+        z = 3 @ t[1]
+    after = 0 @ t[2]
+
+
+# 8. try/except/finally — exception caught
+@test
+def test_try_except_finally_exception(t):
+    try:
+        x = 1 @ t[0]
+        raise ((ValueError @ t[1])() @ t[2])
+    except ValueError:
+        y = 2 @ t[3]
+    finally:
+        z = 3 @ t[4]
+    after = 0 @ t[5]
+
+
+# 9. Multiple except clauses — first matching
+@test
+def test_multiple_except_first(t):
+    try:
+        x = 1 @ t[0]
+        raise ((ValueError @ t[1])() @ t[2])
+    except ValueError:
+        y = 2 @ t[3]
+    except TypeError:
+        z = 3 @ t[dead(3)]
+    after = 0 @ t[4]
+
+
+# 10. Multiple except clauses — second matching
+@test
+def test_multiple_except_second(t):
+    try:
+        x = 1 @ t[0]
+        raise ((TypeError @ t[1])() @ t[2])
+    except ValueError:
+        y = 2 @ t[dead(3)]
+    except TypeError:
+        z = 3 @ t[3]
+    after = 0 @ t[4]
+
+
+# 11. except with `as` binding
+@test
+def test_except_as_binding(t):
+    try:
+        x = 1 @ t[0]
+        raise ((ValueError @ t[1])("msg" @ t[2]) @ t[3])
+    except ValueError as e:
+        y = (str @ t[4])(e @ t[5]) @ t[6]
+    after = 0 @ t[7]
+
+
+# 12. Nested try/except
+@test
+def test_nested_try_except(t):
+    try:
+        x = 1 @ t[0]
+        try:
+            y = 2 @ t[1]
+            raise ((ValueError @ t[2])() @ t[3])
+        except ValueError:
+            z = 3 @ t[4]
+        w = 4 @ t[5]
+    except TypeError:
+        v = 5 @ t[dead(6)]
+    after = 0 @ t[6]
+
+
+# 13. try/except in a loop
+@test
+def test_try_in_loop(t):
+    total = 0 @ t[0]
+    for i in (range @ t[1])(3 @ t[2]) @ t[3]:
+        try:
+            if (i @ t[4, 11, 20] == 1 @ t[5, 12, 21]) @ t[6, 13, 22]:
+                raise ((ValueError @ t[14])() @ t[15])
+            total = (total @ t[7, 23] + 1 @ t[8, 24]) @ t[9, 25]
+        except ValueError:
+            total = (total @ t[16] + 10 @ t[17]) @ t[18]
+        r = 0 @ t[10, 19, 26]
+
+
+# 14. Re-raise with bare `raise`
+@test
+def test_reraise(t):
+    try:
+        try:
+            x = 1 @ t[0]
+            raise ((ValueError @ t[1])() @ t[2])
+        except ValueError:
+            y = 2 @ t[3]
+            raise
+    except ValueError:
+        z = 3 @ t[4]
+    after = 0 @ t[5]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_unpacking.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_unpacking.py
new file mode 100644
index 000000000000..45f292cb0b7d
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_unpacking.py
@@ -0,0 +1,48 @@
+"""Unpacking and star expressions evaluation order."""
+
+from timer import test
+
+
+@test
+def test_tuple_unpack(t):
+    """RHS expression evaluates, then unpacking assigns targets."""
+    a, b = (1 @ t[0], 2 @ t[1]) @ t[2]
+    x = (a @ t[3] + b @ t[4]) @ t[5]
+
+
+@test
+def test_list_unpack(t):
+    """List unpacking: RHS elements left to right, then unpack."""
+    [a, b] = [1 @ t[0], 2 @ t[1]] @ t[2]
+    x = (a @ t[3] + b @ t[4]) @ t[5]
+
+
+@test
+def test_star_unpack(t):
+    """Star unpacking: RHS evaluates first."""
+    a, *b = [1 @ t[0], 2 @ t[1], 3 @ t[2], 4 @ t[3]] @ t[4]
+    x = (a @ t[5], b @ t[6]) @ t[7]
+
+
+@test
+def test_nested_unpack(t):
+    """Nested unpacking: RHS evaluates first."""
+    (a, b), c = ((1 @ t[0], 2 @ t[1]) @ t[2], 3 @ t[3]) @ t[4]
+    x = ((a @ t[5] + b @ t[6]) @ t[7] + c @ t[8]) @ t[9]
+
+
+@test
+def test_swap(t):
+    a = 1 @ t[0]
+    b = 2 @ t[1]
+    a, b = (b @ t[2], a @ t[3]) @ t[4]
+    x = a @ t[5]
+    y = b @ t[6]
+
+
+@test
+def test_unpack_for(t):
+    pairs = [(1 @ t[0], 2 @ t[1]) @ t[2], (3 @ t[3], 4 @ t[4]) @ t[5]] @ t[6]
+    for a, b in pairs @ t[7]:
+        x = a @ t[8, 10]
+        y = b @ t[9, 11]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_with.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_with.py
new file mode 100644
index 000000000000..1dcc7169092b
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_with.py
@@ -0,0 +1,58 @@
+"""Evaluation order tests for with statements."""
+
+from contextlib import contextmanager
+from timer import test
+
+
+@contextmanager
+def ctx(value=None):
+    yield value
+
+
+@test
+def test_simple_with(t):
+    x = 1 @ t[0]
+    with (ctx @ t[1])() @ t[2]:
+        y = 2 @ t[3]
+    z = 3 @ t[4]
+
+
+@test
+def test_with_as(t):
+    with (ctx @ t[0])(42 @ t[1]) @ t[2] as v:
+        x = v @ t[3]
+    y = 0 @ t[4]
+
+
+@test
+def test_nested_with(t):
+    with (ctx @ t[0])() @ t[1]:
+        with (ctx @ t[2])() @ t[3]:
+            x = 1 @ t[4]
+    y = 2 @ t[5]
+
+
+@test
+def test_multiple_context_managers(t):
+    with (ctx @ t[0])(1 @ t[1]) @ t[2] as a, (ctx @ t[3])(2 @ t[4]) @ t[5] as b:
+        x = (a @ t[6], b @ t[7]) @ t[8]
+    y = 0 @ t[9]
+
+
+@test
+def test_with_exception_handling(t):
+    try:
+        with (ctx @ t[0])() @ t[1]:
+            x = 1 @ t[2]
+            raise ((ValueError @ t[3])() @ t[4])
+    except ValueError:
+        y = 2 @ t[5]
+    z = 3 @ t[6]
+
+
+@test
+def test_with_in_loop(t):
+    for i in [1 @ t[0], 2 @ t[1]] @ t[2]:
+        with (ctx @ t[3, 6])() @ t[4, 7]:
+            x = i @ t[5, 8]
+    y = 0 @ t[9]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/test_yield.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_yield.py
new file mode 100644
index 000000000000..b2a28d793bc6
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/test_yield.py
@@ -0,0 +1,105 @@
+"""Generator and yield evaluation order tests.
+
+Generator bodies are lazy — code runs only when iterated.  The timer
+annotations inside generator bodies fire interleaved with the caller's
+annotations, reflecting the suspend/resume semantics of yield.
+"""
+
+from timer import test
+
+
+@test
+def test_simple_generator(t):
+    """Basic generator: body runs on next(), not on gen()."""
+    def gen():
+        yield 1 @ t[4]
+        yield 2 @ t[8]
+
+    g = (gen @ t[0])() @ t[1]
+    x = (next @ t[2])(g @ t[3]) @ t[5]
+    y = (next @ t[6])(g @ t[7]) @ t[9]
+
+
+@test
+def test_multiple_yields(t):
+    """Three yields interleave with three next() calls."""
+    def gen():
+        yield 1 @ t[4]
+        yield 2 @ t[8]
+        yield 3 @ t[12]
+
+    g = (gen @ t[0])() @ t[1]
+    a = (next @ t[2])(g @ t[3]) @ t[5]
+    b = (next @ t[6])(g @ t[7]) @ t[9]
+    c = (next @ t[10])(g @ t[11]) @ t[13]
+
+
+@test
+def test_generator_for_loop(t):
+    """for-loop consumes generator, interleaving body and loop."""
+    def gen():
+        yield 1 @ t[2]
+        yield 2 @ t[4]
+
+    for val in (gen @ t[0])() @ t[1]:
+        val @ t[3, 5]
+
+
+@test
+def test_generator_list(t):
+    """list() consumes the entire generator without interleaving."""
+    def gen():
+        yield 10 @ t[3]
+        yield 20 @ t[4]
+        yield 30 @ t[5]
+
+    result = (list @ t[0])((gen @ t[1])() @ t[2]) @ t[6]
+
+
+@test
+def test_yield_from(t):
+    """yield from delegates to an inner generator transparently."""
+    def inner():
+        yield 1 @ t[6]
+        yield 2 @ t[10]
+
+    def outer():
+        yield from (inner @ t[4])() @ t[5]
+
+    g = (outer @ t[0])() @ t[1]
+    x = (next @ t[2])(g @ t[3]) @ t[7]
+    y = (next @ t[8])(g @ t[9]) @ t[11]
+
+
+@test
+def test_generator_return(t):
+    """Generator return value accessed via yield from."""
+    def gen():
+        yield 1 @ t[6]
+        return 42 @ t[10]
+
+    def wrapper():
+        result = (yield from (gen @ t[4])() @ t[5]) @ t[11]
+        yield result @ t[12]
+
+    g = (wrapper @ t[0])() @ t[1]
+    x = (next @ t[2])(g @ t[3]) @ t[7]
+    y = (next @ t[8])(g @ t[9]) @ t[13]
+
+
+@test
+def test_generator_send(t):
+    """send() passes a value into the generator at the yield point."""
+    def gen():
+        x = (yield 1 @ t[4]) @ t[9]
+        yield (x @ t[10] + 10 @ t[11]) @ t[12]
+
+    g = (gen @ t[0])() @ t[1]
+    first = (next @ t[2])(g @ t[3]) @ t[5]
+    second = ((g @ t[6]).send @ t[7])(42 @ t[8]) @ t[13]
+
+
+@test
+def test_generator_expression(t):
+    """Inline generator expression consumed by list()."""
+    result = (list @ t[0])(x @ t[5, 6, 7] for x in [10 @ t[1], 20 @ t[2], 30 @ t[3]] @ t[4]) @ t[8]
diff --git a/python/ql/test/library-tests/ControlFlow/evaluation-order/timer.py b/python/ql/test/library-tests/ControlFlow/evaluation-order/timer.py
new file mode 100644
index 000000000000..ccec5d64f7c3
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/evaluation-order/timer.py
@@ -0,0 +1,194 @@
+"""Abstract timer for self-validating CFG evaluation-order tests.
+
+Provides a Timer context manager and a @test decorator for writing tests
+that verify the order in which Python evaluates expressions.
+
+Usage with @test decorator (preferred):
+
+    from timer import test, dead, never
+
+    @test
+    def test_sequential(t):
+        x = 1 @ t[0]
+        y = 2 @ t[1]
+        z = (x + y) @ t[2]
+
+Annotation forms:
+    t[n]              - assert current timestamp is n, return marker
+    t[n, m, ...]      - assert current timestamp is one of {n, m, ...}
+    t[dead(n)]        - mark timestamp n as dead (fails if evaluated)
+    t[dead(n), m]     - dead at n, live at m
+    t[never]          - mark as never evaluated (fails if evaluated)
+    t["label"]        - record current timestamp under label (development aid)
+    t(value, n)       - equivalent to: value @ t[n]
+
+Run a test file directly to self-validate: python test_file.py
+"""
+
+import atexit
+import os
+import sys
+
+_results = []
+
+
+class _Check:
+    """Marker returned by t[n] — asserts the current timestamp.
+
+    Receives the raw subscript elements: plain ints are live timestamps,
+    dead(n) markers are dead timestamps, and `never` means any evaluation
+    is an error.
+    """
+
+    __slots__ = ("_timer", "_live", "_dead", "_never")
+
+    def __init__(self, timer, elements):
+        self._timer = timer
+        self._live = set()
+        self._dead = set()
+        self._never = False
+        for e in elements:
+            if isinstance(e, int):
+                self._live.add(e)
+            elif isinstance(e, _DeadMarker):
+                self._dead.add(e.timestamp)
+            elif isinstance(e, _NeverSentinel):
+                self._never = True
+            else:
+                raise TypeError(
+                    f"Unknown element in timer subscript: {e!r} (type {type(e).__name__})"
+                )
+
+    def __rmatmul__(self, value):
+        ts = self._timer._tick()
+        if self._never:
+            self._timer._error(
+                f"expression annotated with t[never] was evaluated (timestamp {ts})"
+            )
+        elif ts in self._dead:
+            self._timer._error(
+                f"timestamp {ts} is marked dead but was evaluated"
+            )
+        elif ts not in self._live:
+            self._timer._error(
+                f"expected {sorted(self._live)}, got {ts}"
+            )
+        return value
+
+
+class _Label:
+    """Marker returned by t["name"] — records the timestamp under a label."""
+
+    __slots__ = ("_timer", "_name")
+
+    def __init__(self, timer, name):
+        self._timer = timer
+        self._name = name
+
+    def __rmatmul__(self, value):
+        ts = self._timer._tick()
+        self._timer._labels.setdefault(self._name, []).append(ts)
+        return value
+
+
+class _DeadMarker:
+    """Marker returned by dead(n) — used inside t[...] to mark a timestamp as dead."""
+
+    def __init__(self, timestamp):
+        self.timestamp = timestamp
+
+
+def dead(n):
+    """Mark timestamp `n` as dead code inside a timer subscript: t[dead(1), 2]."""
+    return _DeadMarker(n)
+
+
+class _NeverSentinel:
+    """Sentinel for never-evaluated annotations: t[never]."""
+    pass
+
+
+never = _NeverSentinel()
+
+
+class Timer:
+    """Context manager tracking abstract evaluation timestamps.
+
+    Each Timer instance maintains a counter starting at 0. Every time an
+    annotation (@ t[n] or t(value, n)) is encountered, the counter is
+    compared against the expected value and then incremented.
+    """
+
+    def __init__(self, name="<unnamed>"):
+        self._name = name
+        self._counter = 0
+        self._errors = []
+        self._labels = {}
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if self._labels:
+            for name, timestamps in sorted(self._labels.items()):
+                print(f"  {name}: {', '.join(map(str, timestamps))}")
+        _results.append((self._name, list(self._errors)))
+        if self._errors:
+            print(f"{self._name}: FAIL")
+            for err in self._errors:
+                print(f"  {err}")
+        else:
+            print(f"{self._name}: ok")
+        return False
+
+    def _tick(self):
+        ts = self._counter
+        self._counter += 1
+        return ts
+
+    def _error(self, msg):
+        self._errors.append(msg)
+
+    def __getitem__(self, key):
+        if isinstance(key, str):
+            return _Label(self, key)
+        elif isinstance(key, tuple):
+            return _Check(self, key)
+        else:
+            return _Check(self, [key])
+
+    def __call__(self, value, key):
+        """Alternative to @ operator: t(value, 4) or t(value, [1, 2, 3])."""
+        if isinstance(key, list):
+            key = tuple(key)
+        marker = self[key]
+        return marker.__rmatmul__(value)
+
+
+def test(fn):
+    """Decorator that creates a Timer and runs the test function immediately.
+
+    The function receives a fresh Timer as its sole argument. Errors are
+    collected (not raised) and reported after the function completes.
+    """
+    with Timer(fn.__name__) as t:
+        try:
+            fn(t)
+        except Exception as e:
+            t._error(f"exception: {type(e).__name__}: {e}")
+    return fn
+
+
+def _report():
+    """Print summary at interpreter exit."""
+    if not _results:
+        return
+    total = len(_results)
+    passed = sum(1 for _, errors in _results if not errors)
+    print("---")
+    print(f"{passed}/{total} tests passed")
+    if passed < total:
+        os._exit(1)
+
+
+atexit.register(_report)
diff --git a/python/ql/test/query-tests/Security/CWE-312-CleartextLogging/CleartextLogging.expected b/python/ql/test/query-tests/Security/CWE-312-CleartextLogging/CleartextLogging.expected
index dca1a33e73a3..7cb9e0151907 100644
--- a/python/ql/test/query-tests/Security/CWE-312-CleartextLogging/CleartextLogging.expected
+++ b/python/ql/test/query-tests/Security/CWE-312-CleartextLogging/CleartextLogging.expected
@@ -10,6 +10,8 @@ edges
 | test.py:48:14:48:35 | ControlFlowNode for social_security_number | test.py:49:15:49:36 | ControlFlowNode for social_security_number | provenance |  |
 | test.py:48:38:48:40 | ControlFlowNode for ssn | test.py:50:15:50:17 | ControlFlowNode for ssn | provenance |  |
 | test.py:48:54:48:63 | ControlFlowNode for passportNo | test.py:52:15:52:24 | ControlFlowNode for passportNo | provenance |  |
+| test.py:54:14:54:22 | ControlFlowNode for post_code | test.py:55:15:55:23 | ControlFlowNode for post_code | provenance |  |
+| test.py:54:25:54:31 | ControlFlowNode for zipCode | test.py:56:15:56:21 | ControlFlowNode for zipCode | provenance |  |
 | test.py:54:34:54:45 | ControlFlowNode for home_address | test.py:57:15:57:26 | ControlFlowNode for home_address | provenance |  |
 | test.py:59:14:59:26 | ControlFlowNode for user_latitude | test.py:60:15:60:27 | ControlFlowNode for user_latitude | provenance |  |
 | test.py:59:29:59:42 | ControlFlowNode for user_longitude | test.py:61:15:61:28 | ControlFlowNode for user_longitude | provenance |  |
@@ -42,7 +44,11 @@ nodes
 | test.py:49:15:49:36 | ControlFlowNode for social_security_number | semmle.label | ControlFlowNode for social_security_number |
 | test.py:50:15:50:17 | ControlFlowNode for ssn | semmle.label | ControlFlowNode for ssn |
 | test.py:52:15:52:24 | ControlFlowNode for passportNo | semmle.label | ControlFlowNode for passportNo |
+| test.py:54:14:54:22 | ControlFlowNode for post_code | semmle.label | ControlFlowNode for post_code |
+| test.py:54:25:54:31 | ControlFlowNode for zipCode | semmle.label | ControlFlowNode for zipCode |
 | test.py:54:34:54:45 | ControlFlowNode for home_address | semmle.label | ControlFlowNode for home_address |
+| test.py:55:15:55:23 | ControlFlowNode for post_code | semmle.label | ControlFlowNode for post_code |
+| test.py:56:15:56:21 | ControlFlowNode for zipCode | semmle.label | ControlFlowNode for zipCode |
 | test.py:57:15:57:26 | ControlFlowNode for home_address | semmle.label | ControlFlowNode for home_address |
 | test.py:59:14:59:26 | ControlFlowNode for user_latitude | semmle.label | ControlFlowNode for user_latitude |
 | test.py:59:29:59:42 | ControlFlowNode for user_longitude | semmle.label | ControlFlowNode for user_longitude |
@@ -79,6 +85,8 @@ subpaths
 | test.py:49:15:49:36 | ControlFlowNode for social_security_number | test.py:48:14:48:35 | ControlFlowNode for social_security_number | test.py:49:15:49:36 | ControlFlowNode for social_security_number | This expression logs $@ as clear text. | test.py:48:14:48:35 | ControlFlowNode for social_security_number | sensitive data (private) |
 | test.py:50:15:50:17 | ControlFlowNode for ssn | test.py:48:38:48:40 | ControlFlowNode for ssn | test.py:50:15:50:17 | ControlFlowNode for ssn | This expression logs $@ as clear text. | test.py:48:38:48:40 | ControlFlowNode for ssn | sensitive data (private) |
 | test.py:52:15:52:24 | ControlFlowNode for passportNo | test.py:48:54:48:63 | ControlFlowNode for passportNo | test.py:52:15:52:24 | ControlFlowNode for passportNo | This expression logs $@ as clear text. | test.py:48:54:48:63 | ControlFlowNode for passportNo | sensitive data (private) |
+| test.py:55:15:55:23 | ControlFlowNode for post_code | test.py:54:14:54:22 | ControlFlowNode for post_code | test.py:55:15:55:23 | ControlFlowNode for post_code | This expression logs $@ as clear text. | test.py:54:14:54:22 | ControlFlowNode for post_code | sensitive data (private) |
+| test.py:56:15:56:21 | ControlFlowNode for zipCode | test.py:54:25:54:31 | ControlFlowNode for zipCode | test.py:56:15:56:21 | ControlFlowNode for zipCode | This expression logs $@ as clear text. | test.py:54:25:54:31 | ControlFlowNode for zipCode | sensitive data (private) |
 | test.py:57:15:57:26 | ControlFlowNode for home_address | test.py:54:34:54:45 | ControlFlowNode for home_address | test.py:57:15:57:26 | ControlFlowNode for home_address | This expression logs $@ as clear text. | test.py:54:34:54:45 | ControlFlowNode for home_address | sensitive data (private) |
 | test.py:60:15:60:27 | ControlFlowNode for user_latitude | test.py:59:14:59:26 | ControlFlowNode for user_latitude | test.py:60:15:60:27 | ControlFlowNode for user_latitude | This expression logs $@ as clear text. | test.py:59:14:59:26 | ControlFlowNode for user_latitude | sensitive data (private) |
 | test.py:61:15:61:28 | ControlFlowNode for user_longitude | test.py:59:29:59:42 | ControlFlowNode for user_longitude | test.py:61:15:61:28 | ControlFlowNode for user_longitude | This expression logs $@ as clear text. | test.py:59:29:59:42 | ControlFlowNode for user_longitude | sensitive data (private) |
diff --git a/python/ql/test/query-tests/Security/CWE-312-CleartextLogging/test.py b/python/ql/test/query-tests/Security/CWE-312-CleartextLogging/test.py
index d8d70c56bd57..ff01680ed81c 100644
--- a/python/ql/test/query-tests/Security/CWE-312-CleartextLogging/test.py
+++ b/python/ql/test/query-tests/Security/CWE-312-CleartextLogging/test.py
@@ -52,8 +52,8 @@ def log1(social_security_number, ssn, className, passportNo):
         print(passportNo) # NOT OK
 
     def log2(post_code, zipCode, home_address):
-        print(post_code) # NOT OK, but NOT FOUND - "code" is treated as encrypted and thus not sensitive
-        print(zipCode) # NOT OK, but NOT FOUND - "code" is treated as encrypted and thus not sensitive
+        print(post_code) # NOT OK
+        print(zipCode) # NOT OK
         print(home_address) # NOT OK
 
     def log3(user_latitude, user_longitude):
diff --git a/ql/Cargo.lock b/ql/Cargo.lock
index 6632bf162eec..ba31581cc233 100644
--- a/ql/Cargo.lock
+++ b/ql/Cargo.lock
@@ -17,12 +17,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -119,6 +113,8 @@ version = "1.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf"
 dependencies = [
+ "jobserver",
+ "libc",
  "shlex",
 ]
 
@@ -130,11 +126,10 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
@@ -200,6 +195,9 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "tree-sitter",
+ "url",
+ "yeast",
+ "zstd",
 ]
 
 [[package]]
@@ -265,6 +263,17 @@ version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -335,6 +344,12 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
 [[package]]
 name = "flate2"
 version = "1.1.0"
@@ -345,6 +360,15 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
 [[package]]
 name = "globset"
 version = "0.4.15"
@@ -354,10 +378,16 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.8",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -366,9 +396,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "iana-time-zone"
@@ -393,6 +423,119 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
+
+[[package]]
+name = "icu_properties"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
+
+[[package]]
+name = "icu_provider"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -405,6 +548,15 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
+[[package]]
+name = "jobserver"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.72"
@@ -426,6 +578,12 @@ version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
+[[package]]
+name = "litemap"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
 [[package]]
 name = "log"
 version = "0.4.22"
@@ -434,11 +592,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -458,12 +616,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -477,9 +634,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -492,10 +649,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
-name = "overload"
-version = "0.1.1"
+name = "percent-encoding"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pin-project-lite"
@@ -503,6 +660,21 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
+[[package]]
+name = "pkg-config"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.89"
@@ -514,18 +686,18 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -533,9 +705,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -543,42 +715,27 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.8",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -623,6 +780,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -644,6 +814,12 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
 [[package]]
 name = "streaming-iterator"
 version = "0.1.9"
@@ -667,6 +843,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -677,11 +864,21 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -690,9 +887,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -701,9 +898,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -722,14 +919,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -746,7 +943,7 @@ checksum = "b67baf55e7e1b6806063b1e51041069c90afff16afcbbccd278d899f9d84bca4"
 dependencies = [
  "cc",
  "regex",
- "regex-syntax 0.8.5",
+ "regex-syntax",
  "streaming-iterator",
  "tree-sitter-language",
 ]
@@ -775,6 +972,16 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600"
 
+[[package]]
+name = "tree-sitter-python"
+version = "0.23.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d065aaa27f3aaceaf60c1f0e0ac09e1cb9eb8ed28e7bcdaa52129cffc7f4b04"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
 [[package]]
 name = "tree-sitter-ql"
 version = "0.23.0"
@@ -793,12 +1000,46 @@ dependencies = [
  "tree-sitter-language",
 ]
 
+[[package]]
+name = "tree-sitter-ruby"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be0484ea4ef6bb9c575b4fdabde7e31340a8d2dbc7d52b321ac83da703249f95"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -866,28 +1107,6 @@ version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -899,9 +1118,9 @@ dependencies = [
 
 [[package]]
 name = "windows-link"
-version = "0.1.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-sys"
@@ -975,3 +1194,137 @@ name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "writeable"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
+[[package]]
+name = "yeast"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "tree-sitter",
+ "tree-sitter-python",
+ "tree-sitter-ruby",
+ "yeast-macros",
+]
+
+[[package]]
+name = "yeast-macros"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "yoke"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.16+zstd.1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/ruby/extractor/src/extractor.rs b/ruby/extractor/src/extractor.rs
index 4849f473ccbc..d418c144bfc9 100644
--- a/ruby/extractor/src/extractor.rs
+++ b/ruby/extractor/src/extractor.rs
@@ -94,11 +94,14 @@ pub fn run(options: Options) -> std::io::Result<()> {
         node_types::read_node_types_str("erb", tree_sitter_embedded_template::NODE_TYPES)?;
     let lines: std::io::Result<Vec<String>> = std::io::BufReader::new(file_list).lines().collect();
     let lines = lines?;
+    let source_root = std::env::current_dir().ok().and_then(|d| d.canonicalize().ok());
     lines
         .par_iter()
         .try_for_each(|line| {
             let mut diagnostics_writer = diagnostics.logger();
             let path = PathBuf::from(line).canonicalize()?;
+            let diagnostics_file_path =
+                file_paths::relativize_for_diagnostic(&path, source_root.as_deref());
             match &overlay_changed_files {
                 Some(changed_files) if !changed_files.contains(&path) => {
                     // We are extracting an overlay and this file is not in the list of changes files, so we should skip it.
@@ -165,7 +168,7 @@ pub fn run(options: Options) -> std::io::Result<()> {
                                                     "character-decoding-error",
                                                     "Character decoding error",
                                                 )
-                                                .file(&file_paths::normalize_and_transform_path(&path, path_transformer.as_ref()))
+                                                .file(&diagnostics_file_path)
                                                 .message(
                                                     "Could not decode the file contents as {}: {}. The contents of the file must match the character encoding specified in the {} {}.",
                                                     &[
@@ -185,7 +188,7 @@ pub fn run(options: Options) -> std::io::Result<()> {
                             diagnostics_writer.write(
                                 diagnostics_writer
                                     .new_entry("unknown-character-encoding", "Could not process some files due to an unknown character encoding")
-                                    .file(&file_paths::normalize_and_transform_path(&path, path_transformer.as_ref()))
+                                    .file(&diagnostics_file_path)
                                     .message(
                                         "Unknown character encoding {} in {} {}.",
                                         &[
diff --git a/ruby/ql/consistency-queries/CfgConsistency.ql b/ruby/ql/consistency-queries/CfgConsistency.ql
index c8d797b71f4c..5af4f22fc26a 100644
--- a/ruby/ql/consistency-queries/CfgConsistency.ql
+++ b/ruby/ql/consistency-queries/CfgConsistency.ql
@@ -11,9 +11,7 @@ import codeql.ruby.controlflow.internal.ControlFlowGraphImpl as CfgImpl
 query predicate nonPostOrderExpr(Expr e, string cls) {
   cls = e.getPrimaryQlClasses() and
   not exists(e.getDesugared()) and
-  not e instanceof BeginExpr and
-  not e instanceof Namespace and
-  not e instanceof Toplevel and
+  not e instanceof BodyStmt and
   exists(AstNode last, Completion c |
     CfgImpl::last(e, last, c) and
     last != e and
@@ -27,7 +25,7 @@ query predicate scopeNoFirst(CfgScope scope) {
   not scope =
     any(Callable c |
       not exists(c.getAParameter()) and
-      not c.(BodyStmt).hasEnsure() and
-      not exists(c.(BodyStmt).getARescue())
+      not c.getBody().hasEnsure() and
+      not exists(c.getBody().getARescue())
     )
 }
diff --git a/ruby/ql/integration-tests/diagnostics/syntax-error/diagnostics.expected b/ruby/ql/integration-tests/diagnostics/syntax-error/diagnostics.expected
index d9ae8e1b617c..b688f22e39ac 100644
--- a/ruby/ql/integration-tests/diagnostics/syntax-error/diagnostics.expected
+++ b/ruby/ql/integration-tests/diagnostics/syntax-error/diagnostics.expected
@@ -5,7 +5,7 @@
   "location": {
     "endColumn": 5,
     "endLine": 1,
-    "file": "<test-root-directory>/bad.rb",
+    "file": "bad.rb",
     "startColumn": 4,
     "startLine": 1
   },
@@ -28,7 +28,7 @@
   "location": {
     "endColumn": 7,
     "endLine": 3,
-    "file": "<test-root-directory>/bad.rb",
+    "file": "bad.rb",
     "startColumn": 8,
     "startLine": 3
   },
diff --git a/ruby/ql/integration-tests/diagnostics/unknown-encoding/diagnostics.expected b/ruby/ql/integration-tests/diagnostics/unknown-encoding/diagnostics.expected
index 1c9caa49824c..2470d9304303 100644
--- a/ruby/ql/integration-tests/diagnostics/unknown-encoding/diagnostics.expected
+++ b/ruby/ql/integration-tests/diagnostics/unknown-encoding/diagnostics.expected
@@ -3,7 +3,7 @@
     "https://docs.ruby-lang.org/en/master/syntax/comments_rdoc.html#label-encoding+Directive"
   ],
   "location": {
-    "file": "<test-root-directory>/encoding.rb"
+    "file": "encoding.rb"
   },
   "markdownMessage": "Unknown character encoding `silly` in `#encoding:` [directive](https://docs.ruby-lang.org/en/master/syntax/comments_rdoc.html#label-encoding+Directive).",
   "plaintextMessage": "Unknown character encoding silly in #encoding: directive.",
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index 07859d0f0e6a..d26bfa6f205a 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.2.2
+
+No user-facing changes.
+
 ## 5.2.1
 
 No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/5.2.2.md b/ruby/ql/lib/change-notes/released/5.2.2.md
new file mode 100644
index 000000000000..22402d6e8fa9
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/5.2.2.md
@@ -0,0 +1,3 @@
+## 5.2.2
+
+No user-facing changes.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index 1684d0e72a28..e3b1b0c079d8 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.2.1
+lastReleaseVersion: 5.2.2
diff --git a/ruby/ql/lib/codeql/ruby/ast/Erb.qll b/ruby/ql/lib/codeql/ruby/ast/Erb.qll
index 4def19f7ceb5..93d7d6f5e082 100644
--- a/ruby/ql/lib/codeql/ruby/ast/Erb.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Erb.qll
@@ -156,14 +156,23 @@ class ErbDirective extends TDirectiveNode, ErbAstNode {
     )
   }
 
+  pragma[nomagic]
+  private Stmt getAChildStmt0() {
+    this.containsAstNodeStart(result) and
+    not this.containsAstNodeStart(result.getParent())
+  }
+
   /**
    * Gets a statement that starts in directive that is not a child of any other
    * statement starting in this directive.
    */
   cached
   Stmt getAChildStmt() {
+    result = this.getAChildStmt0() and
+    not result instanceof BodyStmt
+    or
     this.containsAstNodeStart(result) and
-    not this.containsAstNodeStart(result.getParent())
+    result = this.getAChildStmt0().(BodyStmt).getAStmt()
   }
 
   /**
diff --git a/ruby/ql/lib/codeql/ruby/ast/Expr.qll b/ruby/ql/lib/codeql/ruby/ast/Expr.qll
index e932202e53fd..a49cafa82996 100644
--- a/ruby/ql/lib/codeql/ruby/ast/Expr.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Expr.qll
@@ -167,6 +167,8 @@ class StmtSequence extends Expr, TStmtSequence {
  */
 class BodyStmt extends StmtSequence, TBodyStmt {
   final override Stmt getStmt(int n) {
+    synthChild(this, n, result)
+    or
     toGenerated(result) =
       rank[n + 1](Ruby::AstNode node, int i |
         node = getBodyStmtChild(this, i) and
diff --git a/ruby/ql/lib/codeql/ruby/ast/Method.qll b/ruby/ql/lib/codeql/ruby/ast/Method.qll
index 147782e3d08d..38892da721e5 100644
--- a/ruby/ql/lib/codeql/ruby/ast/Method.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Method.qll
@@ -8,7 +8,7 @@ private import internal.TreeSitter
 private import internal.Method
 
 /** A callable. */
-class Callable extends StmtSequence, Expr, Scope, TCallable {
+class Callable extends Expr, Scope, TCallable {
   /** Gets the number of parameters of this callable. */
   final int getNumberOfParameters() { result = count(this.getAParameter()) }
 
@@ -18,27 +18,26 @@ class Callable extends StmtSequence, Expr, Scope, TCallable {
   /** Gets the `n`th parameter of this callable. */
   Parameter getParameter(int n) { none() }
 
+  /** Gets the body of this callable. */
+  BodyStmt getBody() { none() }
+
   override AstNode getAChild(string pred) {
     result = super.getAChild(pred)
     or
+    pred = "getBody" and result = this.getBody()
+    or
     pred = "getParameter" and result = this.getParameter(_)
   }
 }
 
 /** A method. */
-class MethodBase extends Callable, BodyStmt, Scope, TMethodBase {
+class MethodBase extends Callable, Scope, TMethodBase {
   /** Gets the name of this method. */
   string getName() { none() }
 
   /** Holds if the name of this method is `name`. */
   final predicate hasName(string name) { this.getName() = name }
 
-  override AstNode getAChild(string pred) {
-    result = Callable.super.getAChild(pred)
-    or
-    result = BodyStmt.super.getAChild(pred)
-  }
-
   /**
    * Holds if this method is public.
    * Methods are public by default.
@@ -218,6 +217,10 @@ class Method extends MethodBase, TMethod {
     toGenerated(result) = g.getParameters().getChild(n)
   }
 
+  final override BodyStmt getBody() {
+    toGenerated(result) = g.getBody() or synthChild(this, _, result)
+  }
+
   final override string toString() { result = this.getName() }
 
   overlay[global]
@@ -280,6 +283,10 @@ class SingletonMethod extends MethodBase, TSingletonMethod {
     toGenerated(result) = g.getParameters().getChild(n)
   }
 
+  final override BodyStmt getBody() {
+    toGenerated(result) = g.getBody() or synthChild(this, _, result)
+  }
+
   final override string toString() { result = this.getName() }
 
   final override AstNode getAChild(string pred) {
@@ -321,7 +328,7 @@ class SingletonMethod extends MethodBase, TSingletonMethod {
  * -> (x) { x + 1 }
  * ```
  */
-class Lambda extends Callable, BodyStmt, TLambda {
+class Lambda extends Callable, TLambda {
   private Ruby::Lambda g;
 
   Lambda() { this = TLambda(g) }
@@ -332,17 +339,16 @@ class Lambda extends Callable, BodyStmt, TLambda {
     toGenerated(result) = g.getParameters().getChild(n)
   }
 
-  final override string toString() { result = "-> { ... }" }
-
-  final override AstNode getAChild(string pred) {
-    result = Callable.super.getAChild(pred)
-    or
-    result = BodyStmt.super.getAChild(pred)
+  final override BodyStmt getBody() {
+    toGenerated(result) = g.getBody().(Ruby::DoBlock).getBody() or
+    toGenerated(result) = g.getBody().(Ruby::Block).getBody()
   }
+
+  final override string toString() { result = "-> { ... }" }
 }
 
 /** A block. */
-class Block extends Callable, StmtSequence, Scope, TBlock {
+class Block extends Callable, Scope, TBlock {
   /**
    * Gets a local variable declared by this block.
    * For example `local` in `{ | param; local| puts param }`.
@@ -355,17 +361,15 @@ class Block extends Callable, StmtSequence, Scope, TBlock {
    */
   LocalVariableWriteAccess getLocalVariable(int n) { none() }
 
-  override AstNode getAChild(string pred) {
+  final override AstNode getAChild(string pred) {
     result = Callable.super.getAChild(pred)
     or
-    result = StmtSequence.super.getAChild(pred)
-    or
     pred = "getLocalVariable" and result = this.getLocalVariable(_)
   }
 }
 
 /** A block enclosed within `do` and `end`. */
-class DoBlock extends Block, BodyStmt, TDoBlock {
+class DoBlock extends Block, TDoBlock {
   private Ruby::DoBlock g;
 
   DoBlock() { this = TDoBlock(g) }
@@ -378,13 +382,9 @@ class DoBlock extends Block, BodyStmt, TDoBlock {
     toGenerated(result) = g.getParameters().getChild(n)
   }
 
-  final override string toString() { result = "do ... end" }
+  final override BodyStmt getBody() { toGenerated(result) = g.getBody() }
 
-  final override AstNode getAChild(string pred) {
-    result = Block.super.getAChild(pred)
-    or
-    result = BodyStmt.super.getAChild(pred)
-  }
+  final override string toString() { result = "do ... end" }
 
   final override string getAPrimaryQlClass() { result = "DoBlock" }
 }
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/AST.qll b/ruby/ql/lib/codeql/ruby/ast/internal/AST.qll
index ee46fbe8b66a..bf187e226990 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/AST.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/AST.qll
@@ -100,9 +100,16 @@ private module Cached {
     } or
     TBlockArgument(Ruby::BlockArgument g) or
     TBlockParameter(Ruby::BlockParameter g) or
+    TBodyStatement(Ruby::BodyStatement g) {
+      any(Ruby::Method m).getBody() = g or
+      any(Ruby::SingletonMethod m).getBody() = g or
+      any(Ruby::DoBlock b).getBody() = g
+    } or
+    TBodyStmtSynth(Ast::AstNode parent, int i) { mkSynthChild(BodyStmtKind(), parent, i) } or
     TBooleanLiteralSynth(Ast::AstNode parent, int i, boolean value) {
       mkSynthChild(BooleanLiteralKind(value), parent, i)
     } or
+    TBraceBlockBody(Ruby::BlockBody g) or
     TBraceBlockSynth(Ast::AstNode parent, int i) { mkSynthChild(BraceBlockKind(), parent, i) } or
     TBraceBlockReal(Ruby::Block g) { not g.getParent() instanceof Ruby::Lambda } or
     TBreakStmt(Ruby::Break g) or
@@ -362,23 +369,24 @@ private module Cached {
         TAssignMulExpr or TAssignRShiftExpr or TAssignSubExpr or TBareStringLiteral or
         TBareSymbolLiteral or TBeginBlock or TBeginExpr or TBitwiseAndExprReal or
         TBitwiseOrExprReal or TBitwiseXorExprReal or TBlockArgument or TBlockParameter or
-        TBraceBlockReal or TBreakStmt or TCaseEqExpr or TCaseExpr or TCaseMatchReal or
-        TCharacterLiteral or TClassDeclaration or TClassVariableAccessReal or TComplementExpr or
-        TComplexLiteral or TDefinedExprReal or TDelimitedSymbolLiteral or
-        TDestructuredLeftAssignment or TDestructuredParameter or TDivExprReal or TDo or TDoBlock or
-        TElementReference or TElseReal or TElsif or TEmptyStmt or TEncoding or TEndBlock or
-        TEnsure or TEqExpr or TExponentExprReal or TFalseLiteral or TFile or TFindPattern or
-        TFloatLiteral or TForExpr or TForwardParameter or TForwardArgument or TGEExpr or TGTExpr or
-        TGlobalVariableAccessReal or THashKeySymbolLiteral or THashLiteral or THashPattern or
-        THashSplatExprReal or THashSplatNilParameter or THashSplatParameter or THereDoc or
-        TIdentifierMethodCall or TIfReal or TIfModifierExpr or TInClauseReal or
-        TInstanceVariableAccessReal or TIntegerLiteralReal or TKeywordParameter or TLEExpr or
-        TLShiftExprReal or TLTExpr or TLambda or TLeftAssignmentList or TLine or
-        TLocalVariableAccessReal or TLogicalAndExprReal or TLogicalOrExprReal or TMethod or
-        TMatchPattern or TModuleDeclaration or TModuloExprReal or TMulExprReal or TNEExpr or
-        TNextStmt or TNilLiteralReal or TNoRegExpMatchExpr or TNotExprReal or TOptionalParameter or
-        TPairReal or TParenthesizedExpr or TParenthesizedPattern or TRShiftExprReal or
-        TRangeLiteralReal or TRationalLiteral or TRedoStmt or TRegExpLiteral or TRegExpMatchExpr or
+        TBodyStatement or TBraceBlockBody or TBraceBlockReal or TBreakStmt or TCaseEqExpr or
+        TCaseExpr or TCaseMatchReal or TCharacterLiteral or TClassDeclaration or
+        TClassVariableAccessReal or TComplementExpr or TComplexLiteral or TDefinedExprReal or
+        TDelimitedSymbolLiteral or TDestructuredLeftAssignment or TDestructuredParameter or
+        TDivExprReal or TDo or TDoBlock or TElementReference or TElseReal or TElsif or TEmptyStmt or
+        TEncoding or TEndBlock or TEnsure or TEqExpr or TExponentExprReal or TFalseLiteral or
+        TFile or TFindPattern or TFloatLiteral or TForExpr or TForwardParameter or
+        TForwardArgument or TGEExpr or TGTExpr or TGlobalVariableAccessReal or
+        THashKeySymbolLiteral or THashLiteral or THashPattern or THashSplatExprReal or
+        THashSplatNilParameter or THashSplatParameter or THereDoc or TIdentifierMethodCall or
+        TIfReal or TIfModifierExpr or TInClauseReal or TInstanceVariableAccessReal or
+        TIntegerLiteralReal or TKeywordParameter or TLEExpr or TLShiftExprReal or TLTExpr or
+        TLambda or TLeftAssignmentList or TLine or TLocalVariableAccessReal or
+        TLogicalAndExprReal or TLogicalOrExprReal or TMethod or TMatchPattern or
+        TModuleDeclaration or TModuloExprReal or TMulExprReal or TNEExpr or TNextStmt or
+        TNilLiteralReal or TNoRegExpMatchExpr or TNotExprReal or TOptionalParameter or TPairReal or
+        TParenthesizedExpr or TParenthesizedPattern or TRShiftExprReal or TRangeLiteralReal or
+        TRationalLiteral or TRedoStmt or TRegExpLiteral or TRegExpMatchExpr or
         TRegularArrayLiteral or TRegularMethodCall or TRegularStringLiteral or TRegularSuperCall or
         TRescueClause or TRescueModifierExpr or TRetryStmt or TReturnStmt or
         TScopeResolutionConstantAccess or TSelfReal or TSimpleParameterReal or
@@ -393,13 +401,13 @@ private module Cached {
 
   class TAstNodeSynth =
     TAddExprSynth or TAssignExprSynth or TBitwiseAndExprSynth or TBitwiseOrExprSynth or
-        TBitwiseXorExprSynth or TBraceBlockSynth or TBooleanLiteralSynth or TCaseMatchSynth or
-        TClassVariableAccessSynth or TConstantReadAccessSynth or TConstantWriteAccessSynth or
-        TDivExprSynth or TElseSynth or TExponentExprSynth or TGlobalVariableAccessSynth or
-        TIfSynth or TInClauseSynth or TInstanceVariableAccessSynth or TIntegerLiteralSynth or
-        TLShiftExprSynth or TLocalVariableAccessSynth or TLogicalAndExprSynth or
-        TLogicalOrExprSynth or TMethodCallSynth or TModuloExprSynth or TMulExprSynth or
-        TNilLiteralSynth or TRShiftExprSynth or TRangeLiteralSynth or TSelfSynth or
+        TBitwiseXorExprSynth or TBraceBlockSynth or TBodyStmtSynth or TBooleanLiteralSynth or
+        TCaseMatchSynth or TClassVariableAccessSynth or TConstantReadAccessSynth or
+        TConstantWriteAccessSynth or TDivExprSynth or TElseSynth or TExponentExprSynth or
+        TGlobalVariableAccessSynth or TIfSynth or TInClauseSynth or TInstanceVariableAccessSynth or
+        TIntegerLiteralSynth or TLShiftExprSynth or TLocalVariableAccessSynth or
+        TLogicalAndExprSynth or TLogicalOrExprSynth or TMethodCallSynth or TModuloExprSynth or
+        TMulExprSynth or TNilLiteralSynth or TRShiftExprSynth or TRangeLiteralSynth or TSelfSynth or
         TSimpleParameterSynth or TSplatExprSynth or THashSplatExprSynth or TStmtSequenceSynth or
         TSubExprSynth or TPairSynth or TSimpleSymbolLiteralSynth;
 
@@ -439,6 +447,8 @@ private module Cached {
     n = TBitwiseXorExprReal(result) or
     n = TBlockArgument(result) or
     n = TBlockParameter(result) or
+    n = TBodyStatement(result) or
+    n = TBraceBlockBody(result) or
     n = TBraceBlockReal(result) or
     n = TBreakStmt(result) or
     n = TCaseEqExpr(result) or
@@ -584,6 +594,8 @@ private module Cached {
     or
     result = TBitwiseXorExprSynth(parent, i)
     or
+    result = TBodyStmtSynth(parent, i)
+    or
     result = TBooleanLiteralSynth(parent, i, _)
     or
     result = TBraceBlockSynth(parent, i)
@@ -757,9 +769,9 @@ class TElse = TElseReal or TElseSynth;
 
 class TStmtSequence =
   TBeginBlock or TEndBlock or TThen or TElse or TDo or TEnsure or TStringInterpolationComponent or
-      TBlock or TBodyStmt or TParenthesizedExpr or TStmtSequenceSynth;
+      TBodyStmt or TParenthesizedExpr or TStmtSequenceSynth;
 
-class TBodyStmt = TBeginExpr or TModuleBase or TMethod or TLambda or TDoBlock or TSingletonMethod;
+class TBodyStmt = TBeginExpr or TModuleBase or TBraceBlockBody or TBodyStatement or TBodyStmtSynth;
 
 class TNilLiteral = TNilLiteralReal or TNilLiteralSynth;
 
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Expr.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Expr.qll
index fdeec446a937..656b53eec468 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Expr.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Expr.qll
@@ -14,6 +14,18 @@ class StmtSequenceSynth extends StmtSequence, TStmtSequenceSynth {
   final override string toString() { result = "..." }
 }
 
+class BodyStatement extends BodyStmt, TBodyStatement {
+  final override string toString() { result = "..." }
+}
+
+class BraceBlockBody extends BodyStmt, TBraceBlockBody {
+  final override string toString() { result = "..." }
+}
+
+class BodyStmtSynth extends BodyStmt, TBodyStmtSynth {
+  final override string toString() { result = "..." }
+}
+
 class Then extends StmtSequence, TThen {
   private Ruby::Then g;
 
@@ -64,26 +76,9 @@ class Ensure extends StmtSequence, TEnsure {
 
 // Not defined by dispatch, as it should not be exposed
 Ruby::AstNode getBodyStmtChild(TBodyStmt b, int i) {
-  exists(Ruby::Method g, Ruby::AstNode body | b = TMethod(g) and body = g.getBody() |
-    result = body.(Ruby::BodyStatement).getChild(i)
-    or
-    i = 0 and result = body and not body instanceof Ruby::BodyStatement
-  )
-  or
-  exists(Ruby::SingletonMethod g, Ruby::AstNode body |
-    b = TSingletonMethod(g) and body = g.getBody()
-  |
-    result = body.(Ruby::BodyStatement).getChild(i)
-    or
-    i = 0 and result = body and not body instanceof Ruby::BodyStatement
-  )
-  or
-  exists(Ruby::Lambda g | b = TLambda(g) |
-    result = g.getBody().(Ruby::DoBlock).getBody().getChild(i) or
-    result = g.getBody().(Ruby::Block).getBody().getChild(i)
-  )
+  result = any(Ruby::BlockBody g | b = TBraceBlockBody(g)).getChild(i)
   or
-  result = any(Ruby::DoBlock g | b = TDoBlock(g)).getBody().getChild(i)
+  result = any(Ruby::BodyStatement g | b = TBodyStatement(g)).getChild(i)
   or
   result = any(Ruby::Program g | b = TToplevel(g)).getChild(i) and
   not result instanceof Ruby::BeginBlock
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Method.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Method.qll
index c4dd1abbee02..fc30ec0c44f3 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Method.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Method.qll
@@ -18,7 +18,7 @@ class BraceBlockReal extends BraceBlock, TBraceBlockReal {
     toGenerated(result) = g.getParameters().getChild(n)
   }
 
-  final override Stmt getStmt(int i) { toGenerated(result) = g.getBody().getChild(i) }
+  final override BodyStmt getBody() { toGenerated(result) = g.getBody() }
 }
 
 /**
@@ -28,8 +28,5 @@ class BraceBlockReal extends BraceBlock, TBraceBlockReal {
 class BraceBlockSynth extends BraceBlock, TBraceBlockSynth {
   final override Parameter getParameter(int n) { synthChild(this, n, result) }
 
-  final override Stmt getStmt(int i) {
-    i >= 0 and
-    synthChild(this, i + this.getNumberOfParameters(), result)
-  }
+  final override BodyStmt getBody() { synthChild(this, _, result) }
 }
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll
index f2be91a63e51..9d2dd16ea63c 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll
@@ -19,6 +19,7 @@ newtype TSynthKind =
   BitwiseAndExprKind() or
   BitwiseOrExprKind() or
   BitwiseXorExprKind() or
+  BodyStmtKind() or
   BooleanLiteralKind(boolean value) { value = true or value = false } or
   BraceBlockKind() or
   CaseMatchKind() or
@@ -73,6 +74,8 @@ class SynthKind extends TSynthKind {
     or
     this = BitwiseXorExprKind() and result = "BitwiseXorExprKind"
     or
+    this = BodyStmtKind() and result = "BodyStmtKind"
+    or
     this = BooleanLiteralKind(_) and result = "BooleanLiteralKind"
     or
     this = BraceBlockKind() and result = "BraceBlockKind"
@@ -1475,17 +1478,24 @@ private module ForLoopDesugar {
               i = 0 and
               child = SynthChild(SimpleParameterKind())
               or
-              exists(SimpleParameter param | param = TSimpleParameterSynth(block, 0) |
+              // block body
+              parent = block and
+              i = 1 and
+              child = SynthChild(BodyStmtKind())
+              or
+              exists(SimpleParameter param, BodyStmt body |
+                param = TSimpleParameterSynth(block, 0) and body = TBodyStmtSynth(block, 1)
+              |
                 parent = param and
                 i = 0 and
                 child = SynthChild(LocalVariableAccessSynthKind(TLocalVariableSynth(param, 0)))
                 or
                 // assignment to pattern from for loop to synth parameter
-                parent = block and
-                i = 1 and
+                parent = body and
+                i = 0 and
                 child = SynthChild(AssignExprKind())
                 or
-                parent = TAssignExprSynth(block, 1) and
+                parent = TAssignExprSynth(body, 0) and
                 (
                   i = 0 and
                   child = childRef(for.getPattern())
@@ -1493,11 +1503,11 @@ private module ForLoopDesugar {
                   i = 1 and
                   child = SynthChild(LocalVariableAccessSynthKind(TLocalVariableSynth(param, 0)))
                 )
+                or
+                // rest of block body
+                parent = body and
+                child = childRef(for.getBody().(Do).getStmt(i - 1))
               )
-              or
-              // rest of block body
-              parent = block and
-              child = childRef(for.getBody().(Do).getStmt(i - 2))
             )
           )
         )
@@ -1951,3 +1961,31 @@ private module ImplicitSuperArgsSynthesis {
     }
   }
 }
+
+private module CallableBodySynthesis {
+  private predicate bodySynthesis(AstNode parent, int i, Child child) {
+    exists(TMethodBase m, Ruby::AstNode body |
+      body = any(Ruby::Method g | m = TMethod(g)).getBody()
+      or
+      body = any(Ruby::SingletonMethod g | m = TSingletonMethod(g)).getBody()
+    |
+      parent = m and
+      not body instanceof Ruby::BodyStatement and
+      i = 0 and
+      child = SynthChild(BodyStmtKind())
+      or
+      exists(Stmt bodyStmt |
+        parent = TBodyStmtSynth(m, 0) and
+        i = 0 and
+        bodyStmt = fromGenerated(body) and
+        child = childRef(bodyStmt)
+      )
+    )
+  }
+
+  private class CallableBodySynthesis extends Synthesis {
+    final override predicate child(AstNode parent, int i, Child child) {
+      bodySynthesis(parent, i, child)
+    }
+  }
+}
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
index f564633bb00f..9658c51d6739 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
@@ -100,24 +100,26 @@ private class EndBlockScope extends CfgScopeImpl, EndBlock {
   }
 }
 
-private class BodyStmtCallableScope extends CfgScopeImpl, AstInternal::TBodyStmt, Callable {
-  final override predicate entry(AstNode first) { this.(Trees::BodyStmtTree).firstInner(first) }
-
-  final override predicate exit(AstNode last, Completion c) {
-    this.(Trees::BodyStmtTree).lastInner(last, c)
-  }
-}
-
-private class BraceBlockScope extends CfgScopeImpl, BraceBlock {
+private class CallableScope extends CfgScopeImpl, Callable {
   final override predicate entry(AstNode first) {
-    first(this.(Trees::BraceBlockTree).getBodyChild(0, _), first)
+    first(this.(Trees::CallableTree).getBodyChild(0), first)
   }
 
   final override predicate exit(AstNode last, Completion c) {
-    last(this.(Trees::BraceBlockTree).getLastBodyChild(), last, c)
+    this.getBody().(Trees::BodyStmtTree).last(last, c)
     or
-    last(this.(Trees::BraceBlockTree).getBodyChild(_, _), last, c) and
-    not c instanceof NormalCompletion
+    exists(int i |
+      not exists(this.getBody()) and
+      last(this.(Trees::CallableTree).getBodyChild(i), last, c) and
+      not exists(this.(Trees::CallableTree).getBodyChild(i + 1))
+    )
+    or
+    exists(AstNode child |
+      child = this.(Trees::CallableTree).getBodyChild(_) and
+      not child = this.getBody() and
+      last(child, last, c) and
+      not c instanceof NormalCompletion
+    )
   }
 }
 
@@ -159,10 +161,6 @@ module Trees {
   }
 
   private class BeginTree extends BodyStmtTree instanceof BeginExpr {
-    final override predicate first(AstNode first) { this.firstInner(first) }
-
-    final override predicate last(AstNode last, Completion c) { this.lastInner(last, c) }
-
     final override predicate propagatesAbnormal(AstNode child) { none() }
   }
 
@@ -196,28 +194,21 @@ module Trees {
   private class BlockParameterTree extends NonDefaultValueParameterTree instanceof BlockParameter {
   }
 
-  abstract class BodyStmtTree extends StmtSequenceTree instanceof BodyStmt {
+  class BodyStmtTree extends StmtSequenceTree instanceof BodyStmt {
     /** Gets a rescue clause in this block. */
     final RescueClause getARescue() { result = super.getRescue(_) }
 
     /** Gets the `ensure` clause in this block, if any. */
     final StmtSequence getEnsure() { result = super.getEnsure() }
 
-    override predicate first(AstNode first) { first = this }
-
-    predicate firstInner(AstNode first) {
+    override predicate first(AstNode first) {
       first(this.getBodyChild(0, _), first)
       or
       not exists(this.getBodyChild(_, _)) and
-      (
-        first(super.getRescue(_), first)
-        or
-        not exists(super.getRescue(_)) and
-        first(super.getEnsure(), first)
-      )
+      first(super.getEnsure(), first)
     }
 
-    predicate lastInner(AstNode last, Completion c) {
+    override predicate last(AstNode last, Completion c) {
       exists(boolean ensurable | last = this.getAnEnsurePredecessor(c, ensurable) |
         not super.hasEnsure()
         or
@@ -387,27 +378,28 @@ module Trees {
 
   private class BooleanLiteralTree extends LeafTree instanceof BooleanLiteral { }
 
-  class BraceBlockTree extends StmtSequenceTree instanceof BraceBlock {
-    final override predicate propagatesAbnormal(AstNode child) { none() }
-
-    final override AstNode getBodyChild(int i, boolean rescuable) {
-      result = super.getParameter(i) and rescuable = false
+  class BraceBlockTree extends CallableTree instanceof BraceBlock {
+    final override AstNode getBodyChild(int i) {
+      result = super.getParameter(i)
       or
-      result = super.getLocalVariable(i - super.getNumberOfParameters()) and rescuable = false
+      result = super.getLocalVariable(i - super.getNumberOfParameters())
       or
-      result =
-        StmtSequenceTree.super
-            .getBodyChild(i - super.getNumberOfParameters() - count(super.getALocalVariable()),
-              rescuable)
+      result = super.getBody() and
+      i = super.getNumberOfParameters() + count(super.getALocalVariable())
     }
+  }
+
+  class CallableTree extends PostOrderTree instanceof Callable {
+    final override predicate propagatesAbnormal(AstNode child) { none() }
 
     override predicate first(AstNode first) { first = this }
 
+    abstract AstNode getBodyChild(int i);
+
     override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      // Normal left-to-right evaluation in the body
       exists(int i |
-        last(this.getBodyChild(i, _), pred, c) and
-        first(this.getBodyChild(i + 1, _), succ) and
+        last(this.getBodyChild(i), pred, c) and
+        first(this.getBodyChild(i + 1), succ) and
         c instanceof NormalCompletion
       )
     }
@@ -1016,20 +1008,16 @@ module Trees {
     final override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
   }
 
-  private class DoBlockTree extends BodyStmtTree instanceof DoBlock {
+  private class DoBlockTree extends CallableTree instanceof DoBlock {
     /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i, boolean rescuable) {
-      result = super.getParameter(i) and rescuable = false
+    final override AstNode getBodyChild(int i) {
+      result = super.getParameter(i)
       or
-      result = super.getLocalVariable(i - super.getNumberOfParameters()) and rescuable = false
+      result = super.getLocalVariable(i - super.getNumberOfParameters())
       or
-      result =
-        BodyStmtTree.super
-            .getBodyChild(i - super.getNumberOfParameters() - count(super.getALocalVariable()),
-              rescuable)
+      result = super.getBody() and
+      i = super.getNumberOfParameters() + count(super.getALocalVariable())
     }
-
-    override predicate propagatesAbnormal(AstNode child) { none() }
   }
 
   private class EmptyStatementTree extends LeafTree instanceof EmptyStmt { }
@@ -1073,14 +1061,12 @@ module Trees {
     final override AstNode getAccessNode() { result = super.getDefiningAccess() }
   }
 
-  private class LambdaTree extends BodyStmtTree instanceof Lambda {
-    final override predicate propagatesAbnormal(AstNode child) { none() }
-
+  private class LambdaTree extends CallableTree instanceof Lambda {
     /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i, boolean rescuable) {
-      result = super.getParameter(i) and rescuable = false
+    final override AstNode getBodyChild(int i) {
+      result = super.getParameter(i)
       or
-      result = BodyStmtTree.super.getBodyChild(i - super.getNumberOfParameters(), rescuable)
+      result = super.getBody() and i = super.getNumberOfParameters()
     }
   }
 
@@ -1151,14 +1137,12 @@ module Trees {
   private class MethodNameTree extends LeafTree instanceof MethodName, AstInternal::TTokenMethodName
   { }
 
-  private class MethodTree extends BodyStmtTree instanceof Method {
-    final override predicate propagatesAbnormal(AstNode child) { none() }
-
+  private class MethodTree extends CallableTree instanceof Method {
     /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i, boolean rescuable) {
-      result = super.getParameter(i) and rescuable = false
+    final override AstNode getBodyChild(int i) {
+      result = super.getParameter(i)
       or
-      result = BodyStmtTree.super.getBodyChild(i - super.getNumberOfParameters(), rescuable)
+      result = super.getBody() and i = super.getNumberOfParameters()
     }
   }
 
@@ -1183,12 +1167,12 @@ module Trees {
       BodyStmtTree.super.succ(pred, succ, c)
       or
       pred = this and
-      this.firstInner(succ) and
+      super.first(succ) and
       c instanceof SimpleCompletion
     }
 
     final override predicate last(AstNode last, Completion c) {
-      this.lastInner(last, c)
+      super.last(last, c)
       or
       not exists(this.getAChild(_)) and
       last = this and
@@ -1328,7 +1312,7 @@ module Trees {
 
   private class SingletonClassTree extends BodyStmtTree instanceof SingletonClass {
     final override predicate first(AstNode first) {
-      this.firstInner(first)
+      super.first(first)
       or
       not exists(this.getAChild(_)) and
       first = this
@@ -1338,7 +1322,12 @@ module Trees {
       BodyStmtTree.super.succ(pred, succ, c)
       or
       succ = this and
-      this.lastInner(pred, c)
+      super.last(pred, c)
+    }
+
+    final override predicate last(AstNode last, Completion c) {
+      last = this and
+      c.isValidFor(this)
     }
 
     /** Gets the `i`th child in the body of this block. */
@@ -1351,20 +1340,18 @@ module Trees {
     }
   }
 
-  private class SingletonMethodTree extends BodyStmtTree instanceof SingletonMethod {
-    final override predicate propagatesAbnormal(AstNode child) { none() }
-
+  private class SingletonMethodTree extends CallableTree instanceof SingletonMethod {
     /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i, boolean rescuable) {
-      result = super.getParameter(i) and rescuable = false
+    final override AstNode getBodyChild(int i) {
+      result = super.getParameter(i)
       or
-      result = BodyStmtTree.super.getBodyChild(i - super.getNumberOfParameters(), rescuable)
+      result = super.getBody() and i = super.getNumberOfParameters()
     }
 
     override predicate first(AstNode first) { first(super.getObject(), first) }
 
     override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      BodyStmtTree.super.succ(pred, succ, c)
+      CallableTree.super.succ(pred, succ, c)
       or
       last(super.getObject(), pred, c) and
       succ = this and
@@ -1443,10 +1430,6 @@ module Trees {
       or
       result = BodyStmtTree.super.getBodyChild(i - count(super.getABeginBlock()), rescuable)
     }
-
-    final override predicate first(AstNode first) { super.firstInner(first) }
-
-    final override predicate last(AstNode last, Completion c) { super.lastInner(last, c) }
   }
 
   private class UndefStmtTree extends StandardPreOrderTree instanceof UndefStmt {
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
index 782315dc14ca..737f450b4f23 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
@@ -246,7 +246,7 @@ module EnsureSplitting {
     private predicate exit0(AstNode pred, Trees::BodyStmtTree block, int nestLevel, Completion c) {
       this.appliesToPredecessor(pred) and
       nestLevel = block.getNestLevel() and
-      block.lastInner(pred, c)
+      block.last(pred, c)
     }
 
     /**
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
index e4bcf2537a7a..fb5ce7b01457 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
@@ -1662,7 +1662,7 @@ private module ReturnNodes {
    * last thing that is evaluated in the body of the callable.
    */
   class ExprReturnNode extends SourceReturnNode, ExprNode {
-    ExprReturnNode() { exists(Callable c | implicitReturn(c, this) = c.getAStmt()) }
+    ExprReturnNode() { exists(Callable c | implicitReturn(c, this) = c.getBody().getAStmt()) }
 
     override ReturnKind getKindSource() {
       exists(CfgScope scope | scope = this.(NodeImpl).getCfgScope() |
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll
index 6f2bc8b4accb..d0823fba0a77 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll
@@ -1392,7 +1392,7 @@ class StmtSequenceNode extends ExprNode {
 /**
  * A data flow node corresponding to a method, block, or lambda expression.
  */
-class CallableNode extends StmtSequenceNode {
+class CallableNode extends ExprNode {
   private Callable callable;
 
   CallableNode() { this.asExpr().getExpr() = callable }
diff --git a/ruby/ql/lib/codeql/ruby/experimental/Rbi.qll b/ruby/ql/lib/codeql/ruby/experimental/Rbi.qll
index 008089a62519..68efe353bb0a 100644
--- a/ruby/ql/lib/codeql/ruby/experimental/Rbi.qll
+++ b/ruby/ql/lib/codeql/ruby/experimental/Rbi.qll
@@ -83,11 +83,7 @@ module Rbi {
       /**
        * Gets the type aliased by this call.
        */
-      RbiType getAliasedType() {
-        exists(ExprNodes::MethodCallCfgNode n | n.getExpr() = this |
-          result = n.getBlock().(ExprNodes::StmtSequenceCfgNode).getLastStmt().getExpr()
-        )
-      }
+      RbiType getAliasedType() { result = this.getBlock().getBody().getLastStmt() }
     }
 
     /**
@@ -304,7 +300,7 @@ module Rbi {
     private MethodSignatureCall sigCall;
 
     MethodSignatureDefiningCall() {
-      exists(MethodCall c | c = sigCall.getBlock().getAChild() |
+      exists(MethodCall c | c = sigCall.getBlock().getBody().getAChild() |
         // The typical pattern for the contents of a `sig` block is something
         // like `params(<param defs>).returns(<return type>)` - we want to
         // pick up both of these calls.
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Slim.qll b/ruby/ql/lib/codeql/ruby/frameworks/Slim.qll
index 3c3c3987383e..7f85737bc046 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/Slim.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Slim.qll
@@ -18,7 +18,7 @@ module Slim {
 
     override DataFlow::Node getTemplate() {
       result.asExpr().getExpr() =
-        this.getBlock().(DataFlow::BlockNode).asCallableAstNode().getAStmt()
+        this.getBlock().(DataFlow::BlockNode).asCallableAstNode().getBody().getAStmt()
     }
   }
 
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/XmlParsing.qll b/ruby/ql/lib/codeql/ruby/frameworks/XmlParsing.qll
index 91dc0ce5efad..b9b96fe1909f 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/XmlParsing.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/XmlParsing.qll
@@ -38,6 +38,7 @@ private class NokogiriXmlParserCall extends XmlParserCall::Range, DataFlow::Call
         .getExpr()
         .(MethodCall)
         .getBlock()
+        .getBody()
         .getAStmt()
         .getAChild*()
         .(MethodCall)
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Routing.qll b/ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Routing.qll
index e6e453d449f0..ac545481b9c7 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Routing.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Routing.qll
@@ -98,7 +98,7 @@ module Routing {
 
     Block getBlock() { result = block }
 
-    override Stmt getAStmt() { result = block.getAStmt() }
+    override Stmt getAStmt() { result = block.getBody().getAStmt() }
 
     override RouteBlock getParent() { none() }
 
@@ -128,7 +128,7 @@ module Routing {
 
     override string getAPrimaryQlClass() { result = "ConstraintsRouteBlock" }
 
-    override Stmt getAStmt() { result = block.getAStmt() }
+    override Stmt getAStmt() { result = block.getBody().getAStmt() }
 
     override string getPathComponent() { result = "" }
 
@@ -156,7 +156,7 @@ module Routing {
 
     override string getAPrimaryQlClass() { result = "ScopeRouteBlock" }
 
-    override Stmt getAStmt() { result = block.getAStmt() }
+    override Stmt getAStmt() { result = block.getBody().getAStmt() }
 
     override string toString() { result = methodCall.toString() }
 
@@ -216,7 +216,7 @@ module Routing {
 
     override string getAPrimaryQlClass() { result = "ResourcesRouteBlock" }
 
-    override Stmt getAStmt() { result = block.getAStmt() }
+    override Stmt getAStmt() { result = block.getBody().getAStmt() }
 
     /**
      * Gets the `resources` call that gives rise to this route block.
@@ -282,7 +282,7 @@ module Routing {
 
     NamespaceRouteBlock() { this = TNamespaceRouteBlock(parent, methodCall, block) }
 
-    override Stmt getAStmt() { result = block.getAStmt() }
+    override Stmt getAStmt() { result = block.getBody().getAStmt() }
 
     override string getPathComponent() { result = this.getNamespace() }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll b/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll
index dab75f00b9e5..f46540cc33a6 100644
--- a/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll
@@ -70,7 +70,7 @@ private predicate memoReturnedFromMethod(Method m, MemoStmt s) {
   or
   // If we don't have flow (e.g. due to the dataflow library not supporting instance variable flow yet),
   // fall back to a syntactic heuristic: does the last statement in the method mention the memoization variable?
-  m.getLastStmt().getAChild*().(InstanceVariableReadAccess).getVariable() =
+  m.getBody().getLastStmt().getAChild*().(InstanceVariableReadAccess).getVariable() =
     s.getVariableAccess().getVariable()
 }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/InsecureDependencyQuery.qll b/ruby/ql/lib/codeql/ruby/security/InsecureDependencyQuery.qll
index b8298420f81d..dc18981a50b6 100644
--- a/ruby/ql/lib/codeql/ruby/security/InsecureDependencyQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/InsecureDependencyQuery.qll
@@ -33,7 +33,7 @@ private class SourceCall extends RelevantGemCall {
 private class GitSourceCall extends RelevantGemCall {
   GitSourceCall() { this.getMethodName() = "git_source" }
 
-  override Expr getAUrlPart() { result = this.getBlock().getLastStmt() }
+  override Expr getAUrlPart() { result = this.getBlock().getBody().getLastStmt() }
 }
 
 /**
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index 29c765d88eef..3029a6d098f4 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 5.2.1
+version: 5.2.3-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index c874059c1510..384ca6332028 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6.4
+
+No user-facing changes.
+
 ## 1.6.3
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.6.4.md b/ruby/ql/src/change-notes/released/1.6.4.md
new file mode 100644
index 000000000000..5c811dc46384
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.6.4.md
@@ -0,0 +1,3 @@
+## 1.6.4
+
+No user-facing changes.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index 00b51441d882..1910e09d6a6a 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.3
+lastReleaseVersion: 1.6.4
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index a745eae0790a..72b0258fa305 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.6.3
+version: 1.6.5-dev
 groups:
   - ruby
   - queries
diff --git a/ruby/ql/test/library-tests/ast/Ast.expected b/ruby/ql/test/library-tests/ast/Ast.expected
index 0bece506bfb4..c391b7f584d8 100644
--- a/ruby/ql/test/library-tests/ast/Ast.expected
+++ b/ruby/ql/test/library-tests/ast/Ast.expected
@@ -15,18 +15,19 @@ gems/Gemfile:
 #    5|     getArgument: [StringLiteral] "https://gems.example.com"
 #    5|       getComponent: [StringTextComponent] https://gems.example.com
 #    5|     getBlock: [DoBlock] do ... end
-#    6|       getStmt: [MethodCall] call to gem
-#    6|         getReceiver: [SelfVariableAccess] self
-#    6|         getArgument: [StringLiteral] "my_gem"
-#    6|           getComponent: [StringTextComponent] my_gem
-#    6|         getArgument: [StringLiteral] "1.0"
-#    6|           getComponent: [StringTextComponent] 1.0
-#    7|       getStmt: [MethodCall] call to gem
-#    7|         getReceiver: [SelfVariableAccess] self
-#    7|         getArgument: [StringLiteral] "another_gem"
-#    7|           getComponent: [StringTextComponent] another_gem
-#    7|         getArgument: [StringLiteral] "3.1.4"
-#    7|           getComponent: [StringTextComponent] 3.1.4
+#    6|       getBody: [StmtSequence] ...
+#    6|         getStmt: [MethodCall] call to gem
+#    6|           getReceiver: [SelfVariableAccess] self
+#    6|           getArgument: [StringLiteral] "my_gem"
+#    6|             getComponent: [StringTextComponent] my_gem
+#    6|           getArgument: [StringLiteral] "1.0"
+#    6|             getComponent: [StringTextComponent] 1.0
+#    7|         getStmt: [MethodCall] call to gem
+#    7|           getReceiver: [SelfVariableAccess] self
+#    7|           getArgument: [StringLiteral] "another_gem"
+#    7|             getComponent: [StringTextComponent] another_gem
+#    7|           getArgument: [StringLiteral] "3.1.4"
+#    7|             getComponent: [StringTextComponent] 3.1.4
 calls/calls.rb:
 #    1| [Toplevel] calls.rb
 #    2|   getStmt: [MethodCall] call to foo
@@ -45,17 +46,19 @@ calls/calls.rb:
 #   14|     getBlock: [BraceBlock] { ... }
 #   14|       getParameter: [SimpleParameter] x
 #   14|         getDefiningAccess: [LocalVariableAccess] x
-#   14|       getStmt: [AddExpr] ... + ...
-#   14|         getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#   14|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#   14|       getBody: [StmtSequence] ...
+#   14|         getStmt: [AddExpr] ... + ...
+#   14|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#   14|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
 #   17|   getStmt: [MethodCall] call to foo
 #   17|     getReceiver: [SelfVariableAccess] self
 #   17|     getBlock: [DoBlock] do ... end
 #   17|       getParameter: [SimpleParameter] x
 #   17|         getDefiningAccess: [LocalVariableAccess] x
-#   18|       getStmt: [AddExpr] ... + ...
-#   18|         getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#   18|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#   18|       getBody: [StmtSequence] ...
+#   18|         getStmt: [AddExpr] ... + ...
+#   18|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#   18|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
 #   22|   getStmt: [MethodCall] call to bar
 #   22|     getReceiver: [IntegerLiteral] 123
 #   22|     getArgument: [StringLiteral] "foo"
@@ -63,15 +66,18 @@ calls/calls.rb:
 #   22|     getBlock: [DoBlock] do ... end
 #   22|       getParameter: [SimpleParameter] x
 #   22|         getDefiningAccess: [LocalVariableAccess] x
-#   23|       getStmt: [AddExpr] ... + ...
-#   23|         getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#   23|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#   23|       getBody: [StmtSequence] ...
+#   23|         getStmt: [AddExpr] ... + ...
+#   23|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#   23|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
 #   27|   getStmt: [Method] method_that_yields
-#   28|     getStmt: [YieldCall] yield ...
+#   28|     getBody: [StmtSequence] ...
+#   28|       getStmt: [YieldCall] yield ...
 #   32|   getStmt: [Method] another_method_that_yields
-#   33|     getStmt: [YieldCall] yield ...
-#   33|       getArgument: [IntegerLiteral] 100
-#   33|       getArgument: [IntegerLiteral] 200
+#   33|     getBody: [StmtSequence] ...
+#   33|       getStmt: [YieldCall] yield ...
+#   33|         getArgument: [IntegerLiteral] 100
+#   33|         getArgument: [IntegerLiteral] 200
 #   43|   getStmt: [MethodCall] call to foo
 #   43|     getReceiver: [SelfVariableAccess] self
 #   44|   getStmt: [MethodCall] call to foo
@@ -148,17 +154,19 @@ calls/calls.rb:
 #   89|   getStmt: [MethodCall] call to foo
 #   89|     getReceiver: [SelfVariableAccess] self
 #   89|     getBlock: [BraceBlock] { ... }
-#   89|       getStmt: [MethodCall] call to bar
-#   89|         getReceiver: [SelfVariableAccess] self
-#   89|       getStmt: [MethodCall] call to baz
-#   89|         getReceiver: [ConstantReadAccess] X
+#   89|       getBody: [StmtSequence] ...
+#   89|         getStmt: [MethodCall] call to bar
+#   89|           getReceiver: [SelfVariableAccess] self
+#   89|         getStmt: [MethodCall] call to baz
+#   89|           getReceiver: [ConstantReadAccess] X
 #   92|   getStmt: [MethodCall] call to foo
 #   92|     getReceiver: [SelfVariableAccess] self
 #   92|     getBlock: [DoBlock] do ... end
-#   93|       getStmt: [MethodCall] call to bar
-#   93|         getReceiver: [SelfVariableAccess] self
-#   94|       getStmt: [MethodCall] call to baz
-#   94|         getReceiver: [ConstantReadAccess] X
+#   93|       getBody: [StmtSequence] ...
+#   93|         getStmt: [MethodCall] call to bar
+#   93|           getReceiver: [SelfVariableAccess] self
+#   94|         getStmt: [MethodCall] call to baz
+#   94|           getReceiver: [ConstantReadAccess] X
 #   98|   getStmt: [MethodCall] call to bar
 #   98|     getReceiver: [MethodCall] call to foo
 #   98|       getReceiver: [SelfVariableAccess] self
@@ -205,17 +213,19 @@ calls/calls.rb:
 #  129|     getStmt: [MethodCall] call to bar
 #  129|       getReceiver: [ConstantReadAccess] X
 #  133|   getStmt: [Method] some_method
-#  134|     getStmt: [MethodCall] call to foo
-#  134|       getReceiver: [SelfVariableAccess] self
-#  135|     getStmt: [MethodCall] call to bar
-#  135|       getReceiver: [ConstantReadAccess] X
+#  134|     getBody: [StmtSequence] ...
+#  134|       getStmt: [MethodCall] call to foo
+#  134|         getReceiver: [SelfVariableAccess] self
+#  135|       getStmt: [MethodCall] call to bar
+#  135|         getReceiver: [ConstantReadAccess] X
 #  139|   getStmt: [SingletonMethod] some_method
 #  139|     getObject: [MethodCall] call to foo
 #  139|       getReceiver: [SelfVariableAccess] self
-#  140|     getStmt: [MethodCall] call to bar
-#  140|       getReceiver: [SelfVariableAccess] self
-#  141|     getStmt: [MethodCall] call to baz
-#  141|       getReceiver: [ConstantReadAccess] X
+#  140|     getBody: [StmtSequence] ...
+#  140|       getStmt: [MethodCall] call to bar
+#  140|         getReceiver: [SelfVariableAccess] self
+#  141|       getStmt: [MethodCall] call to baz
+#  141|         getReceiver: [ConstantReadAccess] X
 #  145|   getStmt: [Method] method_with_keyword_param
 #  145|     getParameter: [KeywordParameter] keyword
 #  145|       getDefiningAccess: [LocalVariableAccess] keyword
@@ -500,56 +510,62 @@ calls/calls.rb:
 #  278|         getReceiver: [ConstantReadAccess] X
 #  283|   getStmt: [ClassDeclaration] MyClass
 #  284|     getStmt: [Method] my_method
-#  285|       getStmt: [SuperCall] super call to my_method
-#  286|       getStmt: [SuperCall] super call to my_method
-#  287|       getStmt: [SuperCall] super call to my_method
-#  287|         getArgument: [StringLiteral] "blah"
-#  287|           getComponent: [StringTextComponent] blah
-#  288|       getStmt: [SuperCall] super call to my_method
-#  288|         getArgument: [IntegerLiteral] 1
-#  288|         getArgument: [IntegerLiteral] 2
-#  288|         getArgument: [IntegerLiteral] 3
-#  289|       getStmt: [SuperCall] super call to my_method
-#  289|         getBlock: [BraceBlock] { ... }
-#  289|           getParameter: [SimpleParameter] x
-#  289|             getDefiningAccess: [LocalVariableAccess] x
-#  289|           getStmt: [AddExpr] ... + ...
-#  289|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#  289|             getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
-#  290|       getStmt: [SuperCall] super call to my_method
-#  290|         getBlock: [DoBlock] do ... end
-#  290|           getParameter: [SimpleParameter] x
-#  290|             getDefiningAccess: [LocalVariableAccess] x
-#  290|           getStmt: [MulExpr] ... * ...
-#  290|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#  290|             getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 2
-#  291|       getStmt: [SuperCall] super call to my_method
-#  291|         getArgument: [IntegerLiteral] 4
-#  291|         getArgument: [IntegerLiteral] 5
-#  291|         getBlock: [BraceBlock] { ... }
-#  291|           getParameter: [SimpleParameter] x
-#  291|             getDefiningAccess: [LocalVariableAccess] x
-#  291|           getStmt: [AddExpr] ... + ...
-#  291|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#  291|             getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 100
-#  292|       getStmt: [SuperCall] super call to my_method
-#  292|         getArgument: [IntegerLiteral] 6
-#  292|         getArgument: [IntegerLiteral] 7
-#  292|         getBlock: [DoBlock] do ... end
-#  292|           getParameter: [SimpleParameter] x
-#  292|             getDefiningAccess: [LocalVariableAccess] x
-#  292|           getStmt: [AddExpr] ... + ...
-#  292|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#  292|             getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 200
+#  285|       getBody: [StmtSequence] ...
+#  285|         getStmt: [SuperCall] super call to my_method
+#  286|         getStmt: [SuperCall] super call to my_method
+#  287|         getStmt: [SuperCall] super call to my_method
+#  287|           getArgument: [StringLiteral] "blah"
+#  287|             getComponent: [StringTextComponent] blah
+#  288|         getStmt: [SuperCall] super call to my_method
+#  288|           getArgument: [IntegerLiteral] 1
+#  288|           getArgument: [IntegerLiteral] 2
+#  288|           getArgument: [IntegerLiteral] 3
+#  289|         getStmt: [SuperCall] super call to my_method
+#  289|           getBlock: [BraceBlock] { ... }
+#  289|             getParameter: [SimpleParameter] x
+#  289|               getDefiningAccess: [LocalVariableAccess] x
+#  289|             getBody: [StmtSequence] ...
+#  289|               getStmt: [AddExpr] ... + ...
+#  289|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#  289|                 getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#  290|         getStmt: [SuperCall] super call to my_method
+#  290|           getBlock: [DoBlock] do ... end
+#  290|             getParameter: [SimpleParameter] x
+#  290|               getDefiningAccess: [LocalVariableAccess] x
+#  290|             getBody: [StmtSequence] ...
+#  290|               getStmt: [MulExpr] ... * ...
+#  290|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#  290|                 getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 2
+#  291|         getStmt: [SuperCall] super call to my_method
+#  291|           getArgument: [IntegerLiteral] 4
+#  291|           getArgument: [IntegerLiteral] 5
+#  291|           getBlock: [BraceBlock] { ... }
+#  291|             getParameter: [SimpleParameter] x
+#  291|               getDefiningAccess: [LocalVariableAccess] x
+#  291|             getBody: [StmtSequence] ...
+#  291|               getStmt: [AddExpr] ... + ...
+#  291|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#  291|                 getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 100
+#  292|         getStmt: [SuperCall] super call to my_method
+#  292|           getArgument: [IntegerLiteral] 6
+#  292|           getArgument: [IntegerLiteral] 7
+#  292|           getBlock: [DoBlock] do ... end
+#  292|             getParameter: [SimpleParameter] x
+#  292|               getDefiningAccess: [LocalVariableAccess] x
+#  292|             getBody: [StmtSequence] ...
+#  292|               getStmt: [AddExpr] ... + ...
+#  292|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#  292|                 getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 200
 #  300|   getStmt: [ClassDeclaration] AnotherClass
 #  301|     getStmt: [Method] another_method
-#  302|       getStmt: [MethodCall] call to super
-#  302|         getReceiver: [MethodCall] call to foo
-#  302|           getReceiver: [SelfVariableAccess] self
-#  303|       getStmt: [MethodCall] call to super
-#  303|         getReceiver: [SelfVariableAccess] self
-#  304|       getStmt: [MethodCall] call to super
-#  304|         getReceiver: [SuperCall] super call to another_method
+#  302|       getBody: [StmtSequence] ...
+#  302|         getStmt: [MethodCall] call to super
+#  302|           getReceiver: [MethodCall] call to foo
+#  302|             getReceiver: [SelfVariableAccess] self
+#  303|         getStmt: [MethodCall] call to super
+#  303|           getReceiver: [SelfVariableAccess] self
+#  304|         getStmt: [MethodCall] call to super
+#  304|           getReceiver: [SuperCall] super call to another_method
 #  309|   getStmt: [MethodCall] call to call
 #  309|     getReceiver: [MethodCall] call to foo
 #  309|       getReceiver: [SelfVariableAccess] self
@@ -619,49 +635,57 @@ calls/calls.rb:
 #  319|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
 #  319|     getAnOperand/getRightOperand: [IntegerLiteral] 2
 #  322|   getStmt: [Method] foo
-#  322|     getStmt: [MethodCall] call to bar
-#  322|       getReceiver: [SelfVariableAccess] self
+#  322|     getBody: [StmtSequence] ...
+#  322|       getStmt: [MethodCall] call to bar
+#  322|         getReceiver: [SelfVariableAccess] self
 #  323|   getStmt: [Method] foo
-#  323|     getStmt: [MethodCall] call to bar
-#  323|       getReceiver: [SelfVariableAccess] self
+#  323|     getBody: [StmtSequence] ...
+#  323|       getStmt: [MethodCall] call to bar
+#  323|         getReceiver: [SelfVariableAccess] self
 #  324|   getStmt: [Method] foo
+#  324|     getBody: [StmtSequence] ...
+#  324|       getStmt: [MethodCall] call to bar
+#  324|         getReceiver: [SelfVariableAccess] self
 #  324|     getParameter: [SimpleParameter] x
 #  324|       getDefiningAccess: [LocalVariableAccess] x
-#  324|     getStmt: [MethodCall] call to bar
-#  324|       getReceiver: [SelfVariableAccess] self
 #  325|   getStmt: [SingletonMethod] foo
+#  325|     getBody: [StmtSequence] ...
+#  325|       getStmt: [MethodCall] call to bar
+#  325|         getReceiver: [SelfVariableAccess] self
 #  325|     getObject: [ConstantReadAccess] Object
-#  325|     getStmt: [MethodCall] call to bar
-#  325|       getReceiver: [SelfVariableAccess] self
 #  326|   getStmt: [SingletonMethod] foo
+#  326|     getBody: [StmtSequence] ...
+#  326|       getStmt: [MethodCall] call to bar
+#  326|         getReceiver: [SelfVariableAccess] self
 #  326|     getObject: [ConstantReadAccess] Object
 #  326|     getParameter: [SimpleParameter] x
 #  326|       getDefiningAccess: [LocalVariableAccess] x
-#  326|     getStmt: [MethodCall] call to bar
-#  326|       getReceiver: [SelfVariableAccess] self
 #  327|   getStmt: [Method] foo
-#  327|     getStmt: [RescueModifierExpr] ... rescue ...
-#  327|       getBody: [MethodCall] call to bar
-#  327|         getReceiver: [SelfVariableAccess] self
-#  327|       getHandler: [ParenthesizedExpr] ( ... )
-#  327|         getStmt: [MethodCall] call to print
+#  327|     getBody: [StmtSequence] ...
+#  327|       getStmt: [RescueModifierExpr] ... rescue ...
+#  327|         getBody: [MethodCall] call to bar
 #  327|           getReceiver: [SelfVariableAccess] self
-#  327|           getArgument: [StringLiteral] "error"
-#  327|             getComponent: [StringTextComponent] error
+#  327|         getHandler: [ParenthesizedExpr] ( ... )
+#  327|           getStmt: [MethodCall] call to print
+#  327|             getReceiver: [SelfVariableAccess] self
+#  327|             getArgument: [StringLiteral] "error"
+#  327|               getComponent: [StringTextComponent] error
 #  330|   getStmt: [Method] foo
 #  330|     getParameter: [ForwardParameter] ...
-#  331|     getStmt: [SuperCall] super call to foo
-#  331|       getArgument: [ForwardedArguments] ...
+#  331|     getBody: [StmtSequence] ...
+#  331|       getStmt: [SuperCall] super call to foo
+#  331|         getArgument: [ForwardedArguments] ...
 #  334|   getStmt: [Method] foo
 #  334|     getParameter: [SimpleParameter] a
 #  334|       getDefiningAccess: [LocalVariableAccess] a
 #  334|     getParameter: [SimpleParameter] b
 #  334|       getDefiningAccess: [LocalVariableAccess] b
 #  334|     getParameter: [ForwardParameter] ...
-#  335|     getStmt: [MethodCall] call to bar
-#  335|       getReceiver: [SelfVariableAccess] self
-#  335|       getArgument: [LocalVariableAccess] b
-#  335|       getArgument: [ForwardedArguments] ...
+#  335|     getBody: [StmtSequence] ...
+#  335|       getStmt: [MethodCall] call to bar
+#  335|         getReceiver: [SelfVariableAccess] self
+#  335|         getArgument: [LocalVariableAccess] b
+#  335|         getArgument: [ForwardedArguments] ...
 #  339|   getStmt: [ForExpr] for ... in ...
 #  339|     getPattern: [DestructuredLhsExpr] (..., ...)
 #  339|       getElement: [LocalVariableAccess] x
@@ -718,31 +742,35 @@ calls/calls.rb:
 #  350|     getAnOperand/getRightOperand: [Lambda] -> { ... }
 #  350|       getParameter: [SimpleParameter] x
 #  350|         getDefiningAccess: [LocalVariableAccess] x
-#  350|       getStmt: [LocalVariableAccess] y
+#  350|       getBody: [StmtSequence] ...
+#  350|         getStmt: [LocalVariableAccess] y
 #  351|   getStmt: [AssignExpr] ... = ...
 #  351|     getAnOperand/getLeftOperand: [LocalVariableAccess] f
 #  351|     getAnOperand/getRightOperand: [Lambda] -> { ... }
 #  351|       getParameter: [SimpleParameter] x
 #  351|         getDefiningAccess: [LocalVariableAccess] x
-#  351|       getStmt: [MethodCall] call to foo
-#  351|         getReceiver: [SelfVariableAccess] self
-#  351|         getArgument: [LocalVariableAccess] x
+#  351|       getBody: [StmtSequence] ...
+#  351|         getStmt: [MethodCall] call to foo
+#  351|           getReceiver: [SelfVariableAccess] self
+#  351|           getArgument: [LocalVariableAccess] x
 #  352|   getStmt: [AssignExpr] ... = ...
 #  352|     getAnOperand/getLeftOperand: [LocalVariableAccess] g
 #  352|     getAnOperand/getRightOperand: [Lambda] -> { ... }
 #  352|       getParameter: [SimpleParameter] x
 #  352|         getDefiningAccess: [LocalVariableAccess] x
-#  352|       getStmt: [MethodCall] call to unknown_call
-#  352|         getReceiver: [SelfVariableAccess] self
+#  352|       getBody: [StmtSequence] ...
+#  352|         getStmt: [MethodCall] call to unknown_call
+#  352|           getReceiver: [SelfVariableAccess] self
 #  353|   getStmt: [AssignExpr] ... = ...
 #  353|     getAnOperand/getLeftOperand: [LocalVariableAccess] h
 #  353|     getAnOperand/getRightOperand: [Lambda] -> { ... }
 #  353|       getParameter: [SimpleParameter] x
 #  353|         getDefiningAccess: [LocalVariableAccess] x
-#  354|       getStmt: [LocalVariableAccess] x
-#  355|       getStmt: [LocalVariableAccess] y
-#  356|       getStmt: [MethodCall] call to unknown_call
-#  356|         getReceiver: [SelfVariableAccess] self
+#  354|       getBody: [StmtSequence] ...
+#  354|         getStmt: [LocalVariableAccess] x
+#  355|         getStmt: [LocalVariableAccess] y
+#  356|         getStmt: [MethodCall] call to unknown_call
+#  356|           getReceiver: [SelfVariableAccess] self
 #  360|   getStmt: [MethodCall] call to empty?
 #  360|     getReceiver: [MethodCall] call to list
 #  360|       getReceiver: [SelfVariableAccess] self
@@ -760,7 +788,8 @@ calls/calls.rb:
 #  363|     getBlock: [BraceBlock] { ... }
 #  363|       getParameter: [SimpleParameter] x
 #  363|         getDefiningAccess: [LocalVariableAccess] x
-#  363|       getStmt: [LocalVariableAccess] x
+#  363|       getBody: [StmtSequence] ...
+#  363|         getStmt: [LocalVariableAccess] x
 control/cases.rb:
 #    1| [Toplevel] cases.rb
 #    2|   getStmt: [AssignExpr] ... = ...
@@ -1094,9 +1123,10 @@ control/cases.rb:
 #  101|       getPattern: [Lambda] -> { ... }
 #  101|         getParameter: [SimpleParameter] x
 #  101|           getDefiningAccess: [LocalVariableAccess] x
-#  101|         getStmt: [EqExpr] ... == ...
-#  101|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#  101|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 10
+#  101|         getBody: [StmtSequence] ...
+#  101|           getStmt: [EqExpr] ... == ...
+#  101|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#  101|             getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 10
 #  102|     getBranch: [InClause] in ... then ...
 #  102|       getPattern: [SymbolLiteral] :foo
 #  102|         getComponent: [StringTextComponent] foo
@@ -1301,15 +1331,17 @@ modules/classes.rb:
 #   16|     getScopeExpr: [ConstantReadAccess] MyModule
 #   20|   getStmt: [ClassDeclaration] Wibble
 #   21|     getStmt: [Method] method_a
-#   22|       getStmt: [MethodCall] call to puts
-#   22|         getReceiver: [SelfVariableAccess] self
-#   22|         getArgument: [StringLiteral] "a"
-#   22|           getComponent: [StringTextComponent] a
+#   22|       getBody: [StmtSequence] ...
+#   22|         getStmt: [MethodCall] call to puts
+#   22|           getReceiver: [SelfVariableAccess] self
+#   22|           getArgument: [StringLiteral] "a"
+#   22|             getComponent: [StringTextComponent] a
 #   25|     getStmt: [Method] method_b
-#   26|       getStmt: [MethodCall] call to puts
-#   26|         getReceiver: [SelfVariableAccess] self
-#   26|         getArgument: [StringLiteral] "b"
-#   26|           getComponent: [StringTextComponent] b
+#   26|       getBody: [StmtSequence] ...
+#   26|         getStmt: [MethodCall] call to puts
+#   26|           getReceiver: [SelfVariableAccess] self
+#   26|           getArgument: [StringLiteral] "b"
+#   26|             getComponent: [StringTextComponent] b
 #   29|     getStmt: [MethodCall] call to some_method_call
 #   29|       getReceiver: [SelfVariableAccess] self
 #   30|     getStmt: [AssignExpr] ... = ...
@@ -1324,14 +1356,16 @@ modules/classes.rb:
 #   41|   getStmt: [SingletonClass] class << ...
 #   41|     getValue: [LocalVariableAccess] x
 #   42|     getStmt: [Method] length
-#   43|       getStmt: [MulExpr] ... * ...
-#   43|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 100
-#   43|         getAnOperand/getArgument/getRightOperand: [SuperCall] super call to length
+#   43|       getBody: [StmtSequence] ...
+#   43|         getStmt: [MulExpr] ... * ...
+#   43|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 100
+#   43|           getAnOperand/getArgument/getRightOperand: [SuperCall] super call to length
 #   46|     getStmt: [Method] wibble
-#   47|       getStmt: [MethodCall] call to puts
-#   47|         getReceiver: [SelfVariableAccess] self
-#   47|         getArgument: [StringLiteral] "wibble"
-#   47|           getComponent: [StringTextComponent] wibble
+#   47|       getBody: [StmtSequence] ...
+#   47|         getStmt: [MethodCall] call to puts
+#   47|           getReceiver: [SelfVariableAccess] self
+#   47|           getArgument: [StringLiteral] "wibble"
+#   47|             getComponent: [StringTextComponent] wibble
 #   50|     getStmt: [MethodCall] call to another_method_call
 #   50|       getReceiver: [SelfVariableAccess] self
 #   51|     getStmt: [AssignExpr] ... = ...
@@ -1533,32 +1567,34 @@ constants/constants.rb:
 #   17|       getAnOperand/getArgument/getRightOperand: [ConstantReadAccess] CONST_B
 #   17|         getScopeExpr: [ConstantReadAccess] ModuleA
 #   19|   getStmt: [Method] foo
-#   20|     getStmt: [AssignExpr] ... = ...
-#   20|       getAnOperand/getLeftOperand: [ConstantAssignment] Names
-#   20|       getAnOperand/getRightOperand: [ArrayLiteral] [...]
-#   20|         getElement: [StringLiteral] "Vera"
-#   20|           getComponent: [StringTextComponent] Vera
-#   20|         getElement: [StringLiteral] "Chuck"
-#   20|           getComponent: [StringTextComponent] Chuck
-#   20|         getElement: [StringLiteral] "Dave"
-#   20|           getComponent: [StringTextComponent] Dave
-#   22|     getStmt: [MethodCall] call to each
-#   22|       getReceiver: [ConstantReadAccess] Names
-#   22|       getBlock: [DoBlock] do ... end
-#   22|         getParameter: [SimpleParameter] name
-#   22|           getDefiningAccess: [LocalVariableAccess] name
-#   23|         getStmt: [MethodCall] call to puts
-#   23|           getReceiver: [SelfVariableAccess] self
-#   23|           getArgument: [StringLiteral] "#{...} #{...}"
-#   23|             getComponent: [StringInterpolationComponent] #{...}
-#   23|               getStmt: [ConstantReadAccess] GREETING
-#   23|             getComponent: [StringTextComponent]  
-#   23|             getComponent: [StringInterpolationComponent] #{...}
-#   23|               getStmt: [LocalVariableAccess] name
-#   28|     getStmt: [MethodCall] call to Array
-#   28|       getReceiver: [SelfVariableAccess] self
-#   28|       getArgument: [StringLiteral] "foo"
-#   28|         getComponent: [StringTextComponent] foo
+#   20|     getBody: [StmtSequence] ...
+#   20|       getStmt: [AssignExpr] ... = ...
+#   20|         getAnOperand/getLeftOperand: [ConstantAssignment] Names
+#   20|         getAnOperand/getRightOperand: [ArrayLiteral] [...]
+#   20|           getElement: [StringLiteral] "Vera"
+#   20|             getComponent: [StringTextComponent] Vera
+#   20|           getElement: [StringLiteral] "Chuck"
+#   20|             getComponent: [StringTextComponent] Chuck
+#   20|           getElement: [StringLiteral] "Dave"
+#   20|             getComponent: [StringTextComponent] Dave
+#   22|       getStmt: [MethodCall] call to each
+#   22|         getReceiver: [ConstantReadAccess] Names
+#   22|         getBlock: [DoBlock] do ... end
+#   22|           getParameter: [SimpleParameter] name
+#   22|             getDefiningAccess: [LocalVariableAccess] name
+#   23|           getBody: [StmtSequence] ...
+#   23|             getStmt: [MethodCall] call to puts
+#   23|               getReceiver: [SelfVariableAccess] self
+#   23|               getArgument: [StringLiteral] "#{...} #{...}"
+#   23|                 getComponent: [StringInterpolationComponent] #{...}
+#   23|                   getStmt: [ConstantReadAccess] GREETING
+#   23|                 getComponent: [StringTextComponent]  
+#   23|                 getComponent: [StringInterpolationComponent] #{...}
+#   23|                   getStmt: [LocalVariableAccess] name
+#   28|       getStmt: [MethodCall] call to Array
+#   28|         getReceiver: [SelfVariableAccess] self
+#   28|         getArgument: [StringLiteral] "foo"
+#   28|           getComponent: [StringTextComponent] foo
 #   31|   getStmt: [ClassDeclaration] ClassD
 #   31|     getScopeExpr: [ConstantReadAccess] ModuleA
 #   31|     getSuperclassExpr: [ConstantReadAccess] ClassA
@@ -2309,14 +2345,15 @@ literals/literals.rb:
 #  171|       getComponent: [StringTextComponent] 
 #  171|       
 #  174|   getStmt: [Method] m
-#  175|     getStmt: [AssignExpr] ... = ...
-#  175|       getAnOperand/getLeftOperand: [LocalVariableAccess] query
-#  175|       getAnOperand/getRightOperand: [HereDoc] <<-BLA
-#  175|         getComponent: [StringTextComponent] 
-#  175|         some text
-#  176|         getComponent: [StringEscapeSequenceComponent] \n
-#  176|         getComponent: [StringTextComponent] and some more
-#  176|           
+#  175|     getBody: [StmtSequence] ...
+#  175|       getStmt: [AssignExpr] ... = ...
+#  175|         getAnOperand/getLeftOperand: [LocalVariableAccess] query
+#  175|         getAnOperand/getRightOperand: [HereDoc] <<-BLA
+#  175|           getComponent: [StringTextComponent] 
+#  175|           some text
+#  176|           getComponent: [StringEscapeSequenceComponent] \n
+#  176|           getComponent: [StringTextComponent] and some more
+#  176|             
 #  180|   getStmt: [AssignExpr] ... = ...
 #  180|     getAnOperand/getLeftOperand: [LocalVariableAccess] query
 #  180|     getAnOperand/getRightOperand: [HereDoc] <<~SQUIGGLY
@@ -2648,9 +2685,10 @@ modules/modules.rb:
 #   90|     getStmt: [MethodCall] call to module_eval
 #   90|       getReceiver: [ConstantReadAccess] Object
 #   90|       getBlock: [BraceBlock] { ... }
-#   90|         getStmt: [MethodCall] call to prepend
-#   90|           getReceiver: [SelfVariableAccess] self
-#   90|           getArgument: [ConstantReadAccess] Other
+#   90|         getBody: [StmtSequence] ...
+#   90|           getStmt: [MethodCall] call to prepend
+#   90|             getReceiver: [SelfVariableAccess] self
+#   90|             getArgument: [ConstantReadAccess] Other
 #   91|     getStmt: [ModuleDeclaration] Y
 #   91|       getScopeExpr: [ConstantReadAccess] Foo1
 #   95|   getStmt: [ModuleDeclaration] IncludeTest2
@@ -2745,26 +2783,27 @@ operations/operations.rb:
 #   28|   getStmt: [DefinedExpr] defined? ...
 #   28|     getAnOperand/getOperand/getReceiver: [LocalVariableAccess] foo
 #   29|   getStmt: [Method] foo
-#   29|     getStmt: [ReturnStmt] return
-#   29|       getValue: [ArgumentList] ..., ...
-#   29|         getElement: [IntegerLiteral] 1
-#   29|         getElement: [SplatExpr] * ...
-#   29|           getAnOperand/getOperand/getReceiver: [ArrayLiteral] [...]
-#   29|             getElement: [IntegerLiteral] 2
-#   29|         getElement: [Pair] Pair
-#   29|           getKey: [SymbolLiteral] :a
-#   29|             getComponent: [StringTextComponent] a
-#   29|           getValue: [IntegerLiteral] 3
-#   29|         getElement: [HashSplatExpr] ** ...
-#   29|           getAnOperand/getOperand/getReceiver: [HashLiteral] {...}
-#   29|             getElement: [Pair] Pair
-#   29|               getKey: [SymbolLiteral] :b
-#   29|                 getComponent: [StringTextComponent] b
-#   29|               getValue: [IntegerLiteral] 4
-#   29|             getElement: [Pair] Pair
-#   29|               getKey: [SymbolLiteral] :c
-#   29|                 getComponent: [StringTextComponent] c
-#   29|               getValue: [IntegerLiteral] 5
+#   29|     getBody: [StmtSequence] ...
+#   29|       getStmt: [ReturnStmt] return
+#   29|         getValue: [ArgumentList] ..., ...
+#   29|           getElement: [IntegerLiteral] 1
+#   29|           getElement: [SplatExpr] * ...
+#   29|             getAnOperand/getOperand/getReceiver: [ArrayLiteral] [...]
+#   29|               getElement: [IntegerLiteral] 2
+#   29|           getElement: [Pair] Pair
+#   29|             getKey: [SymbolLiteral] :a
+#   29|               getComponent: [StringTextComponent] a
+#   29|             getValue: [IntegerLiteral] 3
+#   29|           getElement: [HashSplatExpr] ** ...
+#   29|             getAnOperand/getOperand/getReceiver: [HashLiteral] {...}
+#   29|               getElement: [Pair] Pair
+#   29|                 getKey: [SymbolLiteral] :b
+#   29|                   getComponent: [StringTextComponent] b
+#   29|                 getValue: [IntegerLiteral] 4
+#   29|               getElement: [Pair] Pair
+#   29|                 getKey: [SymbolLiteral] :c
+#   29|                   getComponent: [StringTextComponent] c
+#   29|                 getValue: [IntegerLiteral] 5
 #   32|   getStmt: [AddExpr] ... + ...
 #   32|     getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] w
 #   32|     getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 234
@@ -2899,10 +2938,11 @@ operations/operations.rb:
 #   95|       getDefiningAccess: [LocalVariableAccess] a
 #   95|     getParameter: [SimpleParameter] b
 #   95|       getDefiningAccess: [LocalVariableAccess] b
-#   96|     getStmt: [ReturnStmt] return
-#   96|       getValue: [LogicalAndExpr] ... && ...
-#   96|         getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] a
-#   97|         getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] b
+#   96|     getBody: [StmtSequence] ...
+#   96|       getStmt: [ReturnStmt] return
+#   96|         getValue: [LogicalAndExpr] ... && ...
+#   96|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] a
+#   97|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] b
 #  107|   getStmt: [ClassDeclaration] X
 #  108|     getStmt: [AssignExpr] ... = ...
 #  108|       getAnOperand/getLeftOperand: [InstanceVariableAccess] @x
@@ -2979,14 +3019,15 @@ params/params.rb:
 #    9|         getDefiningAccess: [LocalVariableAccess] key
 #    9|       getParameter: [SimpleParameter] value
 #    9|         getDefiningAccess: [LocalVariableAccess] value
-#   10|       getStmt: [MethodCall] call to puts
-#   10|         getReceiver: [SelfVariableAccess] self
-#   10|         getArgument: [StringLiteral] "#{...} -> #{...}"
-#   10|           getComponent: [StringInterpolationComponent] #{...}
-#   10|             getStmt: [LocalVariableAccess] key
-#   10|           getComponent: [StringTextComponent]  -> 
-#   10|           getComponent: [StringInterpolationComponent] #{...}
-#   10|             getStmt: [LocalVariableAccess] value
+#   10|       getBody: [StmtSequence] ...
+#   10|         getStmt: [MethodCall] call to puts
+#   10|           getReceiver: [SelfVariableAccess] self
+#   10|           getArgument: [StringLiteral] "#{...} -> #{...}"
+#   10|             getComponent: [StringInterpolationComponent] #{...}
+#   10|               getStmt: [LocalVariableAccess] key
+#   10|             getComponent: [StringTextComponent]  -> 
+#   10|             getComponent: [StringInterpolationComponent] #{...}
+#   10|               getStmt: [LocalVariableAccess] value
 #   14|   getStmt: [AssignExpr] ... = ...
 #   14|     getAnOperand/getLeftOperand: [LocalVariableAccess] sum
 #   14|     getAnOperand/getRightOperand: [Lambda] -> { ... }
@@ -2994,9 +3035,10 @@ params/params.rb:
 #   14|         getDefiningAccess: [LocalVariableAccess] foo
 #   14|       getParameter: [SimpleParameter] bar
 #   14|         getDefiningAccess: [LocalVariableAccess] bar
-#   14|       getStmt: [AddExpr] ... + ...
-#   14|         getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] foo
-#   14|         getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] bar
+#   14|       getBody: [StmtSequence] ...
+#   14|         getStmt: [AddExpr] ... + ...
+#   14|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] foo
+#   14|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] bar
 #   17|   getStmt: [Method] destructured_method_param
 #   17|     getParameter: [DestructuredParameter] (..., ...)
 #   17|       getElement: [LocalVariableAccess] a
@@ -3011,11 +3053,12 @@ params/params.rb:
 #   22|       getParameter: [DestructuredParameter] (..., ...)
 #   22|         getElement: [LocalVariableAccess] a
 #   22|         getElement: [LocalVariableAccess] b
-#   22|       getStmt: [MethodCall] call to puts
-#   22|         getReceiver: [SelfVariableAccess] self
-#   22|         getArgument: [AddExpr] ... + ...
-#   22|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] a
-#   22|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] b
+#   22|       getBody: [StmtSequence] ...
+#   22|         getStmt: [MethodCall] call to puts
+#   22|           getReceiver: [SelfVariableAccess] self
+#   22|           getArgument: [AddExpr] ... + ...
+#   22|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] a
+#   22|             getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] b
 #   25|   getStmt: [AssignExpr] ... = ...
 #   25|     getAnOperand/getLeftOperand: [LocalVariableAccess] sum_four_values
 #   25|     getAnOperand/getRightOperand: [Lambda] -> { ... }
@@ -3025,13 +3068,14 @@ params/params.rb:
 #   25|       getParameter: [DestructuredParameter] (..., ...)
 #   25|         getElement: [LocalVariableAccess] third
 #   25|         getElement: [LocalVariableAccess] fourth
-#   26|       getStmt: [AddExpr] ... + ...
-#   26|         getAnOperand/getLeftOperand/getReceiver: [AddExpr] ... + ...
+#   26|       getBody: [StmtSequence] ...
+#   26|         getStmt: [AddExpr] ... + ...
 #   26|           getAnOperand/getLeftOperand/getReceiver: [AddExpr] ... + ...
-#   26|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] first
-#   26|             getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] second
-#   26|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] third
-#   26|         getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] fourth
+#   26|             getAnOperand/getLeftOperand/getReceiver: [AddExpr] ... + ...
+#   26|               getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] first
+#   26|               getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] second
+#   26|             getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] third
+#   26|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] fourth
 #   30|   getStmt: [Method] method_with_splat
 #   30|     getParameter: [SimpleParameter] wibble
 #   30|       getDefiningAccess: [LocalVariableAccess] wibble
@@ -3065,26 +3109,28 @@ params/params.rb:
 #   41|     getParameter: [KeywordParameter] bar
 #   41|       getDefiningAccess: [LocalVariableAccess] bar
 #   41|       getDefaultValue: [IntegerLiteral] 7
-#   42|     getStmt: [AddExpr] ... + ...
-#   42|       getAnOperand/getLeftOperand/getReceiver: [AddExpr] ... + ...
-#   42|         getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#   42|         getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] foo
-#   42|       getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] bar
+#   42|     getBody: [StmtSequence] ...
+#   42|       getStmt: [AddExpr] ... + ...
+#   42|         getAnOperand/getLeftOperand/getReceiver: [AddExpr] ... + ...
+#   42|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#   42|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] foo
+#   42|         getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] bar
 #   46|   getStmt: [Method] use_block_with_keyword
 #   46|     getParameter: [BlockParameter] &block
 #   46|       getDefiningAccess: [LocalVariableAccess] block
-#   47|     getStmt: [MethodCall] call to puts
-#   47|       getReceiver: [SelfVariableAccess] self
-#   47|       getArgument: [MethodCall] call to call
-#   47|         getReceiver: [LocalVariableAccess] block
-#   47|         getArgument: [Pair] Pair
-#   47|           getKey: [SymbolLiteral] :bar
-#   47|             getComponent: [StringTextComponent] bar
-#   47|           getValue: [IntegerLiteral] 2
-#   47|         getArgument: [Pair] Pair
-#   47|           getKey: [SymbolLiteral] :foo
-#   47|             getComponent: [StringTextComponent] foo
-#   47|           getValue: [IntegerLiteral] 3
+#   47|     getBody: [StmtSequence] ...
+#   47|       getStmt: [MethodCall] call to puts
+#   47|         getReceiver: [SelfVariableAccess] self
+#   47|         getArgument: [MethodCall] call to call
+#   47|           getReceiver: [LocalVariableAccess] block
+#   47|           getArgument: [Pair] Pair
+#   47|             getKey: [SymbolLiteral] :bar
+#   47|               getComponent: [StringTextComponent] bar
+#   47|             getValue: [IntegerLiteral] 2
+#   47|           getArgument: [Pair] Pair
+#   47|             getKey: [SymbolLiteral] :foo
+#   47|               getComponent: [StringTextComponent] foo
+#   47|             getValue: [IntegerLiteral] 3
 #   49|   getStmt: [MethodCall] call to use_block_with_keyword
 #   49|     getReceiver: [SelfVariableAccess] self
 #   49|     getBlock: [DoBlock] do ... end
@@ -3093,9 +3139,10 @@ params/params.rb:
 #   49|       getParameter: [KeywordParameter] yy
 #   49|         getDefiningAccess: [LocalVariableAccess] yy
 #   49|         getDefaultValue: [IntegerLiteral] 100
-#   50|       getStmt: [AddExpr] ... + ...
-#   50|         getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] xx
-#   50|         getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] yy
+#   50|       getBody: [StmtSequence] ...
+#   50|         getStmt: [AddExpr] ... + ...
+#   50|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] xx
+#   50|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] yy
 #   53|   getStmt: [AssignExpr] ... = ...
 #   53|     getAnOperand/getLeftOperand: [LocalVariableAccess] lambda_with_keyword_params
 #   53|     getAnOperand/getRightOperand: [Lambda] -> { ... }
@@ -3106,11 +3153,12 @@ params/params.rb:
 #   53|       getParameter: [KeywordParameter] z
 #   53|         getDefiningAccess: [LocalVariableAccess] z
 #   53|         getDefaultValue: [IntegerLiteral] 3
-#   54|       getStmt: [AddExpr] ... + ...
-#   54|         getAnOperand/getLeftOperand/getReceiver: [AddExpr] ... + ...
-#   54|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#   54|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] y
-#   54|         getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] z
+#   54|       getBody: [StmtSequence] ...
+#   54|         getStmt: [AddExpr] ... + ...
+#   54|           getAnOperand/getLeftOperand/getReceiver: [AddExpr] ... + ...
+#   54|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#   54|             getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] y
+#   54|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] z
 #   58|   getStmt: [Method] method_with_optional_params
 #   58|     getParameter: [SimpleParameter] val1
 #   58|       getDefiningAccess: [LocalVariableAccess] val1
@@ -3123,10 +3171,11 @@ params/params.rb:
 #   62|   getStmt: [Method] use_block_with_optional
 #   62|     getParameter: [BlockParameter] &block
 #   62|       getDefiningAccess: [LocalVariableAccess] block
-#   63|     getStmt: [MethodCall] call to call
-#   63|       getReceiver: [LocalVariableAccess] block
-#   63|       getArgument: [StringLiteral] "Zeus"
-#   63|         getComponent: [StringTextComponent] Zeus
+#   63|     getBody: [StmtSequence] ...
+#   63|       getStmt: [MethodCall] call to call
+#   63|         getReceiver: [LocalVariableAccess] block
+#   63|         getArgument: [StringLiteral] "Zeus"
+#   63|           getComponent: [StringTextComponent] Zeus
 #   65|   getStmt: [MethodCall] call to use_block_with_optional
 #   65|     getReceiver: [SelfVariableAccess] self
 #   65|     getBlock: [DoBlock] do ... end
@@ -3135,15 +3184,16 @@ params/params.rb:
 #   65|       getParameter: [OptionalParameter] age
 #   65|         getDefiningAccess: [LocalVariableAccess] age
 #   65|         getDefaultValue: [IntegerLiteral] 99
-#   66|       getStmt: [MethodCall] call to puts
-#   66|         getReceiver: [SelfVariableAccess] self
-#   66|         getArgument: [StringLiteral] "#{...} is #{...} years old"
-#   66|           getComponent: [StringInterpolationComponent] #{...}
-#   66|             getStmt: [LocalVariableAccess] name
-#   66|           getComponent: [StringTextComponent]  is 
-#   66|           getComponent: [StringInterpolationComponent] #{...}
-#   66|             getStmt: [LocalVariableAccess] age
-#   66|           getComponent: [StringTextComponent]  years old
+#   66|       getBody: [StmtSequence] ...
+#   66|         getStmt: [MethodCall] call to puts
+#   66|           getReceiver: [SelfVariableAccess] self
+#   66|           getArgument: [StringLiteral] "#{...} is #{...} years old"
+#   66|             getComponent: [StringInterpolationComponent] #{...}
+#   66|               getStmt: [LocalVariableAccess] name
+#   66|             getComponent: [StringTextComponent]  is 
+#   66|             getComponent: [StringInterpolationComponent] #{...}
+#   66|               getStmt: [LocalVariableAccess] age
+#   66|             getComponent: [StringTextComponent]  years old
 #   70|   getStmt: [AssignExpr] ... = ...
 #   70|     getAnOperand/getLeftOperand: [LocalVariableAccess] lambda_with_optional_params
 #   70|     getAnOperand/getRightOperand: [Lambda] -> { ... }
@@ -3155,11 +3205,12 @@ params/params.rb:
 #   70|       getParameter: [OptionalParameter] c
 #   70|         getDefiningAccess: [LocalVariableAccess] c
 #   70|         getDefaultValue: [IntegerLiteral] 20
-#   70|       getStmt: [AddExpr] ... + ...
-#   70|         getAnOperand/getLeftOperand/getReceiver: [AddExpr] ... + ...
-#   70|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] a
-#   70|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] b
-#   70|         getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] c
+#   70|       getBody: [StmtSequence] ...
+#   70|         getStmt: [AddExpr] ... + ...
+#   70|           getAnOperand/getLeftOperand/getReceiver: [AddExpr] ... + ...
+#   70|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] a
+#   70|             getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] b
+#   70|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] c
 #   73|   getStmt: [Method] method_with_nil_splat
 #   73|     getParameter: [SimpleParameter] wibble
 #   73|       getDefiningAccess: [LocalVariableAccess] wibble
@@ -3175,14 +3226,15 @@ params/params.rb:
 #   81|       getDefiningAccess: [LocalVariableAccess] array
 #   81|     getParameter: [BlockParameter] &
 #   81|       getDefiningAccess: [LocalVariableAccess] __synth__0
-#   82|     getStmt: [MethodCall] call to proc
-#   82|       getReceiver: [SelfVariableAccess] self
-#   82|       getArgument: [BlockArgument] &...
-#   82|         getValue: [LocalVariableAccess] __synth__0
-#   83|     getStmt: [MethodCall] call to each
-#   83|       getReceiver: [LocalVariableAccess] array
-#   83|       getArgument: [BlockArgument] &...
-#   83|         getValue: [LocalVariableAccess] __synth__0
+#   82|     getBody: [StmtSequence] ...
+#   82|       getStmt: [MethodCall] call to proc
+#   82|         getReceiver: [SelfVariableAccess] self
+#   82|         getArgument: [BlockArgument] &...
+#   82|           getValue: [LocalVariableAccess] __synth__0
+#   83|       getStmt: [MethodCall] call to each
+#   83|         getReceiver: [LocalVariableAccess] array
+#   83|         getArgument: [BlockArgument] &...
+#   83|           getValue: [LocalVariableAccess] __synth__0
 #   86|   getStmt: [MethodCall] call to run_block
 #   86|     getReceiver: [SelfVariableAccess] self
 #   86|     getBlock: [BraceBlock] { ... }
@@ -3190,27 +3242,30 @@ params/params.rb:
 #   86|         getDefiningAccess: [LocalVariableAccess] x
 #   86|       getLocalVariable: [LocalVariableAccess] y
 #   86|       getLocalVariable: [LocalVariableAccess] z
-#   86|       getStmt: [MethodCall] call to puts
-#   86|         getReceiver: [SelfVariableAccess] self
-#   86|         getArgument: [LocalVariableAccess] x
+#   86|       getBody: [StmtSequence] ...
+#   86|         getStmt: [MethodCall] call to puts
+#   86|           getReceiver: [SelfVariableAccess] self
+#   86|           getArgument: [LocalVariableAccess] x
 #   89|   getStmt: [Method] anonymous_splat_parameter
 #   89|     getParameter: [SimpleParameter] array
 #   89|       getDefiningAccess: [LocalVariableAccess] array
 #   89|     getParameter: [SplatParameter] *
 #   89|       getDefiningAccess: [LocalVariableAccess] __synth__0
-#   90|     getStmt: [MethodCall] call to concat
-#   90|       getReceiver: [LocalVariableAccess] array
-#   90|       getArgument: [SplatExpr] * ...
-#   90|         getAnOperand/getOperand/getReceiver: [LocalVariableAccess] __synth__0
+#   90|     getBody: [StmtSequence] ...
+#   90|       getStmt: [MethodCall] call to concat
+#   90|         getReceiver: [LocalVariableAccess] array
+#   90|         getArgument: [SplatExpr] * ...
+#   90|           getAnOperand/getOperand/getReceiver: [LocalVariableAccess] __synth__0
 #   94|   getStmt: [Method] anonymous_hash_splat_parameter
 #   94|     getParameter: [SimpleParameter] hash
 #   94|       getDefiningAccess: [LocalVariableAccess] hash
 #   94|     getParameter: [HashSplatParameter] **
 #   94|       getDefiningAccess: [LocalVariableAccess] __synth__0
-#   95|     getStmt: [MethodCall] call to merge
-#   95|       getReceiver: [LocalVariableAccess] hash
-#   95|       getArgument: [HashSplatExpr] ** ...
-#   95|         getAnOperand/getOperand/getReceiver: [LocalVariableAccess] __synth__0
+#   95|     getBody: [StmtSequence] ...
+#   95|       getStmt: [MethodCall] call to merge
+#   95|         getReceiver: [LocalVariableAccess] hash
+#   95|         getArgument: [HashSplatExpr] ** ...
+#   95|           getAnOperand/getOperand/getReceiver: [LocalVariableAccess] __synth__0
 #   98|   getStmt: [ClassDeclaration] Sup
 #   99|     getStmt: [Method] m
 #   99|       getParameter: [SimpleParameter] x
@@ -3221,16 +3276,17 @@ params/params.rb:
 #   99|         getDefiningAccess: [LocalVariableAccess] k
 #   99|       getParameter: [HashSplatParameter] **kwargs
 #   99|         getDefiningAccess: [LocalVariableAccess] kwargs
-#  100|       getStmt: [MethodCall] call to print
-#  100|         getReceiver: [SelfVariableAccess] self
-#  100|         getArgument: [AddExpr] ... + ...
-#  100|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
-#  100|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
-#  101|       getStmt: [MethodCall] call to print
-#  101|         getReceiver: [SelfVariableAccess] self
-#  101|         getArgument: [AddExpr] ... + ...
-#  101|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] k
-#  101|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#  100|       getBody: [StmtSequence] ...
+#  100|         getStmt: [MethodCall] call to print
+#  100|           getReceiver: [SelfVariableAccess] self
+#  100|           getArgument: [AddExpr] ... + ...
+#  100|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
+#  100|             getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#  101|         getStmt: [MethodCall] call to print
+#  101|           getReceiver: [SelfVariableAccess] self
+#  101|           getArgument: [AddExpr] ... + ...
+#  101|             getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] k
+#  101|             getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
 #  105|   getStmt: [ClassDeclaration] Sub
 #  105|     getSuperclassExpr: [ConstantReadAccess] Sup
 #  106|     getStmt: [Method] m
@@ -3242,15 +3298,16 @@ params/params.rb:
 #  106|         getDefiningAccess: [LocalVariableAccess] k
 #  106|       getParameter: [HashSplatParameter] **kwargs
 #  106|         getDefiningAccess: [LocalVariableAccess] kwargs
-#  107|       getStmt: [SuperCall] super call to m
-#  107|         getArgument: [LocalVariableAccess] y
-#  107|         getArgument: [SplatExpr] * ...
-#  107|           getAnOperand/getOperand/getReceiver: [LocalVariableAccess] rest
-#  107|         getArgument: [Pair] Pair
-#  107|           getKey: [SymbolLiteral] k
-#  107|           getValue: [LocalVariableAccess] k
-#  107|         getArgument: [HashSplatExpr] ** ...
-#  107|           getAnOperand/getOperand/getReceiver: [LocalVariableAccess] kwargs
+#  107|       getBody: [StmtSequence] ...
+#  107|         getStmt: [SuperCall] super call to m
+#  107|           getArgument: [LocalVariableAccess] y
+#  107|           getArgument: [SplatExpr] * ...
+#  107|             getAnOperand/getOperand/getReceiver: [LocalVariableAccess] rest
+#  107|           getArgument: [Pair] Pair
+#  107|             getKey: [SymbolLiteral] k
+#  107|             getValue: [LocalVariableAccess] k
+#  107|           getArgument: [HashSplatExpr] ** ...
+#  107|             getAnOperand/getOperand/getReceiver: [LocalVariableAccess] kwargs
 #  111|   getStmt: [MethodCall] call to m
 #  111|     getReceiver: [MethodCall] call to new
 #  111|       getReceiver: [ConstantReadAccess] Sub
@@ -3288,57 +3345,59 @@ gems/test.gemspec:
 #    1|     getBlock: [DoBlock] do ... end
 #    1|       getParameter: [SimpleParameter] s
 #    1|         getDefiningAccess: [LocalVariableAccess] s
-#    2|       getStmt: [AssignExpr] ... = ...
-#    2|         getAnOperand/getLeftOperand: [MethodCall] call to name
-#    2|           getReceiver: [LocalVariableAccess] s
-#    2|         getAnOperand/getRightOperand: [StringLiteral] "test"
-#    2|           getComponent: [StringTextComponent] test
-#    3|       getStmt: [AssignExpr] ... = ...
-#    3|         getAnOperand/getLeftOperand: [MethodCall] call to version
-#    3|           getReceiver: [LocalVariableAccess] s
-#    3|         getAnOperand/getRightOperand: [StringLiteral] "0.0.0"
-#    3|           getComponent: [StringTextComponent] 0.0.0
-#    4|       getStmt: [AssignExpr] ... = ...
-#    4|         getAnOperand/getLeftOperand: [MethodCall] call to summary
-#    4|           getReceiver: [LocalVariableAccess] s
-#    4|         getAnOperand/getRightOperand: [StringLiteral] "foo!"
-#    4|           getComponent: [StringTextComponent] foo!
-#    5|       getStmt: [AssignExpr] ... = ...
-#    5|         getAnOperand/getLeftOperand: [MethodCall] call to description
-#    5|           getReceiver: [LocalVariableAccess] s
-#    5|         getAnOperand/getRightOperand: [StringLiteral] "A test"
-#    5|           getComponent: [StringTextComponent] A test
-#    6|       getStmt: [AssignExpr] ... = ...
-#    6|         getAnOperand/getLeftOperand: [MethodCall] call to authors
-#    6|           getReceiver: [LocalVariableAccess] s
-#    6|         getAnOperand/getRightOperand: [ArrayLiteral] [...]
-#    6|           getElement: [StringLiteral] "Mona Lisa"
-#    6|             getComponent: [StringTextComponent] Mona Lisa
-#    7|       getStmt: [AssignExpr] ... = ...
-#    7|         getAnOperand/getLeftOperand: [MethodCall] call to email
-#    7|           getReceiver: [LocalVariableAccess] s
-#    7|         getAnOperand/getRightOperand: [StringLiteral] "mona@example.com"
-#    7|           getComponent: [StringTextComponent] mona@example.com
-#    8|       getStmt: [AssignExpr] ... = ...
-#    8|         getAnOperand/getLeftOperand: [MethodCall] call to files
-#    8|           getReceiver: [LocalVariableAccess] s
-#    8|         getAnOperand/getRightOperand: [ArrayLiteral] [...]
-#    8|           getElement: [StringLiteral] "lib/test.rb"
-#    8|             getComponent: [StringTextComponent] lib/test.rb
-#    9|       getStmt: [AssignExpr] ... = ...
-#    9|         getAnOperand/getLeftOperand: [MethodCall] call to homepage
-#    9|           getReceiver: [LocalVariableAccess] s
-#    9|         getAnOperand/getRightOperand: [StringLiteral] "https://github.com/github/cod..."
-#    9|           getComponent: [StringTextComponent] https://github.com/github/codeql-ruby
+#    2|       getBody: [StmtSequence] ...
+#    2|         getStmt: [AssignExpr] ... = ...
+#    2|           getAnOperand/getLeftOperand: [MethodCall] call to name
+#    2|             getReceiver: [LocalVariableAccess] s
+#    2|           getAnOperand/getRightOperand: [StringLiteral] "test"
+#    2|             getComponent: [StringTextComponent] test
+#    3|         getStmt: [AssignExpr] ... = ...
+#    3|           getAnOperand/getLeftOperand: [MethodCall] call to version
+#    3|             getReceiver: [LocalVariableAccess] s
+#    3|           getAnOperand/getRightOperand: [StringLiteral] "0.0.0"
+#    3|             getComponent: [StringTextComponent] 0.0.0
+#    4|         getStmt: [AssignExpr] ... = ...
+#    4|           getAnOperand/getLeftOperand: [MethodCall] call to summary
+#    4|             getReceiver: [LocalVariableAccess] s
+#    4|           getAnOperand/getRightOperand: [StringLiteral] "foo!"
+#    4|             getComponent: [StringTextComponent] foo!
+#    5|         getStmt: [AssignExpr] ... = ...
+#    5|           getAnOperand/getLeftOperand: [MethodCall] call to description
+#    5|             getReceiver: [LocalVariableAccess] s
+#    5|           getAnOperand/getRightOperand: [StringLiteral] "A test"
+#    5|             getComponent: [StringTextComponent] A test
+#    6|         getStmt: [AssignExpr] ... = ...
+#    6|           getAnOperand/getLeftOperand: [MethodCall] call to authors
+#    6|             getReceiver: [LocalVariableAccess] s
+#    6|           getAnOperand/getRightOperand: [ArrayLiteral] [...]
+#    6|             getElement: [StringLiteral] "Mona Lisa"
+#    6|               getComponent: [StringTextComponent] Mona Lisa
+#    7|         getStmt: [AssignExpr] ... = ...
+#    7|           getAnOperand/getLeftOperand: [MethodCall] call to email
+#    7|             getReceiver: [LocalVariableAccess] s
+#    7|           getAnOperand/getRightOperand: [StringLiteral] "mona@example.com"
+#    7|             getComponent: [StringTextComponent] mona@example.com
+#    8|         getStmt: [AssignExpr] ... = ...
+#    8|           getAnOperand/getLeftOperand: [MethodCall] call to files
+#    8|             getReceiver: [LocalVariableAccess] s
+#    8|           getAnOperand/getRightOperand: [ArrayLiteral] [...]
+#    8|             getElement: [StringLiteral] "lib/test.rb"
+#    8|               getComponent: [StringTextComponent] lib/test.rb
+#    9|         getStmt: [AssignExpr] ... = ...
+#    9|           getAnOperand/getLeftOperand: [MethodCall] call to homepage
+#    9|             getReceiver: [LocalVariableAccess] s
+#    9|           getAnOperand/getRightOperand: [StringLiteral] "https://github.com/github/cod..."
+#    9|             getComponent: [StringTextComponent] https://github.com/github/codeql-ruby
 gems/lib/test.rb:
 #    1| [Toplevel] test.rb
 #    1|   getStmt: [ClassDeclaration] Foo
 #    2|     getStmt: [SingletonMethod] greet
 #    2|       getObject: [SelfVariableAccess] self
-#    3|       getStmt: [MethodCall] call to puts
-#    3|         getReceiver: [SelfVariableAccess] self
-#    3|         getArgument: [StringLiteral] "Hello"
-#    3|           getComponent: [StringTextComponent] Hello
+#    3|       getBody: [StmtSequence] ...
+#    3|         getStmt: [MethodCall] call to puts
+#    3|           getReceiver: [SelfVariableAccess] self
+#    3|           getArgument: [StringLiteral] "Hello"
+#    3|             getComponent: [StringTextComponent] Hello
 modules/toplevel.rb:
 #    1| [Toplevel] toplevel.rb
 #    1|   getStmt: [MethodCall] call to puts
diff --git a/ruby/ql/test/library-tests/ast/AstDesugar.expected b/ruby/ql/test/library-tests/ast/AstDesugar.expected
index 294438607496..40594888db15 100644
--- a/ruby/ql/test/library-tests/ast/AstDesugar.expected
+++ b/ruby/ql/test/library-tests/ast/AstDesugar.expected
@@ -38,11 +38,12 @@ calls/calls.rb:
 #  223|       getBlock: [BraceBlock] { ... }
 #  223|         getParameter: [SimpleParameter] __synth__0__1
 #  223|           getDefiningAccess: [LocalVariableAccess] __synth__0__1
-#  223|         getStmt: [AssignExpr] ... = ...
-#  223|           getAnOperand/getLeftOperand: [LocalVariableAccess] x
-#  223|           getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
-#  224|         getStmt: [MethodCall] call to baz
-#  224|           getReceiver: [SelfVariableAccess] self
+#  223|         getBody: [StmtSequence] ...
+#  223|           getStmt: [AssignExpr] ... = ...
+#  223|             getAnOperand/getLeftOperand: [LocalVariableAccess] x
+#  223|             getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
+#  224|           getStmt: [MethodCall] call to baz
+#  224|             getReceiver: [SelfVariableAccess] self
 #  226| [ForExpr] for ... in ...
 #  226|   getDesugared: [StmtSequence] ...
 #  226|     getStmt: [IfExpr] if ...
@@ -58,11 +59,12 @@ calls/calls.rb:
 #  226|       getBlock: [BraceBlock] { ... }
 #  226|         getParameter: [SimpleParameter] __synth__0__1
 #  226|           getDefiningAccess: [LocalVariableAccess] __synth__0__1
-#  226|         getStmt: [AssignExpr] ... = ...
-#  226|           getAnOperand/getLeftOperand: [LocalVariableAccess] x
-#  226|           getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
-#  227|         getStmt: [MethodCall] call to baz
-#  227|           getReceiver: [ConstantReadAccess] X
+#  226|         getBody: [StmtSequence] ...
+#  226|           getStmt: [AssignExpr] ... = ...
+#  226|             getAnOperand/getLeftOperand: [LocalVariableAccess] x
+#  226|             getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
+#  227|           getStmt: [MethodCall] call to baz
+#  227|             getReceiver: [ConstantReadAccess] X
 #  246| [HashLiteral] {...}
 #  246|   getDesugared: [MethodCall] call to []
 #  246|     getReceiver: [ConstantReadAccess] Hash
@@ -302,33 +304,34 @@ calls/calls.rb:
 #  339|       getBlock: [BraceBlock] { ... }
 #  339|         getParameter: [SimpleParameter] __synth__0__1
 #  339|           getDefiningAccess: [LocalVariableAccess] __synth__0__1
-#  339|         getStmt: [AssignExpr] ... = ...
-#  339|           getDesugared: [StmtSequence] ...
-#  339|             getStmt: [AssignExpr] ... = ...
-#  339|               getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__3__1
-#  339|               getAnOperand/getRightOperand: [SplatExpr] * ...
-#  339|                 getAnOperand/getOperand/getReceiver: [LocalVariableAccess] __synth__0__1
-#  339|             getStmt: [AssignExpr] ... = ...
-#  339|               getAnOperand/getLeftOperand: [LocalVariableAccess] x
-#  339|               getAnOperand/getRightOperand: [MethodCall] call to []
-#  339|                 getReceiver: [LocalVariableAccess] __synth__3__1
-#  339|                 getArgument: [IntegerLiteral] 0
-#  339|             getStmt: [AssignExpr] ... = ...
-#  339|               getAnOperand/getLeftOperand: [LocalVariableAccess] y
-#  339|               getAnOperand/getRightOperand: [MethodCall] call to []
-#  339|                 getReceiver: [LocalVariableAccess] __synth__3__1
-#  339|                 getArgument: [IntegerLiteral] 1
-#  339|             getStmt: [AssignExpr] ... = ...
-#  339|               getAnOperand/getLeftOperand: [LocalVariableAccess] z
-#  339|               getAnOperand/getRightOperand: [MethodCall] call to []
-#  339|                 getReceiver: [LocalVariableAccess] __synth__3__1
-#  339|                 getArgument: [IntegerLiteral] 2
-#  339|           getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
-#  340|         getStmt: [MethodCall] call to foo
-#  340|           getReceiver: [SelfVariableAccess] self
-#  340|           getArgument: [LocalVariableAccess] x
-#  340|           getArgument: [LocalVariableAccess] y
-#  340|           getArgument: [LocalVariableAccess] z
+#  339|         getBody: [StmtSequence] ...
+#  339|           getStmt: [AssignExpr] ... = ...
+#  339|             getDesugared: [StmtSequence] ...
+#  339|               getStmt: [AssignExpr] ... = ...
+#  339|                 getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__3__1
+#  339|                 getAnOperand/getRightOperand: [SplatExpr] * ...
+#  339|                   getAnOperand/getOperand/getReceiver: [LocalVariableAccess] __synth__0__1
+#  339|               getStmt: [AssignExpr] ... = ...
+#  339|                 getAnOperand/getLeftOperand: [LocalVariableAccess] x
+#  339|                 getAnOperand/getRightOperand: [MethodCall] call to []
+#  339|                   getReceiver: [LocalVariableAccess] __synth__3__1
+#  339|                   getArgument: [IntegerLiteral] 0
+#  339|               getStmt: [AssignExpr] ... = ...
+#  339|                 getAnOperand/getLeftOperand: [LocalVariableAccess] y
+#  339|                 getAnOperand/getRightOperand: [MethodCall] call to []
+#  339|                   getReceiver: [LocalVariableAccess] __synth__3__1
+#  339|                   getArgument: [IntegerLiteral] 1
+#  339|               getStmt: [AssignExpr] ... = ...
+#  339|                 getAnOperand/getLeftOperand: [LocalVariableAccess] z
+#  339|                 getAnOperand/getRightOperand: [MethodCall] call to []
+#  339|                   getReceiver: [LocalVariableAccess] __synth__3__1
+#  339|                   getArgument: [IntegerLiteral] 2
+#  339|             getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
+#  340|           getStmt: [MethodCall] call to foo
+#  340|             getReceiver: [SelfVariableAccess] self
+#  340|             getArgument: [LocalVariableAccess] x
+#  340|             getArgument: [LocalVariableAccess] y
+#  340|             getArgument: [LocalVariableAccess] z
 #  361| [MethodCall] call to empty?
 #  361|   getDesugared: [StmtSequence] ...
 #  361|     getStmt: [AssignExpr] ... = ...
@@ -360,7 +363,8 @@ calls/calls.rb:
 #  363|         getBlock: [BraceBlock] { ... }
 #  363|           getParameter: [SimpleParameter] x
 #  363|             getDefiningAccess: [LocalVariableAccess] x
-#  363|           getStmt: [LocalVariableAccess] x
+#  363|           getBody: [StmtSequence] ...
+#  363|             getStmt: [LocalVariableAccess] x
 control/cases.rb:
 #   90| [ArrayLiteral] %w(...)
 #   90|   getDesugared: [MethodCall] call to []
@@ -647,18 +651,19 @@ control/loops.rb:
 #    9|       getBlock: [BraceBlock] { ... }
 #    9|         getParameter: [SimpleParameter] __synth__0__1
 #    9|           getDefiningAccess: [LocalVariableAccess] __synth__0__1
-#    9|         getStmt: [AssignExpr] ... = ...
-#    9|           getAnOperand/getLeftOperand: [LocalVariableAccess] n
-#    9|           getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
-#   10|         getStmt: [AssignAddExpr] ... += ...
-#   10|           getDesugared: [AssignExpr] ... = ...
-#   10|             getAnOperand/getLeftOperand: [LocalVariableAccess] sum
-#   10|             getAnOperand/getRightOperand: [AddExpr] ... + ...
-#   10|               getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] sum
-#   10|               getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] n
-#   11|         getStmt: [AssignExpr] ... = ...
-#   11|           getAnOperand/getLeftOperand: [LocalVariableAccess] foo
-#   11|           getAnOperand/getRightOperand: [LocalVariableAccess] n
+#    9|         getBody: [StmtSequence] ...
+#    9|           getStmt: [AssignExpr] ... = ...
+#    9|             getAnOperand/getLeftOperand: [LocalVariableAccess] n
+#    9|             getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
+#   10|           getStmt: [AssignAddExpr] ... += ...
+#   10|             getDesugared: [AssignExpr] ... = ...
+#   10|               getAnOperand/getLeftOperand: [LocalVariableAccess] sum
+#   10|               getAnOperand/getRightOperand: [AddExpr] ... + ...
+#   10|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] sum
+#   10|                 getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] n
+#   11|           getStmt: [AssignExpr] ... = ...
+#   11|             getAnOperand/getLeftOperand: [LocalVariableAccess] foo
+#   11|             getAnOperand/getRightOperand: [LocalVariableAccess] n
 #   16| [ForExpr] for ... in ...
 #   16|   getDesugared: [StmtSequence] ...
 #   16|     getStmt: [IfExpr] if ...
@@ -675,21 +680,22 @@ control/loops.rb:
 #   16|       getBlock: [BraceBlock] { ... }
 #   16|         getParameter: [SimpleParameter] __synth__0__1
 #   16|           getDefiningAccess: [LocalVariableAccess] __synth__0__1
-#   16|         getStmt: [AssignExpr] ... = ...
-#   16|           getAnOperand/getLeftOperand: [LocalVariableAccess] n
-#   16|           getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
-#   17|         getStmt: [AssignAddExpr] ... += ...
-#   17|           getDesugared: [AssignExpr] ... = ...
-#   17|             getAnOperand/getLeftOperand: [LocalVariableAccess] sum
-#   17|             getAnOperand/getRightOperand: [AddExpr] ... + ...
-#   17|               getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] sum
-#   17|               getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] n
-#   18|         getStmt: [AssignSubExpr] ... -= ...
-#   18|           getDesugared: [AssignExpr] ... = ...
-#   18|             getAnOperand/getLeftOperand: [LocalVariableAccess] foo
-#   18|             getAnOperand/getRightOperand: [SubExpr] ... - ...
-#   18|               getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] foo
-#   18|               getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] n
+#   16|         getBody: [StmtSequence] ...
+#   16|           getStmt: [AssignExpr] ... = ...
+#   16|             getAnOperand/getLeftOperand: [LocalVariableAccess] n
+#   16|             getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
+#   17|           getStmt: [AssignAddExpr] ... += ...
+#   17|             getDesugared: [AssignExpr] ... = ...
+#   17|               getAnOperand/getLeftOperand: [LocalVariableAccess] sum
+#   17|               getAnOperand/getRightOperand: [AddExpr] ... + ...
+#   17|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] sum
+#   17|                 getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] n
+#   18|           getStmt: [AssignSubExpr] ... -= ...
+#   18|             getDesugared: [AssignExpr] ... = ...
+#   18|               getAnOperand/getLeftOperand: [LocalVariableAccess] foo
+#   18|               getAnOperand/getRightOperand: [SubExpr] ... - ...
+#   18|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] foo
+#   18|                 getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] n
 #   22| [ForExpr] for ... in ...
 #   22|   getDesugared: [StmtSequence] ...
 #   22|     getStmt: [IfExpr] if ...
@@ -721,35 +727,36 @@ control/loops.rb:
 #   22|       getBlock: [BraceBlock] { ... }
 #   22|         getParameter: [SimpleParameter] __synth__0__1
 #   22|           getDefiningAccess: [LocalVariableAccess] __synth__0__1
-#   22|         getStmt: [AssignExpr] ... = ...
-#   22|           getDesugared: [StmtSequence] ...
-#   22|             getStmt: [AssignExpr] ... = ...
-#   22|               getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__2__1
-#   22|               getAnOperand/getRightOperand: [SplatExpr] * ...
-#   22|                 getAnOperand/getOperand/getReceiver: [LocalVariableAccess] __synth__0__1
-#   22|             getStmt: [AssignExpr] ... = ...
-#   22|               getAnOperand/getLeftOperand: [LocalVariableAccess] key
-#   22|               getAnOperand/getRightOperand: [MethodCall] call to []
-#   22|                 getReceiver: [LocalVariableAccess] __synth__2__1
-#   22|                 getArgument: [IntegerLiteral] 0
-#   22|             getStmt: [AssignExpr] ... = ...
-#   22|               getAnOperand/getLeftOperand: [LocalVariableAccess] value
-#   22|               getAnOperand/getRightOperand: [MethodCall] call to []
-#   22|                 getReceiver: [LocalVariableAccess] __synth__2__1
-#   22|                 getArgument: [IntegerLiteral] 1
-#   22|           getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
-#   23|         getStmt: [AssignAddExpr] ... += ...
-#   23|           getDesugared: [AssignExpr] ... = ...
-#   23|             getAnOperand/getLeftOperand: [LocalVariableAccess] sum
-#   23|             getAnOperand/getRightOperand: [AddExpr] ... + ...
-#   23|               getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] sum
-#   23|               getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] value
-#   24|         getStmt: [AssignMulExpr] ... *= ...
-#   24|           getDesugared: [AssignExpr] ... = ...
-#   24|             getAnOperand/getLeftOperand: [LocalVariableAccess] foo
-#   24|             getAnOperand/getRightOperand: [MulExpr] ... * ...
-#   24|               getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] foo
-#   24|               getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] value
+#   22|         getBody: [StmtSequence] ...
+#   22|           getStmt: [AssignExpr] ... = ...
+#   22|             getDesugared: [StmtSequence] ...
+#   22|               getStmt: [AssignExpr] ... = ...
+#   22|                 getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__2__1
+#   22|                 getAnOperand/getRightOperand: [SplatExpr] * ...
+#   22|                   getAnOperand/getOperand/getReceiver: [LocalVariableAccess] __synth__0__1
+#   22|               getStmt: [AssignExpr] ... = ...
+#   22|                 getAnOperand/getLeftOperand: [LocalVariableAccess] key
+#   22|                 getAnOperand/getRightOperand: [MethodCall] call to []
+#   22|                   getReceiver: [LocalVariableAccess] __synth__2__1
+#   22|                   getArgument: [IntegerLiteral] 0
+#   22|               getStmt: [AssignExpr] ... = ...
+#   22|                 getAnOperand/getLeftOperand: [LocalVariableAccess] value
+#   22|                 getAnOperand/getRightOperand: [MethodCall] call to []
+#   22|                   getReceiver: [LocalVariableAccess] __synth__2__1
+#   22|                   getArgument: [IntegerLiteral] 1
+#   22|             getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
+#   23|           getStmt: [AssignAddExpr] ... += ...
+#   23|             getDesugared: [AssignExpr] ... = ...
+#   23|               getAnOperand/getLeftOperand: [LocalVariableAccess] sum
+#   23|               getAnOperand/getRightOperand: [AddExpr] ... + ...
+#   23|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] sum
+#   23|                 getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] value
+#   24|           getStmt: [AssignMulExpr] ... *= ...
+#   24|             getDesugared: [AssignExpr] ... = ...
+#   24|               getAnOperand/getLeftOperand: [LocalVariableAccess] foo
+#   24|               getAnOperand/getRightOperand: [MulExpr] ... * ...
+#   24|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] foo
+#   24|                 getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] value
 #   28| [ForExpr] for ... in ...
 #   28|   getDesugared: [StmtSequence] ...
 #   28|     getStmt: [IfExpr] if ...
@@ -781,36 +788,37 @@ control/loops.rb:
 #   28|       getBlock: [BraceBlock] { ... }
 #   28|         getParameter: [SimpleParameter] __synth__0__1
 #   28|           getDefiningAccess: [LocalVariableAccess] __synth__0__1
-#   28|         getStmt: [AssignExpr] ... = ...
-#   28|           getDesugared: [StmtSequence] ...
-#   28|             getStmt: [AssignExpr] ... = ...
-#   28|               getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__2__1
-#   28|               getAnOperand/getRightOperand: [SplatExpr] * ...
-#   28|                 getAnOperand/getOperand/getReceiver: [LocalVariableAccess] __synth__0__1
-#   28|             getStmt: [AssignExpr] ... = ...
-#   28|               getAnOperand/getLeftOperand: [LocalVariableAccess] key
-#   28|               getAnOperand/getRightOperand: [MethodCall] call to []
-#   28|                 getReceiver: [LocalVariableAccess] __synth__2__1
-#   28|                 getArgument: [IntegerLiteral] 0
-#   28|             getStmt: [AssignExpr] ... = ...
-#   28|               getAnOperand/getLeftOperand: [LocalVariableAccess] value
-#   28|               getAnOperand/getRightOperand: [MethodCall] call to []
-#   28|                 getReceiver: [LocalVariableAccess] __synth__2__1
-#   28|                 getArgument: [IntegerLiteral] 1
-#   28|           getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
-#   29|         getStmt: [AssignAddExpr] ... += ...
-#   29|           getDesugared: [AssignExpr] ... = ...
-#   29|             getAnOperand/getLeftOperand: [LocalVariableAccess] sum
-#   29|             getAnOperand/getRightOperand: [AddExpr] ... + ...
-#   29|               getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] sum
-#   29|               getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] value
-#   30|         getStmt: [AssignDivExpr] ... /= ...
-#   30|           getDesugared: [AssignExpr] ... = ...
-#   30|             getAnOperand/getLeftOperand: [LocalVariableAccess] foo
-#   30|             getAnOperand/getRightOperand: [DivExpr] ... / ...
-#   30|               getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] foo
-#   30|               getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] value
-#   31|         getStmt: [BreakStmt] break
+#   28|         getBody: [StmtSequence] ...
+#   28|           getStmt: [AssignExpr] ... = ...
+#   28|             getDesugared: [StmtSequence] ...
+#   28|               getStmt: [AssignExpr] ... = ...
+#   28|                 getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__2__1
+#   28|                 getAnOperand/getRightOperand: [SplatExpr] * ...
+#   28|                   getAnOperand/getOperand/getReceiver: [LocalVariableAccess] __synth__0__1
+#   28|               getStmt: [AssignExpr] ... = ...
+#   28|                 getAnOperand/getLeftOperand: [LocalVariableAccess] key
+#   28|                 getAnOperand/getRightOperand: [MethodCall] call to []
+#   28|                   getReceiver: [LocalVariableAccess] __synth__2__1
+#   28|                   getArgument: [IntegerLiteral] 0
+#   28|               getStmt: [AssignExpr] ... = ...
+#   28|                 getAnOperand/getLeftOperand: [LocalVariableAccess] value
+#   28|                 getAnOperand/getRightOperand: [MethodCall] call to []
+#   28|                   getReceiver: [LocalVariableAccess] __synth__2__1
+#   28|                   getArgument: [IntegerLiteral] 1
+#   28|             getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
+#   29|           getStmt: [AssignAddExpr] ... += ...
+#   29|             getDesugared: [AssignExpr] ... = ...
+#   29|               getAnOperand/getLeftOperand: [LocalVariableAccess] sum
+#   29|               getAnOperand/getRightOperand: [AddExpr] ... + ...
+#   29|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] sum
+#   29|                 getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] value
+#   30|           getStmt: [AssignDivExpr] ... /= ...
+#   30|             getDesugared: [AssignExpr] ... = ...
+#   30|               getAnOperand/getLeftOperand: [LocalVariableAccess] foo
+#   30|               getAnOperand/getRightOperand: [DivExpr] ... / ...
+#   30|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] foo
+#   30|                 getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] value
+#   31|           getStmt: [BreakStmt] break
 #   36| [AssignAddExpr] ... += ...
 #   36|   getDesugared: [AssignExpr] ... = ...
 #   36|     getAnOperand/getLeftOperand: [LocalVariableAccess] x
@@ -1090,16 +1098,17 @@ erb/template.html.erb:
 #   27|       getBlock: [BraceBlock] { ... }
 #   27|         getParameter: [SimpleParameter] __synth__0__1
 #   27|           getDefiningAccess: [LocalVariableAccess] __synth__0__1
-#   27|         getStmt: [AssignExpr] ... = ...
-#   27|           getAnOperand/getLeftOperand: [LocalVariableAccess] x
-#   27|           getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
-#   28|         getStmt: [AssignAddExpr] ... += ...
-#   28|           getDesugared: [AssignExpr] ... = ...
-#   28|             getAnOperand/getLeftOperand: [LocalVariableAccess] xs
-#   28|             getAnOperand/getRightOperand: [AddExpr] ... + ...
-#   28|               getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] xs
-#   28|               getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] x
-#   29|         getStmt: [LocalVariableAccess] xs
+#   27|         getBody: [StmtSequence] ...
+#   27|           getStmt: [AssignExpr] ... = ...
+#   27|             getAnOperand/getLeftOperand: [LocalVariableAccess] x
+#   27|             getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
+#   28|           getStmt: [AssignAddExpr] ... += ...
+#   28|             getDesugared: [AssignExpr] ... = ...
+#   28|               getAnOperand/getLeftOperand: [LocalVariableAccess] xs
+#   28|               getAnOperand/getRightOperand: [AddExpr] ... + ...
+#   28|                 getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] xs
+#   28|                 getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] x
+#   29|           getStmt: [LocalVariableAccess] xs
 gems/test.gemspec:
 #    2| [AssignExpr] ... = ...
 #    2|   getDesugared: [StmtSequence] ...
diff --git a/ruby/ql/test/library-tests/modules/methods.expected b/ruby/ql/test/library-tests/modules/methods.expected
index 95ca9e9c260a..272081218c56 100644
--- a/ruby/ql/test/library-tests/modules/methods.expected
+++ b/ruby/ql/test/library-tests/modules/methods.expected
@@ -709,32 +709,40 @@ lookupMethod
 | unresolved_subclass.rb:21:1:22:3 | UnresolvedNamespace::X1::X2::X3::A | puts | calls.rb:102:5:102:30 | puts |
 | unresolved_subclass.rb:21:1:22:3 | UnresolvedNamespace::X1::X2::X3::A | to_s | calls.rb:172:5:173:7 | to_s |
 enclosingMethod
+| calls.rb:2:5:2:14 | ... | calls.rb:1:1:3:3 | foo |
 | calls.rb:2:5:2:14 | call to puts | calls.rb:1:1:3:3 | foo |
 | calls.rb:2:5:2:14 | self | calls.rb:1:1:3:3 | foo |
 | calls.rb:2:10:2:14 | "foo" | calls.rb:1:1:3:3 | foo |
 | calls.rb:2:11:2:13 | foo | calls.rb:1:1:3:3 | foo |
+| calls.rb:8:5:8:15 | ... | calls.rb:7:1:9:3 | bar |
 | calls.rb:8:5:8:15 | call to puts | calls.rb:7:1:9:3 | bar |
 | calls.rb:8:5:8:15 | self | calls.rb:7:1:9:3 | bar |
 | calls.rb:8:10:8:15 | "bar1" | calls.rb:7:1:9:3 | bar |
 | calls.rb:8:11:8:14 | bar1 | calls.rb:7:1:9:3 | bar |
+| calls.rb:14:5:14:15 | ... | calls.rb:13:1:15:3 | bar |
 | calls.rb:14:5:14:15 | call to puts | calls.rb:13:1:15:3 | bar |
 | calls.rb:14:5:14:15 | self | calls.rb:13:1:15:3 | bar |
 | calls.rb:14:10:14:15 | "bar2" | calls.rb:13:1:15:3 | bar |
 | calls.rb:14:11:14:14 | bar2 | calls.rb:13:1:15:3 | bar |
 | calls.rb:23:9:23:19 | call to singleton_m | calls.rb:22:5:24:7 | instance_m |
 | calls.rb:23:9:23:19 | self | calls.rb:22:5:24:7 | instance_m |
+| calls.rb:23:9:23:35 | ... | calls.rb:22:5:24:7 | instance_m |
 | calls.rb:26:9:26:18 | call to instance_m | calls.rb:25:5:27:7 | singleton_m |
 | calls.rb:26:9:26:18 | self | calls.rb:25:5:27:7 | singleton_m |
+| calls.rb:26:9:26:34 | ... | calls.rb:25:5:27:7 | singleton_m |
 | calls.rb:40:5:40:14 | call to instance_m | calls.rb:39:1:41:3 | call_instance_m |
 | calls.rb:40:5:40:14 | self | calls.rb:39:1:41:3 | call_instance_m |
+| calls.rb:40:5:40:30 | ... | calls.rb:39:1:41:3 | call_instance_m |
 | calls.rb:52:9:52:18 | call to instance_m | calls.rb:51:5:57:7 | baz |
 | calls.rb:52:9:52:18 | self | calls.rb:51:5:57:7 | baz |
+| calls.rb:52:9:56:40 | ... | calls.rb:51:5:57:7 | baz |
 | calls.rb:53:9:53:12 | self | calls.rb:51:5:57:7 | baz |
 | calls.rb:53:9:53:23 | call to instance_m | calls.rb:51:5:57:7 | baz |
 | calls.rb:55:9:55:19 | call to singleton_m | calls.rb:51:5:57:7 | baz |
 | calls.rb:55:9:55:19 | self | calls.rb:51:5:57:7 | baz |
 | calls.rb:56:9:56:12 | self | calls.rb:51:5:57:7 | baz |
 | calls.rb:56:9:56:24 | call to singleton_m | calls.rb:51:5:57:7 | baz |
+| calls.rb:67:9:67:13 | ... | calls.rb:66:5:68:7 | baz |
 | calls.rb:67:9:67:13 | super call to baz | calls.rb:66:5:68:7 | baz |
 | calls.rb:76:18:76:18 | a | calls.rb:76:1:79:3 | optional_arg |
 | calls.rb:76:18:76:18 | a | calls.rb:76:1:79:3 | optional_arg |
@@ -744,12 +752,15 @@ enclosingMethod
 | calls.rb:76:28:76:28 | 5 | calls.rb:76:1:79:3 | optional_arg |
 | calls.rb:77:5:77:5 | a | calls.rb:76:1:79:3 | optional_arg |
 | calls.rb:77:5:77:16 | call to bit_length | calls.rb:76:1:79:3 | optional_arg |
+| calls.rb:77:5:78:16 | ... | calls.rb:76:1:79:3 | optional_arg |
 | calls.rb:78:5:78:5 | b | calls.rb:76:1:79:3 | optional_arg |
 | calls.rb:78:5:78:16 | call to bit_length | calls.rb:76:1:79:3 | optional_arg |
+| calls.rb:82:5:82:11 | ... | calls.rb:81:1:83:3 | call_block |
 | calls.rb:82:5:82:11 | yield ... | calls.rb:81:1:83:3 | call_block |
 | calls.rb:82:11:82:11 | 1 | calls.rb:81:1:83:3 | call_block |
 | calls.rb:86:5:86:7 | var | calls.rb:85:1:89:3 | foo |
 | calls.rb:86:5:86:18 | ... = ... | calls.rb:85:1:89:3 | foo |
+| calls.rb:86:5:88:29 | ... | calls.rb:85:1:89:3 | foo |
 | calls.rb:86:11:86:14 | Hash | calls.rb:85:1:89:3 | foo |
 | calls.rb:86:11:86:18 | call to new | calls.rb:85:1:89:3 | foo |
 | calls.rb:87:5:87:7 | var | calls.rb:85:1:89:3 | foo |
@@ -761,25 +772,30 @@ enclosingMethod
 | calls.rb:88:19:88:19 | x | calls.rb:85:1:89:3 | foo |
 | calls.rb:88:19:88:19 | x | calls.rb:85:1:89:3 | foo |
 | calls.rb:88:22:88:24 | var | calls.rb:85:1:89:3 | foo |
+| calls.rb:88:22:88:27 | ... | calls.rb:85:1:89:3 | foo |
 | calls.rb:88:22:88:27 | ...[...] | calls.rb:85:1:89:3 | foo |
 | calls.rb:88:26:88:26 | x | calls.rb:85:1:89:3 | foo |
 | calls.rb:102:14:102:14 | x | calls.rb:102:5:102:30 | puts |
 | calls.rb:102:14:102:14 | x | calls.rb:102:5:102:30 | puts |
+| calls.rb:102:17:102:26 | ... | calls.rb:102:5:102:30 | puts |
 | calls.rb:102:17:102:26 | call to old_puts | calls.rb:102:5:102:30 | puts |
 | calls.rb:102:17:102:26 | self | calls.rb:102:5:102:30 | puts |
 | calls.rb:102:26:102:26 | x | calls.rb:102:5:102:30 | puts |
 | calls.rb:108:17:108:17 | x | calls.rb:108:5:110:7 | include |
 | calls.rb:108:17:108:17 | x | calls.rb:108:5:110:7 | include |
+| calls.rb:109:9:109:21 | ... | calls.rb:108:5:110:7 | include |
 | calls.rb:109:9:109:21 | call to old_include | calls.rb:108:5:110:7 | include |
 | calls.rb:109:9:109:21 | self | calls.rb:108:5:110:7 | include |
 | calls.rb:109:21:109:21 | x | calls.rb:108:5:110:7 | include |
 | calls.rb:122:12:122:12 | x | calls.rb:122:5:122:31 | [] |
 | calls.rb:122:12:122:12 | x | calls.rb:122:5:122:31 | [] |
+| calls.rb:122:15:122:27 | ... | calls.rb:122:5:122:31 | [] |
 | calls.rb:122:15:122:27 | call to old_lookup | calls.rb:122:5:122:31 | [] |
 | calls.rb:122:15:122:27 | self | calls.rb:122:5:122:31 | [] |
 | calls.rb:122:26:122:26 | x | calls.rb:122:5:122:31 | [] |
 | calls.rb:127:10:127:10 | x | calls.rb:127:3:127:29 | [] |
 | calls.rb:127:10:127:10 | x | calls.rb:127:3:127:29 | [] |
+| calls.rb:127:13:127:25 | ... | calls.rb:127:3:127:29 | [] |
 | calls.rb:127:13:127:25 | call to old_lookup | calls.rb:127:3:127:29 | [] |
 | calls.rb:127:13:127:25 | self | calls.rb:127:3:127:29 | [] |
 | calls.rb:127:24:127:24 | x | calls.rb:127:3:127:29 | [] |
@@ -787,6 +803,7 @@ enclosingMethod
 | calls.rb:131:16:131:19 | body | calls.rb:131:3:137:5 | foreach |
 | calls.rb:132:5:132:5 | x | calls.rb:131:3:137:5 | foreach |
 | calls.rb:132:5:132:9 | ... = ... | calls.rb:131:3:137:5 | foreach |
+| calls.rb:132:5:136:7 | ... | calls.rb:131:3:137:5 | foreach |
 | calls.rb:132:9:132:9 | 0 | calls.rb:131:3:137:5 | foreach |
 | calls.rb:133:5:136:7 | while ... | calls.rb:131:3:137:5 | foreach |
 | calls.rb:133:11:133:11 | x | calls.rb:131:3:137:5 | foreach |
@@ -805,65 +822,80 @@ enclosingMethod
 | calls.rb:135:9:135:14 | ... = ... | calls.rb:131:3:137:5 | foreach |
 | calls.rb:135:11:135:12 | ... + ... | calls.rb:131:3:137:5 | foreach |
 | calls.rb:135:14:135:14 | 1 | calls.rb:131:3:137:5 | foreach |
+| calls.rb:141:5:141:20 | ... | calls.rb:140:1:142:3 | funny |
 | calls.rb:141:5:141:20 | yield ... | calls.rb:140:1:142:3 | funny |
 | calls.rb:141:11:141:20 | "prefix: " | calls.rb:140:1:142:3 | funny |
 | calls.rb:141:12:141:19 | prefix:  | calls.rb:140:1:142:3 | funny |
 | calls.rb:158:14:158:15 | &b | calls.rb:158:1:160:3 | indirect |
 | calls.rb:158:15:158:15 | b | calls.rb:158:1:160:3 | indirect |
+| calls.rb:159:5:159:17 | ... | calls.rb:158:1:160:3 | indirect |
 | calls.rb:159:5:159:17 | call to call_block | calls.rb:158:1:160:3 | indirect |
 | calls.rb:159:5:159:17 | self | calls.rb:158:1:160:3 | indirect |
 | calls.rb:159:16:159:17 | &... | calls.rb:158:1:160:3 | indirect |
 | calls.rb:159:17:159:17 | b | calls.rb:158:1:160:3 | indirect |
 | calls.rb:167:9:167:12 | self | calls.rb:166:5:168:7 | s_method |
+| calls.rb:167:9:167:17 | ... | calls.rb:166:5:168:7 | s_method |
 | calls.rb:167:9:167:17 | call to to_s | calls.rb:166:5:168:7 | s_method |
 | calls.rb:192:9:192:26 | call to puts | calls.rb:191:5:194:7 | singleton_a |
 | calls.rb:192:9:192:26 | self | calls.rb:191:5:194:7 | singleton_a |
+| calls.rb:192:9:193:24 | ... | calls.rb:191:5:194:7 | singleton_a |
 | calls.rb:192:14:192:26 | "singleton_a" | calls.rb:191:5:194:7 | singleton_a |
 | calls.rb:192:15:192:25 | singleton_a | calls.rb:191:5:194:7 | singleton_a |
 | calls.rb:193:9:193:12 | self | calls.rb:191:5:194:7 | singleton_a |
 | calls.rb:193:9:193:24 | call to singleton_b | calls.rb:191:5:194:7 | singleton_a |
 | calls.rb:197:9:197:26 | call to puts | calls.rb:196:5:199:7 | singleton_b |
 | calls.rb:197:9:197:26 | self | calls.rb:196:5:199:7 | singleton_b |
+| calls.rb:197:9:198:24 | ... | calls.rb:196:5:199:7 | singleton_b |
 | calls.rb:197:14:197:26 | "singleton_b" | calls.rb:196:5:199:7 | singleton_b |
 | calls.rb:197:15:197:25 | singleton_b | calls.rb:196:5:199:7 | singleton_b |
 | calls.rb:198:9:198:12 | self | calls.rb:196:5:199:7 | singleton_b |
 | calls.rb:198:9:198:24 | call to singleton_c | calls.rb:196:5:199:7 | singleton_b |
+| calls.rb:202:9:202:26 | ... | calls.rb:201:5:203:7 | singleton_c |
 | calls.rb:202:9:202:26 | call to puts | calls.rb:201:5:203:7 | singleton_c |
 | calls.rb:202:9:202:26 | self | calls.rb:201:5:203:7 | singleton_c |
 | calls.rb:202:14:202:26 | "singleton_c" | calls.rb:201:5:203:7 | singleton_c |
 | calls.rb:202:15:202:25 | singleton_c | calls.rb:201:5:203:7 | singleton_c |
 | calls.rb:206:9:206:26 | call to puts | calls.rb:205:5:208:7 | singleton_d |
 | calls.rb:206:9:206:26 | self | calls.rb:205:5:208:7 | singleton_d |
+| calls.rb:206:9:207:24 | ... | calls.rb:205:5:208:7 | singleton_d |
 | calls.rb:206:14:206:26 | "singleton_d" | calls.rb:205:5:208:7 | singleton_d |
 | calls.rb:206:15:206:25 | singleton_d | calls.rb:205:5:208:7 | singleton_d |
 | calls.rb:207:9:207:12 | self | calls.rb:205:5:208:7 | singleton_d |
 | calls.rb:207:9:207:24 | call to singleton_a | calls.rb:205:5:208:7 | singleton_d |
 | calls.rb:211:9:213:11 | singleton_e | calls.rb:210:5:215:7 | instance |
+| calls.rb:211:9:214:19 | ... | calls.rb:210:5:215:7 | instance |
 | calls.rb:211:13:211:16 | self | calls.rb:210:5:215:7 | instance |
+| calls.rb:212:13:212:30 | ... | calls.rb:211:9:213:11 | singleton_e |
 | calls.rb:212:13:212:30 | call to puts | calls.rb:211:9:213:11 | singleton_e |
 | calls.rb:212:13:212:30 | self | calls.rb:211:9:213:11 | singleton_e |
 | calls.rb:212:18:212:30 | "singleton_e" | calls.rb:211:9:213:11 | singleton_e |
 | calls.rb:212:19:212:29 | singleton_e | calls.rb:211:9:213:11 | singleton_e |
 | calls.rb:214:9:214:19 | call to singleton_e | calls.rb:210:5:215:7 | instance |
 | calls.rb:214:9:214:19 | self | calls.rb:210:5:215:7 | instance |
+| calls.rb:219:13:219:30 | ... | calls.rb:218:9:220:11 | singleton_f |
 | calls.rb:219:13:219:30 | call to puts | calls.rb:218:9:220:11 | singleton_f |
 | calls.rb:219:13:219:30 | self | calls.rb:218:9:220:11 | singleton_f |
 | calls.rb:219:18:219:30 | "singleton_f" | calls.rb:218:9:220:11 | singleton_f |
 | calls.rb:219:19:219:29 | singleton_f | calls.rb:218:9:220:11 | singleton_f |
 | calls.rb:224:9:224:12 | self | calls.rb:223:5:225:7 | call_singleton_g |
+| calls.rb:224:9:224:24 | ... | calls.rb:223:5:225:7 | call_singleton_g |
 | calls.rb:224:9:224:24 | call to singleton_g | calls.rb:223:5:225:7 | call_singleton_g |
+| calls.rb:237:5:237:24 | ... | calls.rb:236:1:238:3 | singleton_g |
 | calls.rb:237:5:237:24 | call to puts | calls.rb:236:1:238:3 | singleton_g |
 | calls.rb:237:5:237:24 | self | calls.rb:236:1:238:3 | singleton_g |
 | calls.rb:237:10:237:24 | "singleton_g_1" | calls.rb:236:1:238:3 | singleton_g |
 | calls.rb:237:11:237:23 | singleton_g_1 | calls.rb:236:1:238:3 | singleton_g |
+| calls.rb:244:5:244:24 | ... | calls.rb:243:1:245:3 | singleton_g |
 | calls.rb:244:5:244:24 | call to puts | calls.rb:243:1:245:3 | singleton_g |
 | calls.rb:244:5:244:24 | self | calls.rb:243:1:245:3 | singleton_g |
 | calls.rb:244:10:244:24 | "singleton_g_2" | calls.rb:243:1:245:3 | singleton_g |
 | calls.rb:244:11:244:23 | singleton_g_2 | calls.rb:243:1:245:3 | singleton_g |
+| calls.rb:252:9:252:28 | ... | calls.rb:251:5:253:7 | singleton_g |
 | calls.rb:252:9:252:28 | call to puts | calls.rb:251:5:253:7 | singleton_g |
 | calls.rb:252:9:252:28 | self | calls.rb:251:5:253:7 | singleton_g |
 | calls.rb:252:14:252:28 | "singleton_g_3" | calls.rb:251:5:253:7 | singleton_g |
 | calls.rb:252:15:252:27 | singleton_g_3 | calls.rb:251:5:253:7 | singleton_g |
+| calls.rb:268:5:268:22 | ... | calls.rb:267:1:269:3 | singleton_g |
 | calls.rb:268:5:268:22 | call to puts | calls.rb:267:1:269:3 | singleton_g |
 | calls.rb:268:5:268:22 | self | calls.rb:267:1:269:3 | singleton_g |
 | calls.rb:268:10:268:22 | "singleton_g" | calls.rb:267:1:269:3 | singleton_g |
@@ -873,24 +905,29 @@ enclosingMethod
 | calls.rb:279:5:279:8 | type | calls.rb:278:1:286:3 | create |
 | calls.rb:279:5:279:12 | call to new | calls.rb:278:1:286:3 | create |
 | calls.rb:279:5:279:21 | call to instance | calls.rb:278:1:286:3 | create |
+| calls.rb:279:5:285:20 | ... | calls.rb:278:1:286:3 | create |
 | calls.rb:281:5:283:7 | singleton_h | calls.rb:278:1:286:3 | create |
 | calls.rb:281:9:281:12 | type | calls.rb:278:1:286:3 | create |
+| calls.rb:282:9:282:26 | ... | calls.rb:281:5:283:7 | singleton_h |
 | calls.rb:282:9:282:26 | call to puts | calls.rb:281:5:283:7 | singleton_h |
 | calls.rb:282:9:282:26 | self | calls.rb:281:5:283:7 | singleton_h |
 | calls.rb:282:14:282:26 | "singleton_h" | calls.rb:281:5:283:7 | singleton_h |
 | calls.rb:282:15:282:25 | singleton_h | calls.rb:281:5:283:7 | singleton_h |
 | calls.rb:285:5:285:8 | type | calls.rb:278:1:286:3 | create |
 | calls.rb:285:5:285:20 | call to singleton_h | calls.rb:278:1:286:3 | create |
+| calls.rb:295:9:295:26 | ... | calls.rb:294:5:296:7 | singleton_i |
 | calls.rb:295:9:295:26 | call to puts | calls.rb:294:5:296:7 | singleton_i |
 | calls.rb:295:9:295:26 | self | calls.rb:294:5:296:7 | singleton_i |
 | calls.rb:295:14:295:26 | "singleton_i" | calls.rb:294:5:296:7 | singleton_i |
 | calls.rb:295:15:295:25 | singleton_i | calls.rb:294:5:296:7 | singleton_i |
+| calls.rb:304:9:304:26 | ... | calls.rb:303:5:305:7 | singleton_j |
 | calls.rb:304:9:304:26 | call to puts | calls.rb:303:5:305:7 | singleton_j |
 | calls.rb:304:9:304:26 | self | calls.rb:303:5:305:7 | singleton_j |
 | calls.rb:304:14:304:26 | "singleton_j" | calls.rb:303:5:305:7 | singleton_j |
 | calls.rb:304:15:304:25 | singleton_j | calls.rb:303:5:305:7 | singleton_j |
 | calls.rb:312:9:312:31 | call to puts | calls.rb:311:5:314:7 | instance |
 | calls.rb:312:9:312:31 | self | calls.rb:311:5:314:7 | instance |
+| calls.rb:312:9:313:36 | ... | calls.rb:311:5:314:7 | instance |
 | calls.rb:312:14:312:31 | "SelfNew#instance" | calls.rb:311:5:314:7 | instance |
 | calls.rb:312:15:312:30 | SelfNew#instance | calls.rb:311:5:314:7 | instance |
 | calls.rb:313:9:313:11 | call to new | calls.rb:311:5:314:7 | instance |
@@ -898,16 +935,21 @@ enclosingMethod
 | calls.rb:313:9:313:20 | call to instance | calls.rb:311:5:314:7 | instance |
 | calls.rb:317:9:317:11 | call to new | calls.rb:316:5:318:7 | singleton |
 | calls.rb:317:9:317:11 | self | calls.rb:316:5:318:7 | singleton |
+| calls.rb:317:9:317:20 | ... | calls.rb:316:5:318:7 | singleton |
 | calls.rb:317:9:317:20 | call to instance | calls.rb:316:5:318:7 | singleton |
+| calls.rb:327:9:327:26 | ... | calls.rb:326:5:328:7 | instance |
 | calls.rb:327:9:327:26 | call to puts | calls.rb:326:5:328:7 | instance |
 | calls.rb:327:9:327:26 | self | calls.rb:326:5:328:7 | instance |
 | calls.rb:327:14:327:26 | "C1#instance" | calls.rb:326:5:328:7 | instance |
 | calls.rb:327:15:327:25 | C1#instance | calls.rb:326:5:328:7 | instance |
+| calls.rb:331:9:331:12 | ... | calls.rb:330:5:332:7 | return_self |
 | calls.rb:331:9:331:12 | self | calls.rb:330:5:332:7 | return_self |
+| calls.rb:337:9:337:26 | ... | calls.rb:336:5:338:7 | instance |
 | calls.rb:337:9:337:26 | call to puts | calls.rb:336:5:338:7 | instance |
 | calls.rb:337:9:337:26 | self | calls.rb:336:5:338:7 | instance |
 | calls.rb:337:14:337:26 | "C2#instance" | calls.rb:336:5:338:7 | instance |
 | calls.rb:337:15:337:25 | C2#instance | calls.rb:336:5:338:7 | instance |
+| calls.rb:343:9:343:26 | ... | calls.rb:342:5:344:7 | instance |
 | calls.rb:343:9:343:26 | call to puts | calls.rb:342:5:344:7 | instance |
 | calls.rb:343:9:343:26 | self | calls.rb:342:5:344:7 | instance |
 | calls.rb:343:14:343:26 | "C3#instance" | calls.rb:342:5:344:7 | instance |
@@ -915,6 +957,7 @@ enclosingMethod
 | calls.rb:347:22:347:22 | x | calls.rb:347:1:363:3 | pattern_dispatch |
 | calls.rb:347:22:347:22 | x | calls.rb:347:1:363:3 | pattern_dispatch |
 | calls.rb:348:5:356:7 | case ... | calls.rb:347:1:363:3 | pattern_dispatch |
+| calls.rb:348:5:362:7 | ... | calls.rb:347:1:363:3 | pattern_dispatch |
 | calls.rb:348:10:348:10 | x | calls.rb:347:1:363:3 | pattern_dispatch |
 | calls.rb:349:5:350:18 | when ... | calls.rb:347:1:363:3 | pattern_dispatch |
 | calls.rb:349:10:349:11 | C3 | calls.rb:347:1:363:3 | pattern_dispatch |
@@ -955,89 +998,111 @@ enclosingMethod
 | calls.rb:361:26:361:36 | call to instance | calls.rb:347:1:363:3 | pattern_dispatch |
 | calls.rb:374:19:374:19 | x | calls.rb:374:1:378:3 | add_singleton |
 | calls.rb:374:19:374:19 | x | calls.rb:374:1:378:3 | add_singleton |
+| calls.rb:375:5:377:7 | ... | calls.rb:374:1:378:3 | add_singleton |
 | calls.rb:375:5:377:7 | instance | calls.rb:374:1:378:3 | add_singleton |
 | calls.rb:375:9:375:9 | x | calls.rb:374:1:378:3 | add_singleton |
+| calls.rb:376:9:376:28 | ... | calls.rb:375:5:377:7 | instance |
 | calls.rb:376:9:376:28 | call to puts | calls.rb:375:5:377:7 | instance |
 | calls.rb:376:9:376:28 | self | calls.rb:375:5:377:7 | instance |
 | calls.rb:376:14:376:28 | "instance_on x" | calls.rb:375:5:377:7 | instance |
 | calls.rb:376:15:376:27 | instance_on x | calls.rb:375:5:377:7 | instance |
+| calls.rb:388:13:388:48 | ... | calls.rb:387:9:389:11 | singleton1 |
 | calls.rb:388:13:388:48 | call to puts | calls.rb:387:9:389:11 | singleton1 |
 | calls.rb:388:13:388:48 | self | calls.rb:387:9:389:11 | singleton1 |
 | calls.rb:388:18:388:48 | "SingletonOverride1#singleton1" | calls.rb:387:9:389:11 | singleton1 |
 | calls.rb:388:19:388:47 | SingletonOverride1#singleton1 | calls.rb:387:9:389:11 | singleton1 |
+| calls.rb:392:13:392:22 | ... | calls.rb:391:9:393:11 | call_singleton1 |
 | calls.rb:392:13:392:22 | call to singleton1 | calls.rb:391:9:393:11 | call_singleton1 |
 | calls.rb:392:13:392:22 | self | calls.rb:391:9:393:11 | call_singleton1 |
 | calls.rb:396:13:396:16 | self | calls.rb:395:9:397:11 | factory |
 | calls.rb:396:13:396:20 | call to new | calls.rb:395:9:397:11 | factory |
+| calls.rb:396:13:396:30 | ... | calls.rb:395:9:397:11 | factory |
 | calls.rb:396:13:396:30 | call to instance1 | calls.rb:395:9:397:11 | factory |
+| calls.rb:401:9:401:44 | ... | calls.rb:400:5:402:7 | singleton2 |
 | calls.rb:401:9:401:44 | call to puts | calls.rb:400:5:402:7 | singleton2 |
 | calls.rb:401:9:401:44 | self | calls.rb:400:5:402:7 | singleton2 |
 | calls.rb:401:14:401:44 | "SingletonOverride1#singleton2" | calls.rb:400:5:402:7 | singleton2 |
 | calls.rb:401:15:401:43 | SingletonOverride1#singleton2 | calls.rb:400:5:402:7 | singleton2 |
+| calls.rb:405:9:405:18 | ... | calls.rb:404:5:406:7 | call_singleton2 |
 | calls.rb:405:9:405:18 | call to singleton2 | calls.rb:404:5:406:7 | call_singleton2 |
 | calls.rb:405:9:405:18 | self | calls.rb:404:5:406:7 | call_singleton2 |
+| calls.rb:411:9:411:43 | ... | calls.rb:410:5:412:7 | instance1 |
 | calls.rb:411:9:411:43 | call to puts | calls.rb:410:5:412:7 | instance1 |
 | calls.rb:411:9:411:43 | self | calls.rb:410:5:412:7 | instance1 |
 | calls.rb:411:14:411:43 | "SingletonOverride1#instance1" | calls.rb:410:5:412:7 | instance1 |
 | calls.rb:411:15:411:42 | SingletonOverride1#instance1 | calls.rb:410:5:412:7 | instance1 |
+| calls.rb:423:13:423:48 | ... | calls.rb:422:9:424:11 | singleton1 |
 | calls.rb:423:13:423:48 | call to puts | calls.rb:422:9:424:11 | singleton1 |
 | calls.rb:423:13:423:48 | self | calls.rb:422:9:424:11 | singleton1 |
 | calls.rb:423:18:423:48 | "SingletonOverride2#singleton1" | calls.rb:422:9:424:11 | singleton1 |
 | calls.rb:423:19:423:47 | SingletonOverride2#singleton1 | calls.rb:422:9:424:11 | singleton1 |
+| calls.rb:428:9:428:44 | ... | calls.rb:427:5:429:7 | singleton2 |
 | calls.rb:428:9:428:44 | call to puts | calls.rb:427:5:429:7 | singleton2 |
 | calls.rb:428:9:428:44 | self | calls.rb:427:5:429:7 | singleton2 |
 | calls.rb:428:14:428:44 | "SingletonOverride2#singleton2" | calls.rb:427:5:429:7 | singleton2 |
 | calls.rb:428:15:428:43 | SingletonOverride2#singleton2 | calls.rb:427:5:429:7 | singleton2 |
+| calls.rb:432:9:432:43 | ... | calls.rb:431:5:433:7 | instance1 |
 | calls.rb:432:9:432:43 | call to puts | calls.rb:431:5:433:7 | instance1 |
 | calls.rb:432:9:432:43 | self | calls.rb:431:5:433:7 | instance1 |
 | calls.rb:432:14:432:43 | "SingletonOverride2#instance1" | calls.rb:431:5:433:7 | instance1 |
 | calls.rb:432:15:432:42 | SingletonOverride2#instance1 | calls.rb:431:5:433:7 | instance1 |
+| calls.rb:444:13:444:48 | ... | calls.rb:443:9:445:11 | m1 |
 | calls.rb:444:13:444:48 | call to puts | calls.rb:443:9:445:11 | m1 |
 | calls.rb:444:13:444:48 | self | calls.rb:443:9:445:11 | m1 |
 | calls.rb:444:18:444:48 | "ConditionalInstanceMethods#m1" | calls.rb:443:9:445:11 | m1 |
 | calls.rb:444:19:444:47 | ConditionalInstanceMethods#m1 | calls.rb:443:9:445:11 | m1 |
 | calls.rb:449:9:449:44 | call to puts | calls.rb:448:5:460:7 | m2 |
 | calls.rb:449:9:449:44 | self | calls.rb:448:5:460:7 | m2 |
+| calls.rb:449:9:459:10 | ... | calls.rb:448:5:460:7 | m2 |
 | calls.rb:449:14:449:44 | "ConditionalInstanceMethods#m2" | calls.rb:448:5:460:7 | m2 |
 | calls.rb:449:15:449:43 | ConditionalInstanceMethods#m2 | calls.rb:448:5:460:7 | m2 |
 | calls.rb:451:9:457:11 | m3 | calls.rb:448:5:460:7 | m2 |
 | calls.rb:452:13:452:48 | call to puts | calls.rb:451:9:457:11 | m3 |
 | calls.rb:452:13:452:48 | self | calls.rb:451:9:457:11 | m3 |
+| calls.rb:452:13:456:15 | ... | calls.rb:451:9:457:11 | m3 |
 | calls.rb:452:18:452:48 | "ConditionalInstanceMethods#m3" | calls.rb:451:9:457:11 | m3 |
 | calls.rb:452:19:452:47 | ConditionalInstanceMethods#m3 | calls.rb:451:9:457:11 | m3 |
 | calls.rb:454:13:456:15 | m4 | calls.rb:451:9:457:11 | m3 |
+| calls.rb:455:17:455:52 | ... | calls.rb:454:13:456:15 | m4 |
 | calls.rb:455:17:455:52 | call to puts | calls.rb:454:13:456:15 | m4 |
 | calls.rb:455:17:455:52 | self | calls.rb:454:13:456:15 | m4 |
 | calls.rb:455:22:455:52 | "ConditionalInstanceMethods#m4" | calls.rb:454:13:456:15 | m4 |
 | calls.rb:455:23:455:51 | ConditionalInstanceMethods#m4 | calls.rb:454:13:456:15 | m4 |
 | calls.rb:459:9:459:10 | call to m3 | calls.rb:448:5:460:7 | m2 |
 | calls.rb:459:9:459:10 | self | calls.rb:448:5:460:7 | m2 |
+| calls.rb:465:17:465:40 | ... | calls.rb:464:13:466:15 | m5 |
 | calls.rb:465:17:465:40 | call to puts | calls.rb:464:13:466:15 | m5 |
 | calls.rb:465:17:465:40 | self | calls.rb:464:13:466:15 | m5 |
 | calls.rb:465:22:465:40 | "AnonymousClass#m5" | calls.rb:464:13:466:15 | m5 |
 | calls.rb:465:23:465:39 | AnonymousClass#m5 | calls.rb:464:13:466:15 | m5 |
+| calls.rb:481:13:481:22 | ... | calls.rb:480:9:482:11 | foo |
 | calls.rb:481:13:481:22 | call to puts | calls.rb:480:9:482:11 | foo |
 | calls.rb:481:13:481:22 | self | calls.rb:480:9:482:11 | foo |
 | calls.rb:481:18:481:22 | "foo" | calls.rb:480:9:482:11 | foo |
 | calls.rb:481:19:481:21 | foo | calls.rb:480:9:482:11 | foo |
+| calls.rb:487:13:487:22 | ... | calls.rb:486:9:488:11 | bar |
 | calls.rb:487:13:487:22 | call to puts | calls.rb:486:9:488:11 | bar |
 | calls.rb:487:13:487:22 | self | calls.rb:486:9:488:11 | bar |
 | calls.rb:487:18:487:22 | "bar" | calls.rb:486:9:488:11 | bar |
 | calls.rb:487:19:487:21 | bar | calls.rb:486:9:488:11 | bar |
+| calls.rb:506:9:506:46 | ... | calls.rb:505:5:507:7 | singleton |
 | calls.rb:506:9:506:46 | call to puts | calls.rb:505:5:507:7 | singleton |
 | calls.rb:506:9:506:46 | self | calls.rb:505:5:507:7 | singleton |
 | calls.rb:506:14:506:46 | "ExtendSingletonMethod#singleton" | calls.rb:505:5:507:7 | singleton |
 | calls.rb:506:15:506:45 | ExtendSingletonMethod#singleton | calls.rb:505:5:507:7 | singleton |
+| calls.rb:535:9:535:42 | ... | calls.rb:534:15:536:7 | foo |
 | calls.rb:535:9:535:42 | call to puts | calls.rb:534:15:536:7 | foo |
 | calls.rb:535:9:535:42 | self | calls.rb:534:15:536:7 | foo |
 | calls.rb:535:14:535:42 | "ProtectedMethodInModule#foo" | calls.rb:534:15:536:7 | foo |
 | calls.rb:535:15:535:41 | ProtectedMethodInModule#foo | calls.rb:534:15:536:7 | foo |
+| calls.rb:543:9:543:35 | ... | calls.rb:542:15:544:7 | bar |
 | calls.rb:543:9:543:35 | call to puts | calls.rb:542:15:544:7 | bar |
 | calls.rb:543:9:543:35 | self | calls.rb:542:15:544:7 | bar |
 | calls.rb:543:14:543:35 | "ProtectedMethods#bar" | calls.rb:542:15:544:7 | bar |
 | calls.rb:543:15:543:34 | ProtectedMethods#bar | calls.rb:542:15:544:7 | bar |
 | calls.rb:547:9:547:11 | call to foo | calls.rb:546:5:551:7 | baz |
 | calls.rb:547:9:547:11 | self | calls.rb:546:5:551:7 | baz |
+| calls.rb:547:9:550:32 | ... | calls.rb:546:5:551:7 | baz |
 | calls.rb:548:9:548:11 | call to bar | calls.rb:546:5:551:7 | baz |
 | calls.rb:548:9:548:11 | self | calls.rb:546:5:551:7 | baz |
 | calls.rb:549:9:549:24 | ProtectedMethods | calls.rb:546:5:551:7 | baz |
@@ -1048,28 +1113,39 @@ enclosingMethod
 | calls.rb:550:9:550:32 | call to bar | calls.rb:546:5:551:7 | baz |
 | calls.rb:560:9:560:11 | call to foo | calls.rb:559:5:562:7 | baz |
 | calls.rb:560:9:560:11 | self | calls.rb:559:5:562:7 | baz |
+| calls.rb:560:9:561:35 | ... | calls.rb:559:5:562:7 | baz |
 | calls.rb:561:9:561:27 | ProtectedMethodsSub | calls.rb:559:5:562:7 | baz |
 | calls.rb:561:9:561:31 | call to new | calls.rb:559:5:562:7 | baz |
 | calls.rb:561:9:561:35 | call to foo | calls.rb:559:5:562:7 | baz |
 | calls.rb:580:9:580:17 | call to singleton | calls.rb:579:5:582:7 | mid_method |
 | calls.rb:580:9:580:17 | self | calls.rb:579:5:582:7 | mid_method |
+| calls.rb:580:9:581:35 | ... | calls.rb:579:5:582:7 | mid_method |
 | calls.rb:581:9:581:18 | call to singleton2 | calls.rb:579:5:582:7 | mid_method |
 | calls.rb:581:9:581:18 | self | calls.rb:579:5:582:7 | mid_method |
+| calls.rb:596:9:596:18 | ... | calls.rb:595:5:597:7 | call_singleton1 |
 | calls.rb:596:9:596:18 | call to singleton1 | calls.rb:595:5:597:7 | call_singleton1 |
 | calls.rb:596:9:596:18 | self | calls.rb:595:5:597:7 | call_singleton1 |
+| calls.rb:600:9:600:23 | ... | calls.rb:599:5:601:7 | call_call_singleton1 |
 | calls.rb:600:9:600:23 | call to call_singleton1 | calls.rb:599:5:601:7 | call_call_singleton1 |
 | calls.rb:600:9:600:23 | self | calls.rb:599:5:601:7 | call_call_singleton1 |
 | calls.rb:609:9:609:18 | call to singleton1 | calls.rb:608:5:610:7 | call_singleton1 |
 | calls.rb:609:9:609:18 | self | calls.rb:608:5:610:7 | call_singleton1 |
+| calls.rb:609:9:609:105 | ... | calls.rb:608:5:610:7 | call_singleton1 |
 | calls.rb:618:9:618:18 | call to singleton1 | calls.rb:617:5:619:7 | call_singleton1 |
 | calls.rb:618:9:618:18 | self | calls.rb:617:5:619:7 | call_singleton1 |
+| calls.rb:618:9:618:105 | ... | calls.rb:617:5:619:7 | call_singleton1 |
 | calls.rb:628:9:628:12 | self | calls.rb:627:5:629:7 | foo |
+| calls.rb:628:9:628:16 | ... | calls.rb:627:5:629:7 | foo |
 | calls.rb:628:9:628:16 | call to bar | calls.rb:627:5:629:7 | foo |
+| calls.rb:637:9:637:13 | ... | calls.rb:636:5:638:7 | bar |
 | calls.rb:637:9:637:13 | super call to bar | calls.rb:636:5:638:7 | bar |
 | calls.rb:643:9:643:10 | C1 | calls.rb:642:5:644:7 | new |
+| calls.rb:643:9:643:14 | ... | calls.rb:642:5:644:7 | new |
 | calls.rb:643:9:643:14 | call to new | calls.rb:642:5:644:7 | new |
 | calls.rb:651:9:651:12 | self | calls.rb:650:5:652:7 | new |
+| calls.rb:651:9:651:21 | ... | calls.rb:650:5:652:7 | new |
 | calls.rb:651:9:651:21 | call to allocate | calls.rb:650:5:652:7 | new |
+| calls.rb:655:9:655:34 | ... | calls.rb:654:5:656:7 | instance |
 | calls.rb:655:9:655:34 | call to puts | calls.rb:654:5:656:7 | instance |
 | calls.rb:655:9:655:34 | self | calls.rb:654:5:656:7 | instance |
 | calls.rb:655:14:655:34 | "CustomNew2#instance" | calls.rb:654:5:656:7 | instance |
@@ -1079,27 +1155,34 @@ enclosingMethod
 | calls.rb:662:5:662:11 | Array | calls.rb:661:1:665:3 | capture_parameter |
 | calls.rb:662:5:662:11 | [...] | calls.rb:661:1:665:3 | capture_parameter |
 | calls.rb:662:5:662:11 | call to [] | calls.rb:661:1:665:3 | capture_parameter |
+| calls.rb:662:5:664:7 | ... | calls.rb:661:1:665:3 | capture_parameter |
 | calls.rb:662:5:664:7 | call to each | calls.rb:661:1:665:3 | capture_parameter |
 | calls.rb:662:6:662:6 | 0 | calls.rb:661:1:665:3 | capture_parameter |
 | calls.rb:662:8:662:8 | 1 | calls.rb:661:1:665:3 | capture_parameter |
 | calls.rb:662:10:662:10 | 2 | calls.rb:661:1:665:3 | capture_parameter |
 | calls.rb:662:18:664:7 | do ... end | calls.rb:661:1:665:3 | capture_parameter |
+| calls.rb:663:9:663:9 | ... | calls.rb:661:1:665:3 | capture_parameter |
 | calls.rb:663:9:663:9 | x | calls.rb:661:1:665:3 | capture_parameter |
 | element_reference.rb:2:12:2:12 | x | element_reference.rb:2:5:4:7 | [] |
 | element_reference.rb:2:12:2:12 | x | element_reference.rb:2:5:4:7 | [] |
+| element_reference.rb:3:9:3:19 | ... | element_reference.rb:2:5:4:7 | [] |
 | element_reference.rb:3:9:3:19 | yield ... | element_reference.rb:2:5:4:7 | [] |
 | element_reference.rb:3:15:3:15 | x | element_reference.rb:2:5:4:7 | [] |
 | element_reference.rb:3:15:3:19 | ... + ... | element_reference.rb:2:5:4:7 | [] |
 | element_reference.rb:3:19:3:19 | 1 | element_reference.rb:2:5:4:7 | [] |
+| hello.rb:3:9:3:22 | ... | hello.rb:2:5:4:7 | hello |
 | hello.rb:3:9:3:22 | return | hello.rb:2:5:4:7 | hello |
 | hello.rb:3:16:3:22 | "hello" | hello.rb:2:5:4:7 | hello |
 | hello.rb:3:17:3:21 | hello | hello.rb:2:5:4:7 | hello |
+| hello.rb:6:9:6:22 | ... | hello.rb:5:5:7:7 | world |
 | hello.rb:6:9:6:22 | return | hello.rb:5:5:7:7 | world |
 | hello.rb:6:16:6:22 | "world" | hello.rb:5:5:7:7 | world |
 | hello.rb:6:17:6:21 | world | hello.rb:5:5:7:7 | world |
+| hello.rb:14:9:14:20 | ... | hello.rb:13:5:15:7 | message |
 | hello.rb:14:9:14:20 | return | hello.rb:13:5:15:7 | message |
 | hello.rb:14:16:14:20 | call to hello | hello.rb:13:5:15:7 | message |
 | hello.rb:14:16:14:20 | self | hello.rb:13:5:15:7 | message |
+| hello.rb:20:9:20:40 | ... | hello.rb:19:5:21:7 | message |
 | hello.rb:20:9:20:40 | return | hello.rb:19:5:21:7 | message |
 | hello.rb:20:16:20:20 | super call to message | hello.rb:19:5:21:7 | message |
 | hello.rb:20:16:20:26 | ... + ... | hello.rb:19:5:21:7 | message |
@@ -1113,32 +1196,40 @@ enclosingMethod
 | hello.rb:20:39:20:39 | ! | hello.rb:19:5:21:7 | message |
 | instance_fields.rb:4:13:4:18 | @field | instance_fields.rb:3:9:5:11 | create |
 | instance_fields.rb:4:13:4:18 | self | instance_fields.rb:3:9:5:11 | create |
+| instance_fields.rb:4:13:4:35 | ... | instance_fields.rb:3:9:5:11 | create |
 | instance_fields.rb:4:13:4:35 | ... = ... | instance_fields.rb:3:9:5:11 | create |
 | instance_fields.rb:4:22:4:31 | A_target | instance_fields.rb:3:9:5:11 | create |
 | instance_fields.rb:4:22:4:35 | call to new | instance_fields.rb:3:9:5:11 | create |
 | instance_fields.rb:7:13:7:18 | @field | instance_fields.rb:6:9:8:11 | use |
 | instance_fields.rb:7:13:7:18 | self | instance_fields.rb:6:9:8:11 | use |
+| instance_fields.rb:7:13:7:25 | ... | instance_fields.rb:6:9:8:11 | use |
 | instance_fields.rb:7:13:7:25 | call to target | instance_fields.rb:6:9:8:11 | use |
 | instance_fields.rb:19:13:19:18 | @field | instance_fields.rb:18:9:20:11 | create |
 | instance_fields.rb:19:13:19:18 | self | instance_fields.rb:18:9:20:11 | create |
+| instance_fields.rb:19:13:19:35 | ... | instance_fields.rb:18:9:20:11 | create |
 | instance_fields.rb:19:13:19:35 | ... = ... | instance_fields.rb:18:9:20:11 | create |
 | instance_fields.rb:19:22:19:31 | B_target | instance_fields.rb:18:9:20:11 | create |
 | instance_fields.rb:19:22:19:35 | call to new | instance_fields.rb:18:9:20:11 | create |
 | instance_fields.rb:22:13:22:18 | @field | instance_fields.rb:21:9:23:11 | use |
 | instance_fields.rb:22:13:22:18 | self | instance_fields.rb:21:9:23:11 | use |
+| instance_fields.rb:22:13:22:25 | ... | instance_fields.rb:21:9:23:11 | use |
 | instance_fields.rb:22:13:22:25 | call to target | instance_fields.rb:21:9:23:11 | use |
+| private.rb:84:7:84:32 | ... | private.rb:83:11:85:5 | m1 |
 | private.rb:84:7:84:32 | call to puts | private.rb:83:11:85:5 | m1 |
 | private.rb:84:7:84:32 | self | private.rb:83:11:85:5 | m1 |
 | private.rb:84:12:84:32 | "PrivateOverride1#m1" | private.rb:83:11:85:5 | m1 |
 | private.rb:84:13:84:31 | PrivateOverride1#m1 | private.rb:83:11:85:5 | m1 |
+| private.rb:88:7:88:32 | ... | private.rb:87:11:89:5 | m2 |
 | private.rb:88:7:88:32 | call to puts | private.rb:87:11:89:5 | m2 |
 | private.rb:88:7:88:32 | self | private.rb:87:11:89:5 | m2 |
 | private.rb:88:12:88:32 | "PrivateOverride1#m2" | private.rb:87:11:89:5 | m2 |
 | private.rb:88:13:88:31 | PrivateOverride1#m2 | private.rb:87:11:89:5 | m2 |
+| private.rb:92:7:92:8 | ... | private.rb:91:3:93:5 | call_m1 |
 | private.rb:92:7:92:8 | call to m1 | private.rb:91:3:93:5 | call_m1 |
 | private.rb:92:7:92:8 | self | private.rb:91:3:93:5 | call_m1 |
 | private.rb:98:7:98:32 | call to puts | private.rb:97:11:101:5 | m1 |
 | private.rb:98:7:98:32 | self | private.rb:97:11:101:5 | m1 |
+| private.rb:98:7:100:45 | ... | private.rb:97:11:101:5 | m1 |
 | private.rb:98:12:98:32 | "PrivateOverride2#m1" | private.rb:97:11:101:5 | m1 |
 | private.rb:98:13:98:31 | PrivateOverride2#m1 | private.rb:97:11:101:5 | m1 |
 | private.rb:99:7:99:8 | call to m2 | private.rb:97:11:101:5 | m1 |
@@ -1148,11 +1239,15 @@ enclosingMethod
 | private.rb:100:7:100:29 | call to m1 | private.rb:97:11:101:5 | m1 |
 | toplevel_self_singleton.rb:10:9:10:27 | call to ab_singleton_method | toplevel_self_singleton.rb:9:5:11:7 | method_in_block |
 | toplevel_self_singleton.rb:10:9:10:27 | self | toplevel_self_singleton.rb:9:5:11:7 | method_in_block |
+| toplevel_self_singleton.rb:10:9:10:60 | ... | toplevel_self_singleton.rb:9:5:11:7 | method_in_block |
 | toplevel_self_singleton.rb:14:9:14:27 | call to ab_singleton_method | toplevel_self_singleton.rb:13:5:15:7 | method_in_block |
 | toplevel_self_singleton.rb:14:9:14:27 | self | toplevel_self_singleton.rb:13:5:15:7 | method_in_block |
+| toplevel_self_singleton.rb:14:9:14:60 | ... | toplevel_self_singleton.rb:13:5:15:7 | method_in_block |
 | toplevel_self_singleton.rb:20:9:20:27 | call to ab_singleton_method | toplevel_self_singleton.rb:19:5:21:7 | method_in_struct |
 | toplevel_self_singleton.rb:20:9:20:27 | self | toplevel_self_singleton.rb:19:5:21:7 | method_in_struct |
+| toplevel_self_singleton.rb:20:9:20:60 | ... | toplevel_self_singleton.rb:19:5:21:7 | method_in_struct |
 | toplevel_self_singleton.rb:30:13:30:19 | call to call_me | toplevel_self_singleton.rb:29:9:32:11 | call_you |
 | toplevel_self_singleton.rb:30:13:30:19 | self | toplevel_self_singleton.rb:29:9:32:11 | call_you |
+| toplevel_self_singleton.rb:30:13:31:20 | ... | toplevel_self_singleton.rb:29:9:32:11 | call_you |
 | toplevel_self_singleton.rb:31:13:31:20 | call to call_you | toplevel_self_singleton.rb:29:9:32:11 | call_you |
 | toplevel_self_singleton.rb:31:13:31:20 | self | toplevel_self_singleton.rb:29:9:32:11 | call_you |
diff --git a/ruby/ql/test/library-tests/modules/modules.expected b/ruby/ql/test/library-tests/modules/modules.expected
index 967e90decaa6..09a2236772a3 100644
--- a/ruby/ql/test/library-tests/modules/modules.expected
+++ b/ruby/ql/test/library-tests/modules/modules.expected
@@ -571,6 +571,7 @@ resolveConstantWriteAccess
 | unresolved_subclass.rb:21:1:22:3 | A | UnresolvedNamespace::X1::X2::X3::A |
 enclosingModule
 | calls.rb:1:1:3:3 | foo | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:2:5:2:14 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:2:5:2:14 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:2:5:2:14 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:2:10:2:14 | "foo" | calls.rb:1:1:667:52 | calls.rb |
@@ -579,6 +580,7 @@ enclosingModule
 | calls.rb:5:1:5:3 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:7:1:9:3 | bar | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:7:5:7:8 | self | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:8:5:8:15 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:8:5:8:15 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:8:5:8:15 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:8:10:8:15 | "bar1" | calls.rb:1:1:667:52 | calls.rb |
@@ -587,6 +589,7 @@ enclosingModule
 | calls.rb:11:1:11:8 | call to bar | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:13:1:15:3 | bar | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:13:5:13:8 | self | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:14:5:14:15 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:14:5:14:15 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:14:5:14:15 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:14:10:14:15 | "bar2" | calls.rb:1:1:667:52 | calls.rb |
@@ -599,10 +602,12 @@ enclosingModule
 | calls.rb:22:5:24:7 | instance_m | calls.rb:21:1:34:3 | M |
 | calls.rb:23:9:23:19 | call to singleton_m | calls.rb:21:1:34:3 | M |
 | calls.rb:23:9:23:19 | self | calls.rb:21:1:34:3 | M |
+| calls.rb:23:9:23:35 | ... | calls.rb:21:1:34:3 | M |
 | calls.rb:25:5:27:7 | singleton_m | calls.rb:21:1:34:3 | M |
 | calls.rb:25:9:25:12 | self | calls.rb:21:1:34:3 | M |
 | calls.rb:26:9:26:18 | call to instance_m | calls.rb:21:1:34:3 | M |
 | calls.rb:26:9:26:18 | self | calls.rb:21:1:34:3 | M |
+| calls.rb:26:9:26:34 | ... | calls.rb:21:1:34:3 | M |
 | calls.rb:29:5:29:14 | call to instance_m | calls.rb:21:1:34:3 | M |
 | calls.rb:29:5:29:14 | self | calls.rb:21:1:34:3 | M |
 | calls.rb:30:5:30:8 | self | calls.rb:21:1:34:3 | M |
@@ -618,6 +623,7 @@ enclosingModule
 | calls.rb:39:1:41:3 | call_instance_m | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:40:5:40:14 | call to instance_m | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:40:5:40:14 | self | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:40:5:40:30 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:43:1:58:3 | C | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:44:5:44:13 | call to include | calls.rb:43:1:58:3 | C |
 | calls.rb:44:5:44:13 | self | calls.rb:43:1:58:3 | C |
@@ -633,6 +639,7 @@ enclosingModule
 | calls.rb:51:5:57:7 | baz | calls.rb:43:1:58:3 | C |
 | calls.rb:52:9:52:18 | call to instance_m | calls.rb:43:1:58:3 | C |
 | calls.rb:52:9:52:18 | self | calls.rb:43:1:58:3 | C |
+| calls.rb:52:9:56:40 | ... | calls.rb:43:1:58:3 | C |
 | calls.rb:53:9:53:12 | self | calls.rb:43:1:58:3 | C |
 | calls.rb:53:9:53:23 | call to instance_m | calls.rb:43:1:58:3 | C |
 | calls.rb:55:9:55:19 | call to singleton_m | calls.rb:43:1:58:3 | C |
@@ -652,6 +659,7 @@ enclosingModule
 | calls.rb:65:1:69:3 | D | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:65:11:65:11 | C | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:66:5:68:7 | baz | calls.rb:65:1:69:3 | D |
+| calls.rb:67:9:67:13 | ... | calls.rb:65:1:69:3 | D |
 | calls.rb:67:9:67:13 | super call to baz | calls.rb:65:1:69:3 | D |
 | calls.rb:71:1:71:1 | d | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:71:1:71:9 | ... = ... | calls.rb:1:1:667:52 | calls.rb |
@@ -672,14 +680,17 @@ enclosingModule
 | calls.rb:76:28:76:28 | 5 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:77:5:77:5 | a | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:77:5:77:16 | call to bit_length | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:77:5:78:16 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:78:5:78:5 | b | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:78:5:78:16 | call to bit_length | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:81:1:83:3 | call_block | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:82:5:82:11 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:82:5:82:11 | yield ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:82:11:82:11 | 1 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:85:1:89:3 | foo | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:86:5:86:7 | var | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:86:5:86:18 | ... = ... | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:86:5:88:29 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:86:11:86:14 | Hash | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:86:11:86:18 | call to new | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:87:5:87:7 | var | calls.rb:1:1:667:52 | calls.rb |
@@ -691,6 +702,7 @@ enclosingModule
 | calls.rb:88:19:88:19 | x | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:88:19:88:19 | x | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:88:22:88:24 | var | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:88:22:88:27 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:88:22:88:27 | ...[...] | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:88:26:88:26 | x | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:91:1:94:3 | Integer | calls.rb:1:1:667:52 | calls.rb |
@@ -707,6 +719,7 @@ enclosingModule
 | calls.rb:102:5:102:30 | puts | calls.rb:100:1:103:3 | Kernel |
 | calls.rb:102:14:102:14 | x | calls.rb:100:1:103:3 | Kernel |
 | calls.rb:102:14:102:14 | x | calls.rb:100:1:103:3 | Kernel |
+| calls.rb:102:17:102:26 | ... | calls.rb:100:1:103:3 | Kernel |
 | calls.rb:102:17:102:26 | call to old_puts | calls.rb:100:1:103:3 | Kernel |
 | calls.rb:102:17:102:26 | self | calls.rb:100:1:103:3 | Kernel |
 | calls.rb:102:26:102:26 | x | calls.rb:100:1:103:3 | Kernel |
@@ -720,6 +733,7 @@ enclosingModule
 | calls.rb:108:5:110:7 | include | calls.rb:105:1:113:3 | Module |
 | calls.rb:108:17:108:17 | x | calls.rb:105:1:113:3 | Module |
 | calls.rb:108:17:108:17 | x | calls.rb:105:1:113:3 | Module |
+| calls.rb:109:9:109:21 | ... | calls.rb:105:1:113:3 | Module |
 | calls.rb:109:9:109:21 | call to old_include | calls.rb:105:1:113:3 | Module |
 | calls.rb:109:9:109:21 | self | calls.rb:105:1:113:3 | Module |
 | calls.rb:109:21:109:21 | x | calls.rb:105:1:113:3 | Module |
@@ -740,6 +754,7 @@ enclosingModule
 | calls.rb:122:5:122:31 | [] | calls.rb:120:1:123:3 | Hash |
 | calls.rb:122:12:122:12 | x | calls.rb:120:1:123:3 | Hash |
 | calls.rb:122:12:122:12 | x | calls.rb:120:1:123:3 | Hash |
+| calls.rb:122:15:122:27 | ... | calls.rb:120:1:123:3 | Hash |
 | calls.rb:122:15:122:27 | call to old_lookup | calls.rb:120:1:123:3 | Hash |
 | calls.rb:122:15:122:27 | self | calls.rb:120:1:123:3 | Hash |
 | calls.rb:122:26:122:26 | x | calls.rb:120:1:123:3 | Hash |
@@ -752,6 +767,7 @@ enclosingModule
 | calls.rb:127:3:127:29 | [] | calls.rb:125:1:138:3 | Array |
 | calls.rb:127:10:127:10 | x | calls.rb:125:1:138:3 | Array |
 | calls.rb:127:10:127:10 | x | calls.rb:125:1:138:3 | Array |
+| calls.rb:127:13:127:25 | ... | calls.rb:125:1:138:3 | Array |
 | calls.rb:127:13:127:25 | call to old_lookup | calls.rb:125:1:138:3 | Array |
 | calls.rb:127:13:127:25 | self | calls.rb:125:1:138:3 | Array |
 | calls.rb:127:24:127:24 | x | calls.rb:125:1:138:3 | Array |
@@ -761,6 +777,7 @@ enclosingModule
 | calls.rb:131:16:131:19 | body | calls.rb:125:1:138:3 | Array |
 | calls.rb:132:5:132:5 | x | calls.rb:125:1:138:3 | Array |
 | calls.rb:132:5:132:9 | ... = ... | calls.rb:125:1:138:3 | Array |
+| calls.rb:132:5:136:7 | ... | calls.rb:125:1:138:3 | Array |
 | calls.rb:132:9:132:9 | 0 | calls.rb:125:1:138:3 | Array |
 | calls.rb:133:5:136:7 | while ... | calls.rb:125:1:138:3 | Array |
 | calls.rb:133:11:133:11 | x | calls.rb:125:1:138:3 | Array |
@@ -780,6 +797,7 @@ enclosingModule
 | calls.rb:135:11:135:12 | ... + ... | calls.rb:125:1:138:3 | Array |
 | calls.rb:135:14:135:14 | 1 | calls.rb:125:1:138:3 | Array |
 | calls.rb:140:1:142:3 | funny | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:141:5:141:20 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:141:5:141:20 | yield ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:141:11:141:20 | "prefix: " | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:141:12:141:19 | prefix:  | calls.rb:1:1:667:52 | calls.rb |
@@ -788,6 +806,7 @@ enclosingModule
 | calls.rb:144:7:144:30 | { ... } | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:144:10:144:10 | i | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:144:10:144:10 | i | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:144:13:144:29 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:144:13:144:29 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:144:13:144:29 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:144:18:144:18 | i | calls.rb:1:1:667:52 | calls.rb |
@@ -814,6 +833,7 @@ enclosingModule
 | calls.rb:150:26:150:26 | i | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:150:29:150:29 | v | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:150:29:150:29 | v | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:150:32:150:61 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:150:32:150:61 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:150:32:150:61 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:150:37:150:61 | "#{...} -> #{...}" | calls.rb:1:1:667:52 | calls.rb |
@@ -834,6 +854,7 @@ enclosingModule
 | calls.rb:152:20:152:20 | i | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:152:20:152:20 | i | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:152:23:152:23 | i | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:152:23:152:34 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:152:23:152:34 | call to bit_length | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:154:1:154:7 | Array | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:154:1:154:7 | [...] | calls.rb:1:1:667:52 | calls.rb |
@@ -845,6 +866,7 @@ enclosingModule
 | calls.rb:154:17:154:40 | { ... } | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:154:20:154:20 | i | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:154:20:154:20 | i | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:154:23:154:39 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:154:23:154:39 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:154:23:154:39 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:154:28:154:28 | i | calls.rb:1:1:667:52 | calls.rb |
@@ -862,6 +884,7 @@ enclosingModule
 | calls.rb:156:21:156:21 | _ | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:156:24:156:24 | v | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:156:24:156:24 | v | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:156:27:156:36 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:156:27:156:36 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:156:27:156:36 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:156:32:156:32 | v | calls.rb:1:1:667:52 | calls.rb |
@@ -869,6 +892,7 @@ enclosingModule
 | calls.rb:158:1:160:3 | indirect | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:158:14:158:15 | &b | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:158:15:158:15 | b | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:159:5:159:17 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:159:5:159:17 | call to call_block | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:159:5:159:17 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:159:16:159:17 | &... | calls.rb:1:1:667:52 | calls.rb |
@@ -879,10 +903,12 @@ enclosingModule
 | calls.rb:162:13:162:13 | i | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:162:13:162:13 | i | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:162:16:162:16 | i | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:162:16:162:27 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:162:16:162:27 | call to bit_length | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:165:1:169:3 | S | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:166:5:168:7 | s_method | calls.rb:165:1:169:3 | S |
 | calls.rb:167:9:167:12 | self | calls.rb:165:1:169:3 | S |
+| calls.rb:167:9:167:17 | ... | calls.rb:165:1:169:3 | S |
 | calls.rb:167:9:167:17 | call to to_s | calls.rb:165:1:169:3 | S |
 | calls.rb:171:1:174:3 | A | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:171:11:171:11 | S | calls.rb:1:1:667:52 | calls.rb |
@@ -907,6 +933,7 @@ enclosingModule
 | calls.rb:191:9:191:12 | self | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:192:9:192:26 | call to puts | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:192:9:192:26 | self | calls.rb:190:1:226:3 | Singletons |
+| calls.rb:192:9:193:24 | ... | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:192:14:192:26 | "singleton_a" | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:192:15:192:25 | singleton_a | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:193:9:193:12 | self | calls.rb:190:1:226:3 | Singletons |
@@ -915,12 +942,14 @@ enclosingModule
 | calls.rb:196:9:196:12 | self | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:197:9:197:26 | call to puts | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:197:9:197:26 | self | calls.rb:190:1:226:3 | Singletons |
+| calls.rb:197:9:198:24 | ... | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:197:14:197:26 | "singleton_b" | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:197:15:197:25 | singleton_b | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:198:9:198:12 | self | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:198:9:198:24 | call to singleton_c | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:201:5:203:7 | singleton_c | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:201:9:201:12 | self | calls.rb:190:1:226:3 | Singletons |
+| calls.rb:202:9:202:26 | ... | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:202:9:202:26 | call to puts | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:202:9:202:26 | self | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:202:14:202:26 | "singleton_c" | calls.rb:190:1:226:3 | Singletons |
@@ -929,13 +958,16 @@ enclosingModule
 | calls.rb:205:9:205:12 | self | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:206:9:206:26 | call to puts | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:206:9:206:26 | self | calls.rb:190:1:226:3 | Singletons |
+| calls.rb:206:9:207:24 | ... | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:206:14:206:26 | "singleton_d" | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:206:15:206:25 | singleton_d | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:207:9:207:12 | self | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:207:9:207:24 | call to singleton_a | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:210:5:215:7 | instance | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:211:9:213:11 | singleton_e | calls.rb:190:1:226:3 | Singletons |
+| calls.rb:211:9:214:19 | ... | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:211:13:211:16 | self | calls.rb:190:1:226:3 | Singletons |
+| calls.rb:212:13:212:30 | ... | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:212:13:212:30 | call to puts | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:212:13:212:30 | self | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:212:18:212:30 | "singleton_e" | calls.rb:190:1:226:3 | Singletons |
@@ -945,12 +977,14 @@ enclosingModule
 | calls.rb:217:5:221:7 | class << ... | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:217:14:217:17 | self | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:218:9:220:11 | singleton_f | calls.rb:217:5:221:7 | class << ... |
+| calls.rb:219:13:219:30 | ... | calls.rb:217:5:221:7 | class << ... |
 | calls.rb:219:13:219:30 | call to puts | calls.rb:217:5:221:7 | class << ... |
 | calls.rb:219:13:219:30 | self | calls.rb:217:5:221:7 | class << ... |
 | calls.rb:219:18:219:30 | "singleton_f" | calls.rb:217:5:221:7 | class << ... |
 | calls.rb:219:19:219:29 | singleton_f | calls.rb:217:5:221:7 | class << ... |
 | calls.rb:223:5:225:7 | call_singleton_g | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:224:9:224:12 | self | calls.rb:190:1:226:3 | Singletons |
+| calls.rb:224:9:224:24 | ... | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:224:9:224:24 | call to singleton_g | calls.rb:190:1:226:3 | Singletons |
 | calls.rb:228:1:228:10 | Singletons | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:228:1:228:22 | call to singleton_a | calls.rb:1:1:667:52 | calls.rb |
@@ -966,6 +1000,7 @@ enclosingModule
 | calls.rb:234:1:234:14 | call to singleton_e | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:236:1:238:3 | singleton_g | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:236:5:236:6 | c1 | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:237:5:237:24 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:237:5:237:24 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:237:5:237:24 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:237:10:237:24 | "singleton_g_1" | calls.rb:1:1:667:52 | calls.rb |
@@ -976,6 +1011,7 @@ enclosingModule
 | calls.rb:241:1:241:19 | call to call_singleton_g | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:243:1:245:3 | singleton_g | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:243:5:243:6 | c1 | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:244:5:244:24 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:244:5:244:24 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:244:5:244:24 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:244:10:244:24 | "singleton_g_2" | calls.rb:1:1:667:52 | calls.rb |
@@ -987,6 +1023,7 @@ enclosingModule
 | calls.rb:250:1:254:3 | class << ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:250:10:250:11 | c1 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:251:5:253:7 | singleton_g | calls.rb:250:1:254:3 | class << ... |
+| calls.rb:252:9:252:28 | ... | calls.rb:250:1:254:3 | class << ... |
 | calls.rb:252:9:252:28 | call to puts | calls.rb:250:1:254:3 | class << ... |
 | calls.rb:252:9:252:28 | self | calls.rb:250:1:254:3 | class << ... |
 | calls.rb:252:14:252:28 | "singleton_g_3" | calls.rb:250:1:254:3 | class << ... |
@@ -1011,6 +1048,7 @@ enclosingModule
 | calls.rb:265:7:265:15 | top-level | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:267:1:269:3 | singleton_g | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:267:5:267:14 | Singletons | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:268:5:268:22 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:268:5:268:22 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:268:5:268:22 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:268:10:268:22 | "singleton_g" | calls.rb:1:1:667:52 | calls.rb |
@@ -1035,8 +1073,10 @@ enclosingModule
 | calls.rb:279:5:279:8 | type | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:279:5:279:12 | call to new | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:279:5:279:21 | call to instance | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:279:5:285:20 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:281:5:283:7 | singleton_h | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:281:9:281:12 | type | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:282:9:282:26 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:282:9:282:26 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:282:9:282:26 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:282:14:282:26 | "singleton_h" | calls.rb:1:1:667:52 | calls.rb |
@@ -1054,6 +1094,7 @@ enclosingModule
 | calls.rb:293:1:297:3 | class << ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:293:10:293:10 | x | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:294:5:296:7 | singleton_i | calls.rb:293:1:297:3 | class << ... |
+| calls.rb:295:9:295:26 | ... | calls.rb:293:1:297:3 | class << ... |
 | calls.rb:295:9:295:26 | call to puts | calls.rb:293:1:297:3 | class << ... |
 | calls.rb:295:9:295:26 | self | calls.rb:293:1:297:3 | class << ... |
 | calls.rb:295:14:295:26 | "singleton_i" | calls.rb:293:1:297:3 | class << ... |
@@ -1065,6 +1106,7 @@ enclosingModule
 | calls.rb:302:1:306:3 | class << ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:302:10:302:19 | Singletons | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:303:5:305:7 | singleton_j | calls.rb:302:1:306:3 | class << ... |
+| calls.rb:304:9:304:26 | ... | calls.rb:302:1:306:3 | class << ... |
 | calls.rb:304:9:304:26 | call to puts | calls.rb:302:1:306:3 | class << ... |
 | calls.rb:304:9:304:26 | self | calls.rb:302:1:306:3 | class << ... |
 | calls.rb:304:14:304:26 | "singleton_j" | calls.rb:302:1:306:3 | class << ... |
@@ -1075,6 +1117,7 @@ enclosingModule
 | calls.rb:311:5:314:7 | instance | calls.rb:310:1:321:3 | SelfNew |
 | calls.rb:312:9:312:31 | call to puts | calls.rb:310:1:321:3 | SelfNew |
 | calls.rb:312:9:312:31 | self | calls.rb:310:1:321:3 | SelfNew |
+| calls.rb:312:9:313:36 | ... | calls.rb:310:1:321:3 | SelfNew |
 | calls.rb:312:14:312:31 | "SelfNew#instance" | calls.rb:310:1:321:3 | SelfNew |
 | calls.rb:312:15:312:30 | SelfNew#instance | calls.rb:310:1:321:3 | SelfNew |
 | calls.rb:313:9:313:11 | call to new | calls.rb:310:1:321:3 | SelfNew |
@@ -1084,6 +1127,7 @@ enclosingModule
 | calls.rb:316:9:316:12 | self | calls.rb:310:1:321:3 | SelfNew |
 | calls.rb:317:9:317:11 | call to new | calls.rb:310:1:321:3 | SelfNew |
 | calls.rb:317:9:317:11 | self | calls.rb:310:1:321:3 | SelfNew |
+| calls.rb:317:9:317:20 | ... | calls.rb:310:1:321:3 | SelfNew |
 | calls.rb:317:9:317:20 | call to instance | calls.rb:310:1:321:3 | SelfNew |
 | calls.rb:320:5:320:7 | call to new | calls.rb:310:1:321:3 | SelfNew |
 | calls.rb:320:5:320:7 | self | calls.rb:310:1:321:3 | SelfNew |
@@ -1092,15 +1136,18 @@ enclosingModule
 | calls.rb:323:1:323:17 | call to singleton | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:325:1:333:3 | C1 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:326:5:328:7 | instance | calls.rb:325:1:333:3 | C1 |
+| calls.rb:327:9:327:26 | ... | calls.rb:325:1:333:3 | C1 |
 | calls.rb:327:9:327:26 | call to puts | calls.rb:325:1:333:3 | C1 |
 | calls.rb:327:9:327:26 | self | calls.rb:325:1:333:3 | C1 |
 | calls.rb:327:14:327:26 | "C1#instance" | calls.rb:325:1:333:3 | C1 |
 | calls.rb:327:15:327:25 | C1#instance | calls.rb:325:1:333:3 | C1 |
 | calls.rb:330:5:332:7 | return_self | calls.rb:325:1:333:3 | C1 |
+| calls.rb:331:9:331:12 | ... | calls.rb:325:1:333:3 | C1 |
 | calls.rb:331:9:331:12 | self | calls.rb:325:1:333:3 | C1 |
 | calls.rb:335:1:339:3 | C2 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:335:12:335:13 | C1 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:336:5:338:7 | instance | calls.rb:335:1:339:3 | C2 |
+| calls.rb:337:9:337:26 | ... | calls.rb:335:1:339:3 | C2 |
 | calls.rb:337:9:337:26 | call to puts | calls.rb:335:1:339:3 | C2 |
 | calls.rb:337:9:337:26 | self | calls.rb:335:1:339:3 | C2 |
 | calls.rb:337:14:337:26 | "C2#instance" | calls.rb:335:1:339:3 | C2 |
@@ -1108,6 +1155,7 @@ enclosingModule
 | calls.rb:341:1:345:3 | C3 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:341:12:341:13 | C2 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:342:5:344:7 | instance | calls.rb:341:1:345:3 | C3 |
+| calls.rb:343:9:343:26 | ... | calls.rb:341:1:345:3 | C3 |
 | calls.rb:343:9:343:26 | call to puts | calls.rb:341:1:345:3 | C3 |
 | calls.rb:343:9:343:26 | self | calls.rb:341:1:345:3 | C3 |
 | calls.rb:343:14:343:26 | "C3#instance" | calls.rb:341:1:345:3 | C3 |
@@ -1116,6 +1164,7 @@ enclosingModule
 | calls.rb:347:22:347:22 | x | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:347:22:347:22 | x | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:348:5:356:7 | case ... | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:348:5:362:7 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:348:10:348:10 | x | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:349:5:350:18 | when ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:349:10:349:11 | C3 | calls.rb:1:1:667:52 | calls.rb |
@@ -1182,8 +1231,10 @@ enclosingModule
 | calls.rb:374:1:378:3 | add_singleton | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:374:19:374:19 | x | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:374:19:374:19 | x | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:375:5:377:7 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:375:5:377:7 | instance | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:375:9:375:9 | x | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:376:9:376:28 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:376:9:376:28 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:376:9:376:28 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:376:14:376:28 | "instance_on x" | calls.rb:1:1:667:52 | calls.rb |
@@ -1204,30 +1255,36 @@ enclosingModule
 | calls.rb:386:5:398:7 | class << ... | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:386:14:386:17 | self | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:387:9:389:11 | singleton1 | calls.rb:386:5:398:7 | class << ... |
+| calls.rb:388:13:388:48 | ... | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:388:13:388:48 | call to puts | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:388:13:388:48 | self | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:388:18:388:48 | "SingletonOverride1#singleton1" | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:388:19:388:47 | SingletonOverride1#singleton1 | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:391:9:393:11 | call_singleton1 | calls.rb:386:5:398:7 | class << ... |
+| calls.rb:392:13:392:22 | ... | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:392:13:392:22 | call to singleton1 | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:392:13:392:22 | self | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:395:9:397:11 | factory | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:396:13:396:16 | self | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:396:13:396:20 | call to new | calls.rb:386:5:398:7 | class << ... |
+| calls.rb:396:13:396:30 | ... | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:396:13:396:30 | call to instance1 | calls.rb:386:5:398:7 | class << ... |
 | calls.rb:400:5:402:7 | singleton2 | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:400:9:400:12 | self | calls.rb:385:1:413:3 | SingletonOverride1 |
+| calls.rb:401:9:401:44 | ... | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:401:9:401:44 | call to puts | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:401:9:401:44 | self | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:401:14:401:44 | "SingletonOverride1#singleton2" | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:401:15:401:43 | SingletonOverride1#singleton2 | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:404:5:406:7 | call_singleton2 | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:404:9:404:12 | self | calls.rb:385:1:413:3 | SingletonOverride1 |
+| calls.rb:405:9:405:18 | ... | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:405:9:405:18 | call to singleton2 | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:405:9:405:18 | self | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:408:5:408:14 | call to singleton2 | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:408:5:408:14 | self | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:410:5:412:7 | instance1 | calls.rb:385:1:413:3 | SingletonOverride1 |
+| calls.rb:411:9:411:43 | ... | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:411:9:411:43 | call to puts | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:411:9:411:43 | self | calls.rb:385:1:413:3 | SingletonOverride1 |
 | calls.rb:411:14:411:43 | "SingletonOverride1#instance1" | calls.rb:385:1:413:3 | SingletonOverride1 |
@@ -1245,17 +1302,20 @@ enclosingModule
 | calls.rb:421:5:425:7 | class << ... | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:421:14:421:17 | self | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:422:9:424:11 | singleton1 | calls.rb:421:5:425:7 | class << ... |
+| calls.rb:423:13:423:48 | ... | calls.rb:421:5:425:7 | class << ... |
 | calls.rb:423:13:423:48 | call to puts | calls.rb:421:5:425:7 | class << ... |
 | calls.rb:423:13:423:48 | self | calls.rb:421:5:425:7 | class << ... |
 | calls.rb:423:18:423:48 | "SingletonOverride2#singleton1" | calls.rb:421:5:425:7 | class << ... |
 | calls.rb:423:19:423:47 | SingletonOverride2#singleton1 | calls.rb:421:5:425:7 | class << ... |
 | calls.rb:427:5:429:7 | singleton2 | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:427:9:427:12 | self | calls.rb:420:1:434:3 | SingletonOverride2 |
+| calls.rb:428:9:428:44 | ... | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:428:9:428:44 | call to puts | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:428:9:428:44 | self | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:428:14:428:44 | "SingletonOverride2#singleton2" | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:428:15:428:43 | SingletonOverride2#singleton2 | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:431:5:433:7 | instance1 | calls.rb:420:1:434:3 | SingletonOverride2 |
+| calls.rb:432:9:432:43 | ... | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:432:9:432:43 | call to puts | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:432:9:432:43 | self | calls.rb:420:1:434:3 | SingletonOverride2 |
 | calls.rb:432:14:432:43 | "SingletonOverride2#instance1" | calls.rb:420:1:434:3 | SingletonOverride2 |
@@ -1276,6 +1336,7 @@ enclosingModule
 | calls.rb:442:17:442:17 | 0 | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:442:19:445:11 | then ... | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:443:9:445:11 | m1 | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
+| calls.rb:444:13:444:48 | ... | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:444:13:444:48 | call to puts | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:444:13:444:48 | self | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:444:18:444:48 | "ConditionalInstanceMethods#m1" | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
@@ -1283,14 +1344,17 @@ enclosingModule
 | calls.rb:448:5:460:7 | m2 | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:449:9:449:44 | call to puts | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:449:9:449:44 | self | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
+| calls.rb:449:9:459:10 | ... | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:449:14:449:44 | "ConditionalInstanceMethods#m2" | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:449:15:449:43 | ConditionalInstanceMethods#m2 | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:451:9:457:11 | m3 | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:452:13:452:48 | call to puts | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:452:13:452:48 | self | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
+| calls.rb:452:13:456:15 | ... | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:452:18:452:48 | "ConditionalInstanceMethods#m3" | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:452:19:452:47 | ConditionalInstanceMethods#m3 | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:454:13:456:15 | m4 | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
+| calls.rb:455:17:455:52 | ... | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:455:17:455:52 | call to puts | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:455:17:455:52 | self | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:455:22:455:52 | "ConditionalInstanceMethods#m4" | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
@@ -1308,7 +1372,9 @@ enclosingModule
 | calls.rb:463:9:467:15 | call to new | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:463:9:467:18 | call to m5 | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:463:19:467:11 | do ... end | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
+| calls.rb:464:13:466:15 | ... | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:464:13:466:15 | m5 | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
+| calls.rb:465:17:465:40 | ... | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:465:17:465:40 | call to puts | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:465:17:465:40 | self | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
 | calls.rb:465:22:465:40 | "AnonymousClass#m5" | calls.rb:441:1:469:3 | ConditionalInstanceMethods |
@@ -1340,11 +1406,14 @@ enclosingModule
 | calls.rb:479:5:479:11 | [...] | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:479:5:479:11 | call to [] | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:479:5:483:7 | call to each | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:479:5:495:7 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:479:6:479:6 | 0 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:479:8:479:8 | 1 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:479:10:479:10 | 2 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:479:18:483:7 | do ... end | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:480:9:482:11 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:480:9:482:11 | foo | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:481:13:481:22 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:481:13:481:22 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:481:13:481:22 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:481:18:481:22 | "foo" | calls.rb:1:1:667:52 | calls.rb |
@@ -1354,7 +1423,9 @@ enclosingModule
 | calls.rb:485:5:489:11 | call to new | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:485:5:489:15 | call to bar | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:485:15:489:7 | do ... end | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:486:9:488:11 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:486:9:488:11 | bar | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:487:13:487:22 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:487:13:487:22 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:487:13:487:22 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:487:18:487:22 | "bar" | calls.rb:1:1:667:52 | calls.rb |
@@ -1369,6 +1440,7 @@ enclosingModule
 | calls.rb:491:18:495:7 | do ... end | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:491:22:491:22 | i | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:491:22:491:22 | i | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:492:9:494:11 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:492:9:494:11 | call to define_method | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:492:9:494:11 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:492:23:492:32 | "baz_#{...}" | calls.rb:1:1:667:52 | calls.rb |
@@ -1376,6 +1448,7 @@ enclosingModule
 | calls.rb:492:28:492:31 | #{...} | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:492:30:492:30 | i | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:492:35:494:11 | do ... end | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:493:13:493:27 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:493:13:493:27 | call to puts | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:493:13:493:27 | self | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:493:18:493:27 | "baz_#{...}" | calls.rb:1:1:667:52 | calls.rb |
@@ -1399,6 +1472,7 @@ enclosingModule
 | calls.rb:502:1:502:33 | call to baz_2 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:504:1:510:3 | ExtendSingletonMethod | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:505:5:507:7 | singleton | calls.rb:504:1:510:3 | ExtendSingletonMethod |
+| calls.rb:506:9:506:46 | ... | calls.rb:504:1:510:3 | ExtendSingletonMethod |
 | calls.rb:506:9:506:46 | call to puts | calls.rb:504:1:510:3 | ExtendSingletonMethod |
 | calls.rb:506:9:506:46 | self | calls.rb:504:1:510:3 | ExtendSingletonMethod |
 | calls.rb:506:14:506:46 | "ExtendSingletonMethod#singleton" | calls.rb:504:1:510:3 | ExtendSingletonMethod |
@@ -1435,6 +1509,7 @@ enclosingModule
 | calls.rb:534:5:536:7 | call to protected | calls.rb:533:1:537:3 | ProtectedMethodInModule |
 | calls.rb:534:5:536:7 | self | calls.rb:533:1:537:3 | ProtectedMethodInModule |
 | calls.rb:534:15:536:7 | foo | calls.rb:533:1:537:3 | ProtectedMethodInModule |
+| calls.rb:535:9:535:42 | ... | calls.rb:533:1:537:3 | ProtectedMethodInModule |
 | calls.rb:535:9:535:42 | call to puts | calls.rb:533:1:537:3 | ProtectedMethodInModule |
 | calls.rb:535:9:535:42 | self | calls.rb:533:1:537:3 | ProtectedMethodInModule |
 | calls.rb:535:14:535:42 | "ProtectedMethodInModule#foo" | calls.rb:533:1:537:3 | ProtectedMethodInModule |
@@ -1446,6 +1521,7 @@ enclosingModule
 | calls.rb:542:5:544:7 | call to protected | calls.rb:539:1:552:3 | ProtectedMethods |
 | calls.rb:542:5:544:7 | self | calls.rb:539:1:552:3 | ProtectedMethods |
 | calls.rb:542:15:544:7 | bar | calls.rb:539:1:552:3 | ProtectedMethods |
+| calls.rb:543:9:543:35 | ... | calls.rb:539:1:552:3 | ProtectedMethods |
 | calls.rb:543:9:543:35 | call to puts | calls.rb:539:1:552:3 | ProtectedMethods |
 | calls.rb:543:9:543:35 | self | calls.rb:539:1:552:3 | ProtectedMethods |
 | calls.rb:543:14:543:35 | "ProtectedMethods#bar" | calls.rb:539:1:552:3 | ProtectedMethods |
@@ -1453,6 +1529,7 @@ enclosingModule
 | calls.rb:546:5:551:7 | baz | calls.rb:539:1:552:3 | ProtectedMethods |
 | calls.rb:547:9:547:11 | call to foo | calls.rb:539:1:552:3 | ProtectedMethods |
 | calls.rb:547:9:547:11 | self | calls.rb:539:1:552:3 | ProtectedMethods |
+| calls.rb:547:9:550:32 | ... | calls.rb:539:1:552:3 | ProtectedMethods |
 | calls.rb:548:9:548:11 | call to bar | calls.rb:539:1:552:3 | ProtectedMethods |
 | calls.rb:548:9:548:11 | self | calls.rb:539:1:552:3 | ProtectedMethods |
 | calls.rb:549:9:549:24 | ProtectedMethods | calls.rb:539:1:552:3 | ProtectedMethods |
@@ -1475,6 +1552,7 @@ enclosingModule
 | calls.rb:559:5:562:7 | baz | calls.rb:558:1:563:3 | ProtectedMethodsSub |
 | calls.rb:560:9:560:11 | call to foo | calls.rb:558:1:563:3 | ProtectedMethodsSub |
 | calls.rb:560:9:560:11 | self | calls.rb:558:1:563:3 | ProtectedMethodsSub |
+| calls.rb:560:9:561:35 | ... | calls.rb:558:1:563:3 | ProtectedMethodsSub |
 | calls.rb:561:9:561:27 | ProtectedMethodsSub | calls.rb:558:1:563:3 | ProtectedMethodsSub |
 | calls.rb:561:9:561:31 | call to new | calls.rb:558:1:563:3 | ProtectedMethodsSub |
 | calls.rb:561:9:561:35 | call to foo | calls.rb:558:1:563:3 | ProtectedMethodsSub |
@@ -1497,6 +1575,7 @@ enclosingModule
 | calls.rb:569:17:569:17 | c | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:569:17:569:17 | c | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:569:20:569:20 | c | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:569:20:569:24 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:569:20:569:24 | call to baz | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:570:1:570:13 | Array | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:570:1:570:13 | [...] | calls.rb:1:1:667:52 | calls.rb |
@@ -1512,6 +1591,7 @@ enclosingModule
 | calls.rb:570:23:570:23 | s | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:570:23:570:23 | s | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:570:26:570:26 | s | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:570:26:570:37 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:570:26:570:37 | call to capitalize | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:572:1:575:3 | SingletonUpCall_Base | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:573:5:574:7 | singleton | calls.rb:572:1:575:3 | SingletonUpCall_Base |
@@ -1526,6 +1606,7 @@ enclosingModule
 | calls.rb:579:9:579:12 | self | calls.rb:576:1:583:3 | SingletonUpCall_Sub |
 | calls.rb:580:9:580:17 | call to singleton | calls.rb:576:1:583:3 | SingletonUpCall_Sub |
 | calls.rb:580:9:580:17 | self | calls.rb:576:1:583:3 | SingletonUpCall_Sub |
+| calls.rb:580:9:581:35 | ... | calls.rb:576:1:583:3 | SingletonUpCall_Sub |
 | calls.rb:581:9:581:18 | call to singleton2 | calls.rb:576:1:583:3 | SingletonUpCall_Sub |
 | calls.rb:581:9:581:18 | self | calls.rb:576:1:583:3 | SingletonUpCall_Sub |
 | calls.rb:584:1:589:3 | SingletonUpCall_SubSub | calls.rb:1:1:667:52 | calls.rb |
@@ -1539,10 +1620,12 @@ enclosingModule
 | calls.rb:592:9:592:12 | self | calls.rb:591:1:602:3 | SingletonA |
 | calls.rb:595:5:597:7 | call_singleton1 | calls.rb:591:1:602:3 | SingletonA |
 | calls.rb:595:9:595:12 | self | calls.rb:591:1:602:3 | SingletonA |
+| calls.rb:596:9:596:18 | ... | calls.rb:591:1:602:3 | SingletonA |
 | calls.rb:596:9:596:18 | call to singleton1 | calls.rb:591:1:602:3 | SingletonA |
 | calls.rb:596:9:596:18 | self | calls.rb:591:1:602:3 | SingletonA |
 | calls.rb:599:5:601:7 | call_call_singleton1 | calls.rb:591:1:602:3 | SingletonA |
 | calls.rb:599:9:599:12 | self | calls.rb:591:1:602:3 | SingletonA |
+| calls.rb:600:9:600:23 | ... | calls.rb:591:1:602:3 | SingletonA |
 | calls.rb:600:9:600:23 | call to call_singleton1 | calls.rb:591:1:602:3 | SingletonA |
 | calls.rb:600:9:600:23 | self | calls.rb:591:1:602:3 | SingletonA |
 | calls.rb:604:1:611:3 | SingletonB | calls.rb:1:1:667:52 | calls.rb |
@@ -1553,6 +1636,7 @@ enclosingModule
 | calls.rb:608:9:608:12 | self | calls.rb:604:1:611:3 | SingletonB |
 | calls.rb:609:9:609:18 | call to singleton1 | calls.rb:604:1:611:3 | SingletonB |
 | calls.rb:609:9:609:18 | self | calls.rb:604:1:611:3 | SingletonB |
+| calls.rb:609:9:609:105 | ... | calls.rb:604:1:611:3 | SingletonB |
 | calls.rb:613:1:620:3 | SingletonC | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:613:20:613:29 | SingletonA | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:614:5:615:7 | singleton1 | calls.rb:613:1:620:3 | SingletonC |
@@ -1561,6 +1645,7 @@ enclosingModule
 | calls.rb:617:9:617:12 | self | calls.rb:613:1:620:3 | SingletonC |
 | calls.rb:618:9:618:18 | call to singleton1 | calls.rb:613:1:620:3 | SingletonC |
 | calls.rb:618:9:618:18 | self | calls.rb:613:1:620:3 | SingletonC |
+| calls.rb:618:9:618:105 | ... | calls.rb:613:1:620:3 | SingletonC |
 | calls.rb:622:1:622:10 | SingletonA | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:622:1:622:31 | call to call_call_singleton1 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:623:1:623:10 | SingletonB | calls.rb:1:1:667:52 | calls.rb |
@@ -1570,6 +1655,7 @@ enclosingModule
 | calls.rb:626:1:632:3 | Included | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:627:5:629:7 | foo | calls.rb:626:1:632:3 | Included |
 | calls.rb:628:9:628:12 | self | calls.rb:626:1:632:3 | Included |
+| calls.rb:628:9:628:16 | ... | calls.rb:626:1:632:3 | Included |
 | calls.rb:628:9:628:16 | call to bar | calls.rb:626:1:632:3 | Included |
 | calls.rb:630:5:631:7 | bar | calls.rb:626:1:632:3 | Included |
 | calls.rb:634:1:639:3 | IncludesIncluded | calls.rb:1:1:667:52 | calls.rb |
@@ -1577,11 +1663,13 @@ enclosingModule
 | calls.rb:635:5:635:20 | self | calls.rb:634:1:639:3 | IncludesIncluded |
 | calls.rb:635:13:635:20 | Included | calls.rb:634:1:639:3 | IncludesIncluded |
 | calls.rb:636:5:638:7 | bar | calls.rb:634:1:639:3 | IncludesIncluded |
+| calls.rb:637:9:637:13 | ... | calls.rb:634:1:639:3 | IncludesIncluded |
 | calls.rb:637:9:637:13 | super call to bar | calls.rb:634:1:639:3 | IncludesIncluded |
 | calls.rb:641:1:645:3 | CustomNew1 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:642:5:644:7 | new | calls.rb:641:1:645:3 | CustomNew1 |
 | calls.rb:642:9:642:12 | self | calls.rb:641:1:645:3 | CustomNew1 |
 | calls.rb:643:9:643:10 | C1 | calls.rb:641:1:645:3 | CustomNew1 |
+| calls.rb:643:9:643:14 | ... | calls.rb:641:1:645:3 | CustomNew1 |
 | calls.rb:643:9:643:14 | call to new | calls.rb:641:1:645:3 | CustomNew1 |
 | calls.rb:647:1:647:10 | CustomNew1 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:647:1:647:14 | call to new | calls.rb:1:1:667:52 | calls.rb |
@@ -1590,8 +1678,10 @@ enclosingModule
 | calls.rb:650:5:652:7 | new | calls.rb:649:1:657:3 | CustomNew2 |
 | calls.rb:650:9:650:12 | self | calls.rb:649:1:657:3 | CustomNew2 |
 | calls.rb:651:9:651:12 | self | calls.rb:649:1:657:3 | CustomNew2 |
+| calls.rb:651:9:651:21 | ... | calls.rb:649:1:657:3 | CustomNew2 |
 | calls.rb:651:9:651:21 | call to allocate | calls.rb:649:1:657:3 | CustomNew2 |
 | calls.rb:654:5:656:7 | instance | calls.rb:649:1:657:3 | CustomNew2 |
+| calls.rb:655:9:655:34 | ... | calls.rb:649:1:657:3 | CustomNew2 |
 | calls.rb:655:9:655:34 | call to puts | calls.rb:649:1:657:3 | CustomNew2 |
 | calls.rb:655:9:655:34 | self | calls.rb:649:1:657:3 | CustomNew2 |
 | calls.rb:655:14:655:34 | "CustomNew2#instance" | calls.rb:649:1:657:3 | CustomNew2 |
@@ -1605,11 +1695,13 @@ enclosingModule
 | calls.rb:662:5:662:11 | Array | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:662:5:662:11 | [...] | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:662:5:662:11 | call to [] | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:662:5:664:7 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:662:5:664:7 | call to each | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:662:6:662:6 | 0 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:662:8:662:8 | 1 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:662:10:662:10 | 2 | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:662:18:664:7 | do ... end | calls.rb:1:1:667:52 | calls.rb |
+| calls.rb:663:9:663:9 | ... | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:663:9:663:9 | x | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:667:1:667:26 | ( ... ) | calls.rb:1:1:667:52 | calls.rb |
 | calls.rb:667:1:667:35 | call to instance | calls.rb:1:1:667:52 | calls.rb |
@@ -1621,6 +1713,7 @@ enclosingModule
 | element_reference.rb:2:5:4:7 | [] | element_reference.rb:1:1:5:3 | ClassWithElementRef |
 | element_reference.rb:2:12:2:12 | x | element_reference.rb:1:1:5:3 | ClassWithElementRef |
 | element_reference.rb:2:12:2:12 | x | element_reference.rb:1:1:5:3 | ClassWithElementRef |
+| element_reference.rb:3:9:3:19 | ... | element_reference.rb:1:1:5:3 | ClassWithElementRef |
 | element_reference.rb:3:9:3:19 | yield ... | element_reference.rb:1:1:5:3 | ClassWithElementRef |
 | element_reference.rb:3:15:3:15 | x | element_reference.rb:1:1:5:3 | ClassWithElementRef |
 | element_reference.rb:3:15:3:19 | ... + ... | element_reference.rb:1:1:5:3 | ClassWithElementRef |
@@ -1635,6 +1728,7 @@ enclosingModule
 | element_reference.rb:9:6:9:19 | { ... } | element_reference.rb:1:1:13:4 | element_reference.rb |
 | element_reference.rb:9:9:9:9 | x | element_reference.rb:1:1:13:4 | element_reference.rb |
 | element_reference.rb:9:9:9:9 | x | element_reference.rb:1:1:13:4 | element_reference.rb |
+| element_reference.rb:9:12:9:17 | ... | element_reference.rb:1:1:13:4 | element_reference.rb |
 | element_reference.rb:9:12:9:17 | call to puts | element_reference.rb:1:1:13:4 | element_reference.rb |
 | element_reference.rb:9:12:9:17 | self | element_reference.rb:1:1:13:4 | element_reference.rb |
 | element_reference.rb:9:17:9:17 | x | element_reference.rb:1:1:13:4 | element_reference.rb |
@@ -1644,15 +1738,18 @@ enclosingModule
 | element_reference.rb:11:6:13:3 | do ... end | element_reference.rb:1:1:13:4 | element_reference.rb |
 | element_reference.rb:11:10:11:10 | x | element_reference.rb:1:1:13:4 | element_reference.rb |
 | element_reference.rb:11:10:11:10 | x | element_reference.rb:1:1:13:4 | element_reference.rb |
+| element_reference.rb:12:5:12:10 | ... | element_reference.rb:1:1:13:4 | element_reference.rb |
 | element_reference.rb:12:5:12:10 | call to puts | element_reference.rb:1:1:13:4 | element_reference.rb |
 | element_reference.rb:12:5:12:10 | self | element_reference.rb:1:1:13:4 | element_reference.rb |
 | element_reference.rb:12:10:12:10 | x | element_reference.rb:1:1:13:4 | element_reference.rb |
 | hello.rb:1:1:8:3 | EnglishWords | hello.rb:1:1:22:3 | hello.rb |
 | hello.rb:2:5:4:7 | hello | hello.rb:1:1:8:3 | EnglishWords |
+| hello.rb:3:9:3:22 | ... | hello.rb:1:1:8:3 | EnglishWords |
 | hello.rb:3:9:3:22 | return | hello.rb:1:1:8:3 | EnglishWords |
 | hello.rb:3:16:3:22 | "hello" | hello.rb:1:1:8:3 | EnglishWords |
 | hello.rb:3:17:3:21 | hello | hello.rb:1:1:8:3 | EnglishWords |
 | hello.rb:5:5:7:7 | world | hello.rb:1:1:8:3 | EnglishWords |
+| hello.rb:6:9:6:22 | ... | hello.rb:1:1:8:3 | EnglishWords |
 | hello.rb:6:9:6:22 | return | hello.rb:1:1:8:3 | EnglishWords |
 | hello.rb:6:16:6:22 | "world" | hello.rb:1:1:8:3 | EnglishWords |
 | hello.rb:6:17:6:21 | world | hello.rb:1:1:8:3 | EnglishWords |
@@ -1661,12 +1758,14 @@ enclosingModule
 | hello.rb:12:5:12:24 | self | hello.rb:11:1:16:3 | Greeting |
 | hello.rb:12:13:12:24 | EnglishWords | hello.rb:11:1:16:3 | Greeting |
 | hello.rb:13:5:15:7 | message | hello.rb:11:1:16:3 | Greeting |
+| hello.rb:14:9:14:20 | ... | hello.rb:11:1:16:3 | Greeting |
 | hello.rb:14:9:14:20 | return | hello.rb:11:1:16:3 | Greeting |
 | hello.rb:14:16:14:20 | call to hello | hello.rb:11:1:16:3 | Greeting |
 | hello.rb:14:16:14:20 | self | hello.rb:11:1:16:3 | Greeting |
 | hello.rb:18:1:22:3 | HelloWorld | hello.rb:1:1:22:3 | hello.rb |
 | hello.rb:18:20:18:27 | Greeting | hello.rb:1:1:22:3 | hello.rb |
 | hello.rb:19:5:21:7 | message | hello.rb:18:1:22:3 | HelloWorld |
+| hello.rb:20:9:20:40 | ... | hello.rb:18:1:22:3 | HelloWorld |
 | hello.rb:20:9:20:40 | return | hello.rb:18:1:22:3 | HelloWorld |
 | hello.rb:20:16:20:20 | super call to message | hello.rb:18:1:22:3 | HelloWorld |
 | hello.rb:20:16:20:26 | ... + ... | hello.rb:18:1:22:3 | HelloWorld |
@@ -1684,12 +1783,14 @@ enclosingModule
 | instance_fields.rb:3:9:5:11 | create | instance_fields.rb:2:5:9:7 | class << ... |
 | instance_fields.rb:4:13:4:18 | @field | instance_fields.rb:2:5:9:7 | class << ... |
 | instance_fields.rb:4:13:4:18 | self | instance_fields.rb:2:5:9:7 | class << ... |
+| instance_fields.rb:4:13:4:35 | ... | instance_fields.rb:2:5:9:7 | class << ... |
 | instance_fields.rb:4:13:4:35 | ... = ... | instance_fields.rb:2:5:9:7 | class << ... |
 | instance_fields.rb:4:22:4:31 | A_target | instance_fields.rb:2:5:9:7 | class << ... |
 | instance_fields.rb:4:22:4:35 | call to new | instance_fields.rb:2:5:9:7 | class << ... |
 | instance_fields.rb:6:9:8:11 | use | instance_fields.rb:2:5:9:7 | class << ... |
 | instance_fields.rb:7:13:7:18 | @field | instance_fields.rb:2:5:9:7 | class << ... |
 | instance_fields.rb:7:13:7:18 | self | instance_fields.rb:2:5:9:7 | class << ... |
+| instance_fields.rb:7:13:7:25 | ... | instance_fields.rb:2:5:9:7 | class << ... |
 | instance_fields.rb:7:13:7:25 | call to target | instance_fields.rb:2:5:9:7 | class << ... |
 | instance_fields.rb:11:1:14:3 | A_target | instance_fields.rb:1:1:29:4 | instance_fields.rb |
 | instance_fields.rb:12:5:13:7 | target | instance_fields.rb:11:1:14:3 | A_target |
@@ -1699,12 +1800,14 @@ enclosingModule
 | instance_fields.rb:18:9:20:11 | create | instance_fields.rb:17:5:24:7 | class << ... |
 | instance_fields.rb:19:13:19:18 | @field | instance_fields.rb:17:5:24:7 | class << ... |
 | instance_fields.rb:19:13:19:18 | self | instance_fields.rb:17:5:24:7 | class << ... |
+| instance_fields.rb:19:13:19:35 | ... | instance_fields.rb:17:5:24:7 | class << ... |
 | instance_fields.rb:19:13:19:35 | ... = ... | instance_fields.rb:17:5:24:7 | class << ... |
 | instance_fields.rb:19:22:19:31 | B_target | instance_fields.rb:17:5:24:7 | class << ... |
 | instance_fields.rb:19:22:19:35 | call to new | instance_fields.rb:17:5:24:7 | class << ... |
 | instance_fields.rb:21:9:23:11 | use | instance_fields.rb:17:5:24:7 | class << ... |
 | instance_fields.rb:22:13:22:18 | @field | instance_fields.rb:17:5:24:7 | class << ... |
 | instance_fields.rb:22:13:22:18 | self | instance_fields.rb:17:5:24:7 | class << ... |
+| instance_fields.rb:22:13:22:25 | ... | instance_fields.rb:17:5:24:7 | class << ... |
 | instance_fields.rb:22:13:22:25 | call to target | instance_fields.rb:17:5:24:7 | class << ... |
 | instance_fields.rb:26:1:29:3 | B_target | instance_fields.rb:1:1:29:4 | instance_fields.rb |
 | instance_fields.rb:27:5:28:7 | target | instance_fields.rb:26:1:29:3 | B_target |
@@ -1784,6 +1887,7 @@ enclosingModule
 | modules.rb:90:3:90:8 | Object | modules.rb:88:1:93:3 | IncludeTest |
 | modules.rb:90:3:90:38 | call to module_eval | modules.rb:88:1:93:3 | IncludeTest |
 | modules.rb:90:22:90:38 | { ... } | modules.rb:88:1:93:3 | IncludeTest |
+| modules.rb:90:24:90:36 | ... | modules.rb:88:1:93:3 | IncludeTest |
 | modules.rb:90:24:90:36 | call to prepend | modules.rb:88:1:93:3 | IncludeTest |
 | modules.rb:90:24:90:36 | self | modules.rb:88:1:93:3 | IncludeTest |
 | modules.rb:90:32:90:36 | Other | modules.rb:88:1:93:3 | IncludeTest |
@@ -1908,6 +2012,7 @@ enclosingModule
 | private.rb:83:3:85:5 | call to private | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:83:3:85:5 | self | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:83:11:85:5 | m1 | private.rb:82:1:94:3 | PrivateOverride1 |
+| private.rb:84:7:84:32 | ... | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:84:7:84:32 | call to puts | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:84:7:84:32 | self | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:84:12:84:32 | "PrivateOverride1#m1" | private.rb:82:1:94:3 | PrivateOverride1 |
@@ -1915,11 +2020,13 @@ enclosingModule
 | private.rb:87:3:89:5 | call to private | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:87:3:89:5 | self | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:87:11:89:5 | m2 | private.rb:82:1:94:3 | PrivateOverride1 |
+| private.rb:88:7:88:32 | ... | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:88:7:88:32 | call to puts | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:88:7:88:32 | self | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:88:12:88:32 | "PrivateOverride1#m2" | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:88:13:88:31 | PrivateOverride1#m2 | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:91:3:93:5 | call_m1 | private.rb:82:1:94:3 | PrivateOverride1 |
+| private.rb:92:7:92:8 | ... | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:92:7:92:8 | call to m1 | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:92:7:92:8 | self | private.rb:82:1:94:3 | PrivateOverride1 |
 | private.rb:96:1:102:3 | PrivateOverride2 | private.rb:1:1:105:40 | private.rb |
@@ -1929,6 +2036,7 @@ enclosingModule
 | private.rb:97:11:101:5 | m1 | private.rb:96:1:102:3 | PrivateOverride2 |
 | private.rb:98:7:98:32 | call to puts | private.rb:96:1:102:3 | PrivateOverride2 |
 | private.rb:98:7:98:32 | self | private.rb:96:1:102:3 | PrivateOverride2 |
+| private.rb:98:7:100:45 | ... | private.rb:96:1:102:3 | PrivateOverride2 |
 | private.rb:98:12:98:32 | "PrivateOverride2#m1" | private.rb:96:1:102:3 | PrivateOverride2 |
 | private.rb:98:13:98:31 | PrivateOverride2#m1 | private.rb:96:1:102:3 | PrivateOverride2 |
 | private.rb:99:7:99:8 | call to m2 | private.rb:96:1:102:3 | PrivateOverride2 |
@@ -1950,8 +2058,10 @@ enclosingModule
 | toplevel_self_singleton.rb:8:1:16:3 | self | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:8:14:16:3 | do ... end | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:9:5:11:7 | method_in_block | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
+| toplevel_self_singleton.rb:9:5:15:7 | ... | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:10:9:10:27 | call to ab_singleton_method | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:10:9:10:27 | self | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
+| toplevel_self_singleton.rb:10:9:10:60 | ... | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:12:5:12:7 | obj | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:12:5:12:12 | ... = ... | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:12:9:12:12 | self | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
@@ -1959,6 +2069,7 @@ enclosingModule
 | toplevel_self_singleton.rb:13:9:13:11 | obj | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:14:9:14:27 | call to ab_singleton_method | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:14:9:14:27 | self | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
+| toplevel_self_singleton.rb:14:9:14:60 | ... | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:18:1:18:8 | MyStruct | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:18:1:22:1 | ... = ... | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:18:12:18:17 | Struct | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
@@ -1968,10 +2079,12 @@ enclosingModule
 | toplevel_self_singleton.rb:18:29:18:32 | :bar | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:18:29:18:32 | bar | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:18:35:22:1 | { ... } | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
+| toplevel_self_singleton.rb:19:5:21:7 | ... | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:19:5:21:7 | method_in_struct | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:19:9:19:12 | self | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:20:9:20:27 | call to ab_singleton_method | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:20:9:20:27 | self | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
+| toplevel_self_singleton.rb:20:9:20:60 | ... | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:24:1:34:3 | Good | toplevel_self_singleton.rb:1:1:34:4 | toplevel_self_singleton.rb |
 | toplevel_self_singleton.rb:25:5:33:7 | class << ... | toplevel_self_singleton.rb:24:1:34:3 | Good |
 | toplevel_self_singleton.rb:25:14:25:17 | self | toplevel_self_singleton.rb:24:1:34:3 | Good |
@@ -1979,6 +2092,7 @@ enclosingModule
 | toplevel_self_singleton.rb:29:9:32:11 | call_you | toplevel_self_singleton.rb:25:5:33:7 | class << ... |
 | toplevel_self_singleton.rb:30:13:30:19 | call to call_me | toplevel_self_singleton.rb:25:5:33:7 | class << ... |
 | toplevel_self_singleton.rb:30:13:30:19 | self | toplevel_self_singleton.rb:25:5:33:7 | class << ... |
+| toplevel_self_singleton.rb:30:13:31:20 | ... | toplevel_self_singleton.rb:25:5:33:7 | class << ... |
 | toplevel_self_singleton.rb:31:13:31:20 | call to call_you | toplevel_self_singleton.rb:25:5:33:7 | class << ... |
 | toplevel_self_singleton.rb:31:13:31:20 | self | toplevel_self_singleton.rb:25:5:33:7 | class << ... |
 | unresolved_subclass.rb:1:1:2:3 | ResolvableBaseClass | unresolved_subclass.rb:1:1:22:4 | unresolved_subclass.rb |
diff --git a/rust/ql/lib/CHANGELOG.md b/rust/ql/lib/CHANGELOG.md
index d85d27d88d67..3651026d737f 100644
--- a/rust/ql/lib/CHANGELOG.md
+++ b/rust/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.2.15
+
+### Minor Analysis Improvements
+
+* The sensitive data heuristics used to identify code that handles passwords and private data have been improved. Most of the changes permit more variations of established patterns, thereby finding more sensitive data. Queries that use the sensitive data library (for example `rust/cleartext-logging`) may find more correct results and fewer false positive results after these changes.
+
 ## 0.2.14
 
 No user-facing changes.
diff --git a/rust/ql/lib/change-notes/released/0.2.15.md b/rust/ql/lib/change-notes/released/0.2.15.md
new file mode 100644
index 000000000000..3644126ec1f4
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.15.md
@@ -0,0 +1,5 @@
+## 0.2.15
+
+### Minor Analysis Improvements
+
+* The sensitive data heuristics used to identify code that handles passwords and private data have been improved. Most of the changes permit more variations of established patterns, thereby finding more sensitive data. Queries that use the sensitive data library (for example `rust/cleartext-logging`) may find more correct results and fewer false positive results after these changes.
diff --git a/rust/ql/lib/codeql-pack.release.yml b/rust/ql/lib/codeql-pack.release.yml
index c53820a76d54..0f574e080e4c 100644
--- a/rust/ql/lib/codeql-pack.release.yml
+++ b/rust/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.2.14
+lastReleaseVersion: 0.2.15
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
index 423ad21ae4ac..fd99060d404b 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
@@ -222,8 +222,6 @@ private module Input2Common {
 }
 
 private module PreInput2 implements InputSig2<PreTypeMention> {
-  PreTypeMention getABaseTypeMention(Type t) { none() }
-
   PreTypeMention getATypeParameterConstraint(TypeParameter tp) {
     result = Input2Common::getATypeParameterConstraint(tp)
   }
@@ -248,8 +246,6 @@ private module PreInput2 implements InputSig2<PreTypeMention> {
 module PreM2 = Make2<PreTypeMention, PreInput2>;
 
 private module Input2 implements InputSig2<TypeMention> {
-  TypeMention getABaseTypeMention(Type t) { none() }
-
   TypeMention getATypeParameterConstraint(TypeParameter tp) {
     result = Input2Common::getATypeParameterConstraint(tp)
   }
diff --git a/rust/ql/lib/qlpack.yml b/rust/ql/lib/qlpack.yml
index 03f5418863c8..e97302ac1f9c 100644
--- a/rust/ql/lib/qlpack.yml
+++ b/rust/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-all
-version: 0.2.14
+version: 0.2.16-dev
 groups: rust
 extractor: rust
 dbscheme: rust.dbscheme
diff --git a/rust/ql/src/CHANGELOG.md b/rust/ql/src/CHANGELOG.md
index ad1e8ef3bfe4..4f4807ff82e4 100644
--- a/rust/ql/src/CHANGELOG.md
+++ b/rust/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.36
+
+No user-facing changes.
+
 ## 0.1.35
 
 No user-facing changes.
diff --git a/rust/ql/src/change-notes/released/0.1.36.md b/rust/ql/src/change-notes/released/0.1.36.md
new file mode 100644
index 000000000000..8685189c564f
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.36.md
@@ -0,0 +1,3 @@
+## 0.1.36
+
+No user-facing changes.
diff --git a/rust/ql/src/codeql-pack.release.yml b/rust/ql/src/codeql-pack.release.yml
index 6a5806eec2bf..270bd27a7aae 100644
--- a/rust/ql/src/codeql-pack.release.yml
+++ b/rust/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.35
+lastReleaseVersion: 0.1.36
diff --git a/rust/ql/src/qlpack.yml b/rust/ql/src/qlpack.yml
index 1de0db6c3454..9ba6302ecc0d 100644
--- a/rust/ql/src/qlpack.yml
+++ b/rust/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-queries
-version: 0.1.35
+version: 0.1.37-dev
 groups:
   - rust
   - queries
diff --git a/rust/ql/test/library-tests/sensitivedata/test.rs b/rust/ql/test/library-tests/sensitivedata/test.rs
index f8d850beeb80..e2bb5a5f595c 100644
--- a/rust/ql/test/library-tests/sensitivedata/test.rs
+++ b/rust/ql/test/library-tests/sensitivedata/test.rs
@@ -23,11 +23,14 @@ impl MyStruct {
 fn get_password() -> String { get_string() }
 
 fn test_passwords(
-	password: &str, pass_word: &str, passwd: &str, my_password: &str, password_str: &str, password_confirmation: &str,
+	password: &str, pass_word: &str, passwd: &str, my_password: &str, password_str: &str, password_confirmation: &str, profile_password: &str,
 	pass_phrase: &str, passphrase: &str, passPhrase: &str, backup_code: &str,
 	auth_key: &str, authkey: &str, authKey: &str, authentication_key: &str, authenticationkey: &str, authenticationKey: &str, oauth: &str,
-	one_time_code: &str,
-	harmless: &str, encrypted_password: &str, password_hash: &str, passwordFile: &str,
+	one_time_code: &str, api_token: &str, api_tok: &str,
+	harmless: &str,
+	encrypted_password: &str, unencrypted_password: &str, encoded_password: &str, unencoded_password: &str,
+	password_hash: &str, passwordFile: &str, coauthor: &str,
+
 	ms: &MyStruct
 ) {
 	// passwords
@@ -38,6 +41,9 @@ fn test_passwords(
 	sink(my_password); // $ sensitive=password
 	sink(password_str); // $ sensitive=password
 	sink(password_confirmation); // $ sensitive=password
+	sink(profile_password); // $ sensitive=password
+	sink(unencrypted_password); // $ sensitive=password
+	sink(unencoded_password); // $ sensitive=password
 	sink(pass_phrase); // $ sensitive=password
 	sink(passphrase); // $ sensitive=password
 	sink(passPhrase); // $ sensitive=password
@@ -51,6 +57,8 @@ fn test_passwords(
 	sink(authenticationKey); // $ sensitive=password
 	sink(oauth); // $ sensitive=password
 	sink(one_time_code); // $ MISSING: sensitive=password
+	sink(api_token); // $ sensitive=password
+	sink(api_tok); // $ sensitive=password
 
 	sink(ms); // $ MISSING: sensitive=password
 	sink(ms.password.as_str()); // $ sensitive=password
@@ -67,8 +75,10 @@ fn test_passwords(
 
 	sink(harmless);
 	sink(encrypted_password);
+	sink(encoded_password);
 	sink(password_hash);
 	sink(passwordFile);
+	sink(coauthor);
 
 	sink(ms.harmless.as_str());
 	sink(ms.password_file_path.as_str());
@@ -187,6 +197,10 @@ struct Financials {
 	harmless: String,
 	my_bank_account_number: String,
 	credit_card_no: String,
+	card_no: String,
+	cardNumber: String,
+	card_security_code: String,
+
 	credit_rating: i32,
 	user_ccn: String,
 	cvv: String,
@@ -201,6 +215,7 @@ struct Financials {
 	accounting: i32,
 	unaccounted: bool,
 	multiband: bool,
+	wildcard_not_matched: bool,
 }
 
 enum Gender {
@@ -298,6 +313,9 @@ fn test_private_info(
 
 	sink(info.financials.my_bank_account_number.as_str()); // $ sensitive=private SPURIOUS: sensitive=id
 	sink(info.financials.credit_card_no.as_str()); // $ sensitive=private
+	sink(info.financials.card_no.as_str()); // $ sensitive=private
+	sink(info.financials.cardNumber.as_str()); // $ sensitive=private
+	sink(info.financials.card_security_code.as_str()); // $ sensitive=private
 	sink(info.financials.credit_rating); // $ sensitive=private
 	sink(info.financials.user_ccn.as_str()); // $ sensitive=private
 	sink(info.financials.cvv.as_str()); // $ sensitive=private
@@ -350,6 +368,7 @@ fn test_private_info(
 	sink(info.financials.accounting);
 	sink(info.financials.unaccounted);
 	sink(info.financials.multiband);
+	sink(info.financials.wildcard_not_matched);
 
 	sink(ContactDetails::FavouriteColor("blue".to_string()));
 }
diff --git a/shared/concepts/CHANGELOG.md b/shared/concepts/CHANGELOG.md
index e2de29754550..787779674f09 100644
--- a/shared/concepts/CHANGELOG.md
+++ b/shared/concepts/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.25
+
+No user-facing changes.
+
 ## 0.0.24
 
 No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.25.md b/shared/concepts/change-notes/released/0.0.25.md
new file mode 100644
index 000000000000..e41a9acfa062
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.25.md
@@ -0,0 +1,3 @@
+## 0.0.25
+
+No user-facing changes.
diff --git a/shared/concepts/codeql-pack.release.yml b/shared/concepts/codeql-pack.release.yml
index b956773a07f5..6d0e80a50c3f 100644
--- a/shared/concepts/codeql-pack.release.yml
+++ b/shared/concepts/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.24
+lastReleaseVersion: 0.0.25
diff --git a/shared/concepts/codeql/concepts/internal/SensitiveDataHeuristics.qll b/shared/concepts/codeql/concepts/internal/SensitiveDataHeuristics.qll
index 4271784577f0..b2bda909e3ba 100644
--- a/shared/concepts/codeql/concepts/internal/SensitiveDataHeuristics.qll
+++ b/shared/concepts/codeql/concepts/internal/SensitiveDataHeuristics.qll
@@ -76,7 +76,7 @@ module HeuristicNames {
   string maybePassword() {
     result =
       "(?is).*(pass(wd|word|code|.?phrase)(?!.*question)|(auth(entication|ori[sz]ation)?).?key|oauth|"
-        + "api.?(key|token)|([_-]|\\b)mfa([_-]|\\b)).*"
+        + "api.?(key|tok)|([_-]|\\b)mfa([_-]|\\b)).*"
   }
 
   /**
@@ -104,8 +104,9 @@ module HeuristicNames {
         // Geographic location - where the user is (or was)
         "latitude|longitude|nationality|" +
         // Financial data - such as credit card numbers, salary, bank accounts, and debts
-        "(credit|debit|bank|visa).?(card|num|no|acc(ou)?nt)|acc(ou)?nt.?(no|num|credit)|routing.?num|"
+        "(credit|debit|bank|visa).?(card|num|no|acc(ou)?nt)|(card|acc(ou)?nt).?(no|num|credit)|routing.?num|"
         + "salary|billing|beneficiary|credit.?(rating|score)|([_-]|\\b)(ccn|cvv|iban)([_-]|\\b)|" +
+        "security.?code|" +
         // Communications - e-mail addresses, private e-mail messages, SMS text messages, chat logs, etc.
         // "e(mail|_mail)|" + // this seems too noisy
         // Health - medical conditions, insurance status, prescription records
@@ -145,13 +146,13 @@ module HeuristicNames {
    * suggesting nouns within the string do not represent the meaning of the whole string (e.g. a URL or a SQL query).
    *
    * We also filter out common words like `certain` and `concert`, since otherwise these could
-   * be matched by the certificate regular expressions. Same for `accountable` (account), or
-   * `secretarial` (secret).
+   * be matched by the certificate regular expressions. Same for `accountable` (account),
+   * `secretarial` (secret), `wildcard` (card), `coauthor` (oauth).
    */
   string notSensitiveRegexp() {
     result =
-      "(?is).*([^\\w$.-]|redact|censor|obfuscate|hash|md5|sha|random|((?<!un)(en))?(crypt|(?<!pass)code)|"
-        + "certain|concert|secretar|account(ant|ab|ing|ed)|file|path|([_-]|\\b)url).*"
+      "(?is).*([^\\w$.-]|redact|censor|obfuscate|hash|md5|sha|random|(?<!unen)crypt|(?<!un)encode|" +
+        "certain|concert|secretar|wildcard|coauthor|account(ant|ab|ing|ed)|(?<!pro)file|path|([_-]|\\b)url).*"
   }
 
   /**
diff --git a/shared/concepts/qlpack.yml b/shared/concepts/qlpack.yml
index a56c1d8efb2d..dd1f0280e790 100644
--- a/shared/concepts/qlpack.yml
+++ b/shared/concepts/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/concepts
-version: 0.0.24
+version: 0.0.26-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index dc02f115c998..8ac7faf25545 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.35
+
+No user-facing changes.
+
 ## 2.0.34
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.35.md b/shared/controlflow/change-notes/released/2.0.35.md
new file mode 100644
index 000000000000..526e1fc9f4ce
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.35.md
@@ -0,0 +1,3 @@
+## 2.0.35
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index 339a3ce7c57a..27eb8ef8ecea 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.34
+lastReleaseVersion: 2.0.35
diff --git a/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll b/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll
index 7a6b6318ed11..fff877b9fcd9 100644
--- a/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll
+++ b/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll
@@ -118,14 +118,14 @@ signature module AstSig<LocationSig Location> {
 
   /** A traditional C-style `for` loop. */
   class ForStmt extends LoopStmt {
-    /** Gets the initializer expression of the loop at the specified (zero-based) position, if any. */
-    Expr getInit(int index);
+    /** Gets the initializer of the loop at the specified (zero-based) position, if any. */
+    AstNode getInit(int index);
 
     /** Gets the boolean condition of this `for` loop. */
     Expr getCondition();
 
-    /** Gets the update expression of this loop at the specified (zero-based) position, if any. */
-    Expr getUpdate(int index);
+    /** Gets the update of this loop at the specified (zero-based) position, if any. */
+    AstNode getUpdate(int index);
   }
 
   /** A for-loop that iterates over the elements of a collection. */
@@ -640,6 +640,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
       Input1::cfgCachedStageRef() and
       not exists(getChild(n, _)) and
       not postOrInOrder(n) and
+      not additionalNode(n, _, _) and
       not inConditionalContext(n, _)
     }
 
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index e96e7aa69a28..b3518003b24d 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 2.0.34
+version: 2.0.36-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index 7ecbeda3b216..b2cf75110ac8 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.7
+
+No user-facing changes.
+
 ## 2.1.6
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.1.7.md b/shared/dataflow/change-notes/released/2.1.7.md
new file mode 100644
index 000000000000..af7772169fe4
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.1.7.md
@@ -0,0 +1,3 @@
+## 2.1.7
+
+No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index 1c810b60c4a3..cfa57a47251f 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.6
+lastReleaseVersion: 2.1.7
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index e599587f88ae..cdce161af7e3 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 2.1.6
+version: 2.1.8-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index 964c1bb1d98e..6619a18079c0 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.51.md b/shared/mad/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index 60567e24cb42..21a06e7cc4db 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.50
+version: 1.0.52-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/quantum/CHANGELOG.md b/shared/quantum/CHANGELOG.md
index 7153b9314b18..c8b656e4f351 100644
--- a/shared/quantum/CHANGELOG.md
+++ b/shared/quantum/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.29
+
+No user-facing changes.
+
 ## 0.0.28
 
 No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.29.md b/shared/quantum/change-notes/released/0.0.29.md
new file mode 100644
index 000000000000..4428927c79d5
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.29.md
@@ -0,0 +1,3 @@
+## 0.0.29
+
+No user-facing changes.
diff --git a/shared/quantum/codeql-pack.release.yml b/shared/quantum/codeql-pack.release.yml
index 3462db7d348f..c81f18131208 100644
--- a/shared/quantum/codeql-pack.release.yml
+++ b/shared/quantum/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.28
+lastReleaseVersion: 0.0.29
diff --git a/shared/quantum/qlpack.yml b/shared/quantum/qlpack.yml
index 58005b74255a..c430e4a69be4 100644
--- a/shared/quantum/qlpack.yml
+++ b/shared/quantum/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/quantum
-version: 0.0.28
+version: 0.0.30-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index e2a893046c95..a400a91f8c9b 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.51.md b/shared/rangeanalysis/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index 5a61b8d5eb91..7cecb52325fb 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.50
+version: 1.0.52-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index bb83dfc0a1ff..c4b7fc6e87f7 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.51.md b/shared/regex/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index a3c25f8f13e0..a1ec511b126a 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.50
+version: 1.0.52-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index f9145f2c88b7..9cfe68398b27 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.27
+
+No user-facing changes.
+
 ## 2.0.26
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.27.md b/shared/ssa/change-notes/released/2.0.27.md
new file mode 100644
index 000000000000..639cf77090e5
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.27.md
@@ -0,0 +1,3 @@
+## 2.0.27
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index 63d57bef4816..a047558f018b 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.26
+lastReleaseVersion: 2.0.27
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 1ddb7e74af22..9c14b9e6469d 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 2.0.26
+version: 2.0.28-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index 512a5732ccd9..14258018aea5 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.51.md b/shared/threat-models/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 2473e135f4d6..c7326273c652 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.50
+version: 1.0.52-dev
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tree-sitter-extractor/src/extractor/mod.rs b/shared/tree-sitter-extractor/src/extractor/mod.rs
index 00816a00fd04..e8e608c32447 100644
--- a/shared/tree-sitter-extractor/src/extractor/mod.rs
+++ b/shared/tree-sitter-extractor/src/extractor/mod.rs
@@ -298,6 +298,10 @@ pub fn extract(
     yeast_runner: Option<&yeast::Runner<'_>>,
 ) {
     let path_str = file_paths::normalize_and_transform_path(path, transformer);
+    let source_root = std::env::current_dir()
+        .ok()
+        .and_then(|d| d.canonicalize().ok());
+    let diagnostics_path = file_paths::relativize_for_diagnostic(path, source_root.as_deref());
     let span = tracing::span!(
         tracing::Level::TRACE,
         "extract",
@@ -318,7 +322,7 @@ pub fn extract(
         source,
         diagnostics_writer,
         trap_writer,
-        &path_str,
+        &diagnostics_path,
         file_label,
         language_prefix,
         schema,
@@ -326,7 +330,7 @@ pub fn extract(
 
     if let Some(yeast_runner) = yeast_runner {
         let ast = yeast_runner
-            .run_from_tree(&tree)
+            .run_from_tree(&tree, source)
             .unwrap_or_else(|e| panic!("Desugaring failed for {path_str}: {e}"));
         traverse_yeast(&ast, &mut visitor);
     } else {
@@ -343,8 +347,9 @@ struct ChildNode {
 }
 
 struct Visitor<'a> {
-    /// The file path of the source code (as string)
-    path: &'a str,
+    /// A path suitable for diagnostic locations: relative to the source root if possible,
+    /// otherwise a file: URI
+    diagnostics_path: &'a str,
     /// The label to use whenever we need to refer to the `@file` entity of this
     /// source file.
     file_label: trap::Label,
@@ -376,13 +381,13 @@ impl<'a> Visitor<'a> {
         source: &'a [u8],
         diagnostics_writer: &'a mut diagnostics::LogWriter,
         trap_writer: &'a mut trap::Writer,
-        path: &'a str,
+        diagnostics_path: &'a str,
         file_label: trap::Label,
         language_prefix: &str,
         schema: &'a NodeTypeMap,
     ) -> Visitor<'a> {
         Visitor {
-            path,
+            diagnostics_path,
             file_label,
             source,
             diagnostics_writer,
@@ -433,7 +438,7 @@ impl<'a> Visitor<'a> {
         );
         mesg.severity(diagnostics::Severity::Warning)
             .location(
-                self.path,
+                self.diagnostics_path,
                 loc.start_line,
                 loc.start_column,
                 loc.end_line,
@@ -554,7 +559,7 @@ impl<'a> Visitor<'a> {
                         )
                         .severity(diagnostics::Severity::Warning)
                         .location(
-                            self.path,
+                            self.diagnostics_path,
                             loc.start_line,
                             loc.start_column,
                             loc.end_line,
diff --git a/shared/tree-sitter-extractor/src/file_paths.rs b/shared/tree-sitter-extractor/src/file_paths.rs
index bdb9dd035f06..ea3be5a89586 100644
--- a/shared/tree-sitter-extractor/src/file_paths.rs
+++ b/shared/tree-sitter-extractor/src/file_paths.rs
@@ -3,6 +3,18 @@ use std::{
     path::{Path, PathBuf},
 };
 
+/// Given an absolute path, returns a relative path if it's under `source_root`,
+/// otherwise the absolute path as-is. This is used for diagnostic locations, which
+/// should use relative paths per the CodeQL diagnostic message format spec.
+/// Absolute path fallback is handled downstream by the CLI's SARIF generator.
+pub fn relativize_for_diagnostic(path: &Path, source_root: Option<&Path>) -> String {
+    source_root
+        .and_then(|root| path.strip_prefix(root).ok())
+        .and_then(|rel| rel.to_str())
+        .map(|s| s.replace('\\', "/"))
+        .unwrap_or_else(|| path.display().to_string())
+}
+
 /// This represents the minimum supported path transformation that is needed to support extracting
 /// overlay databases. Specifically, it represents a transformer where one path prefix is replaced
 /// with a different prefix.
@@ -224,3 +236,71 @@ pub fn path_for(
     }
     result
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn relativize_under_source_root() {
+        let path = Path::new("/home/runner/work/repo/src/foo.rb");
+        let result = relativize_for_diagnostic(path, Some(Path::new("/home/runner/work/repo")));
+        assert_eq!(result, "src/foo.rb");
+    }
+
+    #[test]
+    fn relativize_outside_source_root_returns_absolute() {
+        let path = Path::new("/other/location/foo.rb");
+        let result = relativize_for_diagnostic(path, Some(Path::new("/home/runner/work/repo")));
+        assert_eq!(result, "/other/location/foo.rb");
+    }
+
+    #[test]
+    fn relativize_no_source_root_returns_absolute() {
+        let path = Path::new("/home/runner/work/repo/src/foo.rb");
+        let result = relativize_for_diagnostic(path, None);
+        assert_eq!(result, "/home/runner/work/repo/src/foo.rb");
+    }
+
+    #[test]
+    fn relativize_exact_root_path() {
+        let path = Path::new("/repo/foo.rb");
+        let result = relativize_for_diagnostic(path, Some(Path::new("/repo")));
+        assert_eq!(result, "foo.rb");
+    }
+
+    #[cfg(windows)]
+    mod windows {
+        use super::*;
+
+        #[test]
+        fn relativize_windows_path_under_source_root() {
+            let path = Path::new(r"C:\Users\runner\work\repo\src\foo.rb");
+            let result =
+                relativize_for_diagnostic(path, Some(Path::new(r"C:\Users\runner\work\repo")));
+            assert_eq!(result, "src/foo.rb");
+        }
+
+        #[test]
+        fn relativize_windows_path_outside_source_root() {
+            let path = Path::new(r"D:\other\location\foo.rb");
+            let result =
+                relativize_for_diagnostic(path, Some(Path::new(r"C:\Users\runner\work\repo")));
+            assert_eq!(result, r"D:\other\location\foo.rb");
+        }
+
+        #[test]
+        fn relativize_windows_path_no_source_root() {
+            let path = Path::new(r"C:\Users\runner\work\repo\src\foo.rb");
+            let result = relativize_for_diagnostic(path, None);
+            assert_eq!(result, r"C:\Users\runner\work\repo\src\foo.rb");
+        }
+
+        #[test]
+        fn relativize_windows_nested_path() {
+            let path = Path::new(r"C:\repo\src\lib\utils\foo.rb");
+            let result = relativize_for_diagnostic(path, Some(Path::new(r"C:\repo")));
+            assert_eq!(result, "src/lib/utils/foo.rb");
+        }
+    }
+}
diff --git a/shared/tree-sitter-extractor/src/generator/mod.rs b/shared/tree-sitter-extractor/src/generator/mod.rs
index d2521c51b3ec..8167dc2574e0 100644
--- a/shared/tree-sitter-extractor/src/generator/mod.rs
+++ b/shared/tree-sitter-extractor/src/generator/mod.rs
@@ -115,8 +115,19 @@ pub fn generate(
                 &node_parent_table_name,
             )),
             ql::TopLevel::Class(ql_gen::create_token_class(&token_name, &tokeninfo_name)),
-            ql::TopLevel::Class(ql_gen::create_reserved_word_class(&reserved_word_name)),
         ];
+        // Only emit the ReservedWord class when there are actually unnamed token
+        // types in the schema (i.e., @{prefix}_reserved_word exists in the dbscheme).
+        // When converting from a YEAST YAML schema that has no unnamed tokens, this
+        // type is absent and referencing it would cause a QL compilation error.
+        let has_reserved_words = nodes
+            .values()
+            .any(|n| n.dbscheme_name == reserved_word_name);
+        if has_reserved_words {
+            body.push(ql::TopLevel::Class(ql_gen::create_reserved_word_class(
+                &reserved_word_name,
+            )));
+        }
 
         // Overlay discard predicates
         body.push(ql::TopLevel::Predicate(
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index c98a035d149e..9e78286a1a49 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.51.md b/shared/tutorial/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index fa05472a305c..bb6eeeb2460a 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.50
+version: 1.0.52-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index de43834a84e7..e9334c9da8d5 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.51.md b/shared/typeflow/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index fe6ae27a1d1a..9790bbcaeaed 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.50
+version: 1.0.52-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typeinference/CHANGELOG.md b/shared/typeinference/CHANGELOG.md
index 3bbb96e59a9a..24dc81f3aa2c 100644
--- a/shared/typeinference/CHANGELOG.md
+++ b/shared/typeinference/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.32
+
+No user-facing changes.
+
 ## 0.0.31
 
 No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.32.md b/shared/typeinference/change-notes/released/0.0.32.md
new file mode 100644
index 000000000000..c390443f09a3
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.32.md
@@ -0,0 +1,3 @@
+## 0.0.32
+
+No user-facing changes.
diff --git a/shared/typeinference/codeql-pack.release.yml b/shared/typeinference/codeql-pack.release.yml
index 54b504d06ecb..714fcfc18281 100644
--- a/shared/typeinference/codeql-pack.release.yml
+++ b/shared/typeinference/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.31
+lastReleaseVersion: 0.0.32
diff --git a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
index cf82d77b5e1d..24a6392c6be1 100644
--- a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
+++ b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
@@ -155,8 +155,8 @@ signature module InputSig1<LocationSig Location> {
   class TypeParameter extends Type;
 
   /**
-   * A type abstraction. I.e., a place in the program where type variables are
-   * introduced.
+   * A type abstraction. I.e., a place in the program where type variables may
+   * be introduced.
    *
    * Example in C#:
    * ```csharp
@@ -171,7 +171,7 @@ signature module InputSig1<LocationSig Location> {
    * ```
    */
   class TypeAbstraction {
-    /** Gets a type parameter introduced by this abstraction. */
+    /** Gets a type parameter introduced by this abstraction, if any. */
     TypeParameter getATypeParameter();
 
     /** Gets a textual representation of this type abstraction. */
@@ -324,56 +324,31 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
   /**
    * Provides the input to `Make2`.
    *
-   * The `TypeMention` parameter is used to build the base type hierarchy based on
-   * `getABaseTypeMention` and to construct the constraint satisfaction
-   * hierarchy based on `conditionSatisfiesConstraint`.
-   *
-   * It will usually be based on syntactic occurrences of types in the source
-   * code. For example, in
-   *
-   * ```csharp
-   * class C<T> : Base<T>, Interface { }
-   * ```
-   *
-   * a type mention would exist for `Base<T>` and resolve to the following
-   * types:
-   *
-   * `TypePath` | `Type`
-   * ---------- | -------
-   * `""`       | ``Base`1``
-   * `"0"`      | `T`
+   * The `TypeMention` parameter is used to construct the constraint satisfaction
+   * hierarchy based on `conditionSatisfiesConstraint`, which is general enough
+   * to model both class hierarchies and trait implementation hierarchies in Rust.
    */
   signature module InputSig2<HasTypeTreeSig TypeMention> {
-    /**
-     * Gets a base type mention of `t`, if any. Example:
-     *
-     * ```csharp
-     * class C<T> : Base<T>, Interface { }
-     * //    ^ `t`
-     * //           ^^^^^^^ `result`
-     * //                    ^^^^^^^^^ `result`
-     * ```
-     */
-    TypeMention getABaseTypeMention(Type t);
-
     /**
      * Gets a type constraint on the type parameter `tp`, if any. All
      * instantiations of the type parameter must satisfy the constraint.
      *
      * For example, in
+     *
      * ```csharp
      * class GenericClass<T> : IComparable<GenericClass<T>>
      * //                 ^ `tp`
      *     where T : IComparable<T> { }
      * //            ^^^^^^^^^^^^^^ `result`
      * ```
+     *
      * the type parameter `T` has the constraint `IComparable<T>`.
      */
     TypeMention getATypeParameterConstraint(TypeParameter tp);
 
     /**
      * Holds if
-     * - `abs` is a type abstraction that introduces type variables that are
+     * - `abs` is a type abstraction that may introduce type variables that are
      *   free in `condition` and `constraint`,
      * - and for every instantiation of the type parameters from `abs` the
      *   resulting `condition` satisfies the constraint given by `constraint`.
@@ -381,6 +356,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
      *   through `constraint` should also apply to `condition`.
      *
      * Example in C#:
+     *
      * ```csharp
      * class C<T> : IComparable<C<T>> { }
      * //     ^^^ `abs`
@@ -389,6 +365,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
      * ```
      *
      * Example in Rust:
+     *
      * ```rust
      * impl<A> Trait<i64, A> for Type<String, A> { }
      * //  ^^^ `abs`             ^^^^^^^^^^^^^^^ `condition`
@@ -397,20 +374,24 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
      *
      * To see how `abs` changes the meaning of the type parameters that occur in
      * `condition`, consider the following examples in Rust:
+     *
      * ```rust
      * impl<T> Trait for T { }
      * //  ^^^ `abs`     ^ `condition`
      * //      ^^^^^ `constraint`
      * ```
+     *
      * Here the meaning is "for all type parameters `T` it is the case that `T`
      * implements `Trait`". On the other hand, in
+     *
      * ```rust
      * fn foo<T: Trait>() { }
      * //     ^ `condition`
      * //        ^^^^^ `constraint`
      * ```
+     *
      * the meaning is "`T` implements `Trait`" where the constraint is only
-     * valid for the specific `T`. Note that `condition` and `condition` are
+     * valid for the specific `T`. Note that `condition` and `constraint` are
      * identical in the two examples. To encode the difference, `abs` in the
      * first example should contain `T` whereas in the seconds example `abs`
      * should be empty.
@@ -825,99 +806,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       predicate multipleConstraintImplementations(Type conditionRoot, Type constraintRoot) {
         countConstraintImplementations(conditionRoot, constraintRoot) > 1
       }
-
-      /**
-       * Holds if `baseMention` is a (transitive) base type mention of `sub`,
-       * and `t` is mentioned (implicitly) at `path` inside `baseMention`. For
-       * example, in
-       *
-       * ```csharp
-       * class C<T1> { }
-       *
-       * class Base<T2> { }
-       *
-       * class Mid<T3> : Base<C<T3>> { }
-       *
-       * class Sub<T4> : Mid<C<T4>> { } // Sub<T4> extends Base<C<C<T4>>
-       * ```
-       *
-       * - ``C`1`` is mentioned at `T2` for immediate base type mention `Base<C<T3>>`
-       *   of `Mid`,
-       * - `T3` is mentioned at `T2.T1` for immediate base type mention `Base<C<T3>>`
-       *   of `Mid`,
-       * - ``C`1`` is mentioned at `T3` for immediate base type mention `Mid<C<T4>>`
-       *   of `Sub`,
-       * - `T4` is mentioned at `T3.T1` for immediate base type mention `Mid<C<T4>>`
-       *   of `Sub`,
-       * - ``C`1`` is mentioned at `T2` and implicitly at `T2.T1` for transitive base type
-       *   mention `Base<C<T3>>` of `Sub`, and
-       * - `T4` is mentioned implicitly at `T2.T1.T1` for transitive base type mention
-       *   `Base<C<T3>>` of `Sub`.
-       */
-      pragma[nomagic]
-      predicate baseTypeMentionHasTypeAt(Type sub, TypeMention baseMention, TypePath path, Type t) {
-        exists(TypeMention immediateBaseMention |
-          pragma[only_bind_into](immediateBaseMention) =
-            getABaseTypeMention(pragma[only_bind_into](sub))
-        |
-          // immediate base class
-          baseMention = immediateBaseMention and
-          t = immediateBaseMention.getTypeAt(path)
-          or
-          // transitive base class
-          exists(Type immediateBase | immediateBase = getTypeMentionRoot(immediateBaseMention) |
-            baseTypeMentionHasNonTypeParameterAt(immediateBase, baseMention, path, t)
-            or
-            exists(TypePath path0, TypePath prefix, TypePath suffix, TypeParameter tp |
-              /*
-               * Example:
-               *
-               * - `prefix = "T2.T1"`,
-               * - `path0 = "T3"`,
-               * - `suffix = ""`,
-               * - `path = "T2.T1"`
-               *
-               * ```csharp
-               * class C<T1> { }
-               *       ^ `t`
-               *
-               * class Base<T2> { }
-               *
-               * class Mid<T3> : Base<C<T3>> { }
-               * //    ^^^ `immediateBase`
-               * //        ^^ `tp`
-               * //              ^^^^^^^^^^^ `baseMention`
-               *
-               * class Sub<T4> : Mid<C<T4>> { }
-               * //    ^^^ `sub`
-               * //              ^^^^^^^^^^ `immediateBaseMention`
-               * ```
-               */
-
-              baseTypeMentionHasTypeParameterAt(immediateBase, baseMention, prefix, tp) and
-              t = immediateBaseMention.getTypeAt(path0) and
-              path0.isCons(tp, suffix) and
-              path = prefix.append(suffix)
-            )
-          )
-        )
-      }
-
-      overlay[caller?]
-      pragma[inline]
-      predicate baseTypeMentionHasNonTypeParameterAt(
-        Type sub, TypeMention baseMention, TypePath path, Type t
-      ) {
-        not t = sub.getATypeParameter() and baseTypeMentionHasTypeAt(sub, baseMention, path, t)
-      }
-
-      overlay[caller?]
-      pragma[inline]
-      predicate baseTypeMentionHasTypeParameterAt(
-        Type sub, TypeMention baseMention, TypePath path, TypeParameter tp
-      ) {
-        tp = sub.getATypeParameter() and baseTypeMentionHasTypeAt(sub, baseMention, path, tp)
-      }
     }
 
     private import BaseTypes
@@ -1503,76 +1391,135 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
 
       private module AccessBaseType {
         /**
-         * Holds if inferring types at `a` in environment `e` might depend on the type at
-         * `path` of `apos` having `base` as a transitive base type.
+         * Holds if the type of `target` at `apos` and `pathToTp` is type parameter `tp`,
+         * and an argument with root type `argRootType` may be able to be matched against
+         * `tp` via the `conditionSatisfiesConstraint` hierarchy.
          */
-        private predicate relevantAccess(
-          Access a, AccessEnvironment e, AccessPosition apos, Type base
+        pragma[nomagic]
+        private predicate argRootTypeSatisfiesTargetTypeCand(
+          Type argRootType, Declaration target, AccessPosition apos, TypeParameter tp,
+          TypePath pathToTp
         ) {
-          exists(Declaration target, DeclarationPosition dpos |
-            target = a.getTarget(e) and
+          exists(
+            DeclarationPosition dpos, TypeMention condition, TypeMention constraint,
+            Type constraintRootType
+          |
             accessDeclarationPositionMatch(apos, dpos) and
-            declarationBaseType(target, dpos, base, _, _)
+            tp = target.getDeclaredType(dpos, pathToTp) and
+            conditionSatisfiesConstraintTypeAt(_, condition, constraint, TypePath::nil(),
+              constraintRootType) and
+            constraintRootType = target.getDeclaredType(dpos, TypePath::nil()) and
+            argRootType = condition.getTypeAt(TypePath::nil())
           )
         }
 
+        private newtype TRelevantTarget =
+          MkRelevantTarget(Declaration target, AccessPosition apos) {
+            argRootTypeSatisfiesTargetTypeCand(_, target, apos, _, _)
+          }
+
+        private class RelevantTarget extends MkRelevantTarget {
+          Declaration target;
+          AccessPosition apos;
+
+          RelevantTarget() { this = MkRelevantTarget(target, apos) }
+
+          Type getTypeAt(TypePath path) {
+            exists(DeclarationPosition dpos |
+              accessDeclarationPositionMatch(apos, dpos) and
+              result = target.getDeclaredType(dpos, path)
+            )
+          }
+
+          string toString() { result = target.toString() + ", " + apos.toString() }
+
+          Location getLocation() { result = target.getLocation() }
+        }
+
         pragma[nomagic]
-        private Type inferTypeAt(
-          Access a, AccessEnvironment e, AccessPosition apos, TypeParameter tp, TypePath suffix
+        private predicate argRootTypeSatisfiesTargetTypeCand(
+          Type argRootType, Access a, AccessEnvironment e, Declaration target, AccessPosition apos,
+          TypeParameter tp, TypePath pathToTp
         ) {
-          relevantAccess(a, e, apos, _) and
-          exists(TypePath path0 |
-            result = a.getInferredType(e, apos, path0) and
-            path0.isCons(tp, suffix)
-          )
+          target = a.getTarget(e) and
+          argRootTypeSatisfiesTargetTypeCand(argRootType, target, apos, tp, pathToTp) and
+          not exists(getTypeArgument(a, target, tp, _))
         }
 
+        private newtype TRelevantAccess =
+          MkRelevantAccess(Access a, AccessPosition apos, AccessEnvironment e) {
+            argRootTypeSatisfiesTargetTypeCand(a.getInferredType(e, apos, TypePath::nil()), a, e, _,
+              apos, _, _)
+          }
+
+        private class RelevantAccess extends MkRelevantAccess {
+          Access a;
+          AccessPosition apos;
+          AccessEnvironment e;
+
+          RelevantAccess() { this = MkRelevantAccess(a, apos, e) }
+
+          RelevantTarget getTarget() { result = MkRelevantTarget(a.getTarget(e), apos) }
+
+          pragma[nomagic]
+          Type getTypeAt(TypePath path) { result = a.getInferredType(e, apos, path) }
+
+          string toString() { result = a.toString() + ", " + apos.toString() }
+
+          Location getLocation() { result = a.getLocation() }
+        }
+
+        private module SatisfiesParameterConstraintInput implements
+          SatisfiesConstraintInputSig<RelevantAccess, RelevantTarget>
+        {
+          predicate relevantConstraint(RelevantAccess at, RelevantTarget constraint) {
+            constraint = at.getTarget()
+          }
+        }
+
+        private module SatisfiesParameterConstraint =
+          SatisfiesConstraint<RelevantAccess, RelevantTarget, SatisfiesParameterConstraintInput>;
+
         /**
-         * Holds if `baseMention` is a (transitive) base type mention of the
-         * type of `a` at position `apos` at path `pathToSub` in environment
-         * `e`, and `t` is mentioned (implicitly) at `path` inside `base`.
+         * Holds if the (transitive) base type `t` at `path` of `a` in environment `e`
+         * for some `AccessPosition` matches the type parameter `tp`, which is used in
+         * the declared types of `target`.
          *
          * For example, in
          *
          * ```csharp
          * class C<T1> { }
          *
-         * class Base<T2> { }
+         * class Base<T2> {
+         * //         ^^ `tp`
+         *     public C<T2> Method() { ... }
+         * //               ^^^^^^ `target`
+         * }
          *
          * class Mid<T3> : Base<C<T3>> { }
          *
          * class Sub<T4> : Mid<C<T4>> { }
          *
-         *     new Sub<int>().ToString();
-         * //  ^^^^^^^^^^^^^^ node at `apos`
-         * //  ^^^^^^^^^^^^^^^^^^^^^^^^^ `a`
+         *    new Sub<int>().Method(); // Note: `Sub<int>` is a subtype of `Base<C<C<int>>>`
+         * // ^^^^^^^^^^^^^^^^^^^^^^^ `a`
          * ```
          *
-         * where the method call is an access, `new Sub<int>()` is at the access
-         * position which is the receiver of a method call, and `pathToSub` is
-         * `""` we have:
+         * we have that type parameter `T2` of `Base` is matched as follows:
          *
-         * `baseMention` | `path`       | `t`
-         * ------------- | ------------ | ---
-         * `Mid<C<T4>>`  | `"T3"`       | ``C`1``
-         * `Mid<C<T4>>`  | `"T3.T1"`    | `int`
-         * `Base<C<T3>>` | `"T2"`       | ``C`1``
-         * `Base<C<T3>>` | `"T2.T1"`    | ``C`1``
-         * `Base<C<T3>>` | `"T2.T1.T1"` | `int`
+         * `path`    | `t`
+         * --------- | -------
+         * `""`      | ``C`1``
+         * `"T1"`    | ``C`1``
+         * `"T1.T1"` | `int`
          */
-        predicate hasBaseTypeMention(
-          Access a, AccessEnvironment e, AccessPosition apos, TypeMention baseMention,
-          TypePath path, Type t
+        pragma[nomagic]
+        predicate baseTypeMatch(
+          Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
         ) {
-          relevantAccess(a, e, apos, getTypeMentionRoot(baseMention)) and
-          exists(Type sub | sub = a.getInferredType(e, apos, TypePath::nil()) |
-            baseTypeMentionHasNonTypeParameterAt(sub, baseMention, path, t)
-            or
-            exists(TypePath prefix, TypePath suffix, TypeParameter tp |
-              baseTypeMentionHasTypeParameterAt(sub, baseMention, prefix, tp) and
-              t = inferTypeAt(a, e, apos, tp, suffix) and
-              path = prefix.append(suffix)
-            )
+          exists(AccessPosition apos, TypePath pathToTp |
+            argRootTypeSatisfiesTargetTypeCand(_, a, e, target, apos, tp, pathToTp) and
+            SatisfiesParameterConstraint::satisfiesConstraint(MkRelevantAccess(a, apos, e),
+              MkRelevantTarget(target, apos), pathToTp.appendInverse(path), t)
           )
         }
       }
@@ -1683,77 +1630,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         }
       }
 
-      /**
-       * Holds if the type of `a` at `apos` in environment `e` has the base type `base`,
-       * and when viewed as an element of that type has the type `t` at `path`.
-       */
-      pragma[nomagic]
-      private predicate accessBaseType(
-        Access a, AccessEnvironment e, AccessPosition apos, Type base, TypePath path, Type t
-      ) {
-        exists(TypeMention tm |
-          AccessBaseType::hasBaseTypeMention(a, e, apos, tm, path, t) and
-          base = getTypeMentionRoot(tm)
-        )
-      }
-
-      /**
-       * Holds if the declared type at `decl` for `dpos` at the `path` is `tp`
-       * and `path` starts with a type parameter of `base`.
-       */
-      pragma[nomagic]
-      private predicate declarationBaseType(
-        Declaration decl, DeclarationPosition dpos, Type base, TypePath path, TypeParameter tp
-      ) {
-        tp = decl.getDeclaredType(dpos, path) and
-        base.getATypeParameter() = path.getHead()
-      }
-
-      /**
-       * Holds if the (transitive) base type `t` at `path` of `a` in environment `e`
-       * for some `AccessPosition` matches the type parameter `tp`, which is used in
-       * the declared types of `target`.
-       *
-       * For example, in
-       *
-       * ```csharp
-       * class C<T1> { }
-       *
-       * class Base<T2> {
-       * //         ^^ `tp`
-       *     public C<T2> Method() { ... }
-       * //               ^^^^^^ `target`
-       * }
-       *
-       * class Mid<T3> : Base<C<T3>> { }
-       *
-       * class Sub<T4> : Mid<C<T4>> { }
-       *
-       *    new Sub<int>().Method(); // Note: `Sub<int>` is a subtype of `Base<C<C<int>>>`
-       * // ^^^^^^^^^^^^^^^^^^^^^^^ `a`
-       * ```
-       *
-       * we have that type parameter `T2` of `Base` is matched as follows:
-       *
-       * `path`    | `t`
-       * --------- | -------
-       * `""`      | ``C`1``
-       * `"T1"`    | ``C`1``
-       * `"T1.T1"` | `int`
-       */
-      pragma[nomagic]
-      private predicate baseTypeMatch(
-        Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
-      ) {
-        not exists(getTypeArgument(a, target, tp, _)) and
-        target = a.getTarget(e) and
-        exists(AccessPosition apos, DeclarationPosition dpos, Type base, TypePath pathToTypeParam |
-          accessBaseType(a, e, apos, base, pathToTypeParam.appendInverse(path), t) and
-          declarationBaseType(target, dpos, base, pathToTypeParam, tp) and
-          accessDeclarationPositionMatch(apos, dpos)
-        )
-      }
-
       /**
        * Holds if for `a` and corresponding `target` in environment `e`, the type parameter
        * `tp` is matched by a type argument at the access with type `t` and type path
@@ -1838,8 +1714,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         // We can infer the type of `tp` from one of the access positions
         directTypeMatch(a, e, target, path, t, tp)
         or
-        // We can infer the type of `tp` by going up the type hiearchy
-        baseTypeMatch(a, e, target, path, t, tp)
+        // We can infer the type of `tp` by going up the type hierarchy
+        AccessBaseType::baseTypeMatch(a, e, target, path, t, tp)
         or
         // We can infer the type of `tp` by a type constraint
         typeConstraintBaseTypeMatch(a, e, target, path, t, tp)
diff --git a/shared/typeinference/qlpack.yml b/shared/typeinference/qlpack.yml
index dfefd717254b..ab43c330dcc2 100644
--- a/shared/typeinference/qlpack.yml
+++ b/shared/typeinference/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeinference
-version: 0.0.31
+version: 0.0.33-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index 313862d5bc72..e9b5492b0d82 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.35
+
+No user-facing changes.
+
 ## 2.0.34
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.35.md b/shared/typetracking/change-notes/released/2.0.35.md
new file mode 100644
index 000000000000..526e1fc9f4ce
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.35.md
@@ -0,0 +1,3 @@
+## 2.0.35
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index 339a3ce7c57a..27eb8ef8ecea 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.34
+lastReleaseVersion: 2.0.35
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index 905cc886823a..de6ff4c16c99 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 2.0.34
+version: 2.0.36-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index 5838cd3c5355..dbafbea9b98d 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.51.md b/shared/typos/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 65791cd6efdf..0b6aee6fd1c4 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.50
+version: 1.0.52-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index 24a4f7d09a29..df741ed9d730 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.38
+
+No user-facing changes.
+
 ## 2.0.37
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.38.md b/shared/util/change-notes/released/2.0.38.md
new file mode 100644
index 000000000000..0fab2ede165d
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.38.md
@@ -0,0 +1,3 @@
+## 2.0.38
+
+No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index 108259a74002..4ec9eb0980cf 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.37
+lastReleaseVersion: 2.0.38
diff --git a/shared/util/codeql/util/DenseRank.qll b/shared/util/codeql/util/DenseRank.qll
index 89ab865e9595..6521bcec21ba 100644
--- a/shared/util/codeql/util/DenseRank.qll
+++ b/shared/util/codeql/util/DenseRank.qll
@@ -55,13 +55,33 @@ signature module DenseRankInputSig {
 module DenseRank<DenseRankInputSig Input> {
   private import Input
 
+  private int getARank() { result = getRank(_) }
+
+  pragma[noinline]
+  private int getARankGap() { result = getARank() and not result - 1 = getARank() }
+
+  pragma[noinline]
+  private predicate isDenseFrom(int i) { i = unique( | | getARankGap()) }
+
+  pragma[noinline]
+  private int getRankNeedsDenseRank(Ranked r) { result = getRank(r) and not isDenseFrom(_) }
+
   private int rankRank(Ranked r, int rnk) {
-    rnk = getRank(r) and
-    rnk = rank[result](int rnk0 | rnk0 = getRank(_) | rnk0)
+    rnk = getRankNeedsDenseRank(r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRankNeedsDenseRank(_) | rnk0)
   }
 
   /** Gets the `Ranked` value for which the dense rank is `rnk`. */
-  Ranked denseRank(int rnk) { rnk = rankRank(result, getRank(result)) }
+  pragma[nomagic]
+  Ranked denseRank(int rnk) {
+    rnk = rankRank(result, getRankNeedsDenseRank(result))
+    or
+    exists(int i, int offset |
+      isDenseFrom(i) and
+      offset = i - 1 and
+      rnk = getRank(result) - offset
+    )
+  }
 }
 
 /** Provides the input to `DenseRank1`. */
@@ -82,16 +102,38 @@ signature module DenseRankInputSig1 {
 module DenseRank1<DenseRankInputSig1 Input> {
   private import Input
 
+  private int getARank(C c) { result = getRank(c, _) }
+
+  pragma[noinline]
+  private int getARankGap(C c) { result = getARank(c) and not result - 1 = getARank(c) }
+
+  pragma[noinline]
+  private predicate isDenseFrom(C c, int i) { i = unique( | | getARankGap(c)) }
+
+  pragma[noinline]
+  private int getRankNeedsDenseRank(C c, Ranked r) {
+    result = getRank(c, r) and not isDenseFrom(c, _)
+  }
+
   private int rankRank(C c, Ranked r, int rnk) {
-    rnk = getRank(c, r) and
-    rnk = rank[result](int rnk0 | rnk0 = getRank(c, _) | rnk0)
+    rnk = getRankNeedsDenseRank(c, r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRankNeedsDenseRank(c, _) | rnk0)
   }
 
   /**
    * Gets the `Ranked` value for which the dense rank in the context provided by
    * `c` is `rnk`.
    */
-  Ranked denseRank(C c, int rnk) { rnk = rankRank(c, result, getRank(c, result)) }
+  pragma[nomagic]
+  Ranked denseRank(C c, int rnk) {
+    rnk = rankRank(c, result, getRankNeedsDenseRank(c, result))
+    or
+    exists(int i, int offset |
+      isDenseFrom(c, i) and
+      offset = i - 1 and
+      rnk = getRank(c, result) - offset
+    )
+  }
 }
 
 /** Provides the input to `DenseRank2`. */
@@ -116,16 +158,38 @@ signature module DenseRankInputSig2 {
 module DenseRank2<DenseRankInputSig2 Input> {
   private import Input
 
+  private int getARank(C1 c1, C2 c2) { result = getRank(c1, c2, _) }
+
+  pragma[noinline]
+  private int getARankGap(C1 c1, C2 c2) {
+    result = getARank(c1, c2) and not result - 1 = getARank(c1, c2)
+  }
+
+  pragma[noinline]
+  private predicate isDenseFrom(C1 c1, C2 c2, int i) { i = unique( | | getARankGap(c1, c2)) }
+
+  pragma[noinline]
+  private int getRankNeedsDenseRank(C1 c1, C2 c2, Ranked r) {
+    result = getRank(c1, c2, r) and not isDenseFrom(c1, c2, _)
+  }
+
   private int rankRank(C1 c1, C2 c2, Ranked r, int rnk) {
-    rnk = getRank(c1, c2, r) and
-    rnk = rank[result](int rnk0 | rnk0 = getRank(c1, c2, _) | rnk0)
+    rnk = getRankNeedsDenseRank(c1, c2, r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRankNeedsDenseRank(c1, c2, _) | rnk0)
   }
 
   /**
    * Gets the `Ranked` value for which the dense rank in the context provided by
    * `c1` and `c2` is `rnk`.
    */
+  pragma[nomagic]
   Ranked denseRank(C1 c1, C2 c2, int rnk) {
-    rnk = rankRank(c1, c2, result, getRank(c1, c2, result))
+    rnk = rankRank(c1, c2, result, getRankNeedsDenseRank(c1, c2, result))
+    or
+    exists(int i, int offset |
+      isDenseFrom(c1, c2, i) and
+      offset = i - 1 and
+      rnk = getRank(c1, c2, result) - offset
+    )
   }
 }
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index d7dd7255df0c..2914785b1464 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 2.0.37
+version: 2.0.39-dev
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index 96dfbcadf568..685a8032d640 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.51.md b/shared/xml/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index 8de2d725b225..0476610fda8e 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.50
+version: 1.0.52-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index e006acbeb214..4f57ee07cfa7 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.51
+
+No user-facing changes.
+
 ## 1.0.50
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.51.md b/shared/yaml/change-notes/released/1.0.51.md
new file mode 100644
index 000000000000..b96d48b88228
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.51.md
@@ -0,0 +1,3 @@
+## 1.0.51
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index 856137cc5db6..232dbe38ec8e 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.50
+lastReleaseVersion: 1.0.51
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 6c817def5005..ae27690a3f91 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.50
+version: 1.0.52-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/yeast-macros/src/parse.rs b/shared/yeast-macros/src/parse.rs
index 70bd46d5b6f6..608c332d47e8 100644
--- a/shared/yeast-macros/src/parse.rs
+++ b/shared/yeast-macros/src/parse.rs
@@ -113,8 +113,24 @@ fn parse_query_node_inner(tokens: &mut Tokens) -> Result<TokenStream> {
 /// appear in any order; bare patterns are accumulated and emitted as a
 /// single `("child", ...)` entry.
 fn parse_query_fields(tokens: &mut Tokens) -> Result<Vec<TokenStream>> {
-    let mut fields = Vec::new();
+    // Accumulate per-field elems in declaration order; multiple uses of the
+    // same field name extend the same list (so e.g. `cond: (foo) cond: (bar)`
+    // matches a `cond` field whose first child is `foo` and second is `bar`).
+    let mut field_order: Vec<String> = Vec::new();
+    let mut field_elems: std::collections::HashMap<String, Vec<TokenStream>> =
+        std::collections::HashMap::new();
     let mut bare_children: Vec<TokenStream> = Vec::new();
+    let push_field_elem = |order: &mut Vec<String>,
+                               map: &mut std::collections::HashMap<String, Vec<TokenStream>>,
+                               name: String,
+                               elem: TokenStream| {
+        if !map.contains_key(&name) {
+            order.push(name.clone());
+            map.insert(name, vec![elem]);
+        } else {
+            map.get_mut(&name).unwrap().push(elem);
+        }
+    };
     while tokens.peek().is_some() {
         if peek_is_field(tokens) {
             let field_name = expect_ident(tokens, "expected field name")?;
@@ -122,10 +138,40 @@ fn parse_query_fields(tokens: &mut Tokens) -> Result<Vec<TokenStream>> {
 
             expect_punct(tokens, ':', "expected `:` after field name")?;
 
-            let child = parse_query_node(tokens)?;
-            fields.push(quote! {
-                (#field_str, vec![yeast::query::QueryListElem::SingleNode(#child)])
-            });
+            // Parse the field's pattern. To support repetition like
+            // `field: (kind)* @cap`, parse the atom first, then check for
+            // a quantifier, and lastly handle a trailing `@capture`.
+            let atom = parse_query_atom(tokens)?;
+            if peek_is_repetition(tokens) {
+                let rep = expect_repetition(tokens)?;
+                let elem = quote! {
+                    yeast::query::QueryListElem::Repeated {
+                        children: vec![yeast::query::QueryListElem::SingleNode(#atom)],
+                        rep: #rep,
+                    }
+                };
+                let elem = maybe_wrap_list_capture(tokens, elem)?;
+                push_field_elem(&mut field_order, &mut field_elems, field_str, elem);
+            } else {
+                let child = if peek_is_at(tokens) {
+                    tokens.next();
+                    let capture_name =
+                        expect_ident(tokens, "expected capture name after @")?;
+                    let name_str = capture_name.to_string();
+                    quote! {
+                        yeast::query::QueryNode::Capture {
+                            capture: #name_str,
+                            node: Box::new(#atom),
+                        }
+                    }
+                } else {
+                    atom
+                };
+                let elem = quote! {
+                    yeast::query::QueryListElem::SingleNode(#child)
+                };
+                push_field_elem(&mut field_order, &mut field_elems, field_str, elem);
+            }
         } else {
             // Bare patterns — accumulate into the implicit `child` field.
             // We don't break here, so we can interleave with named fields.
@@ -137,6 +183,13 @@ fn parse_query_fields(tokens: &mut Tokens) -> Result<Vec<TokenStream>> {
             bare_children.extend(elems);
         }
     }
+    let mut fields: Vec<TokenStream> = Vec::new();
+    for name in field_order {
+        let elems = field_elems.remove(&name).unwrap();
+        fields.push(quote! {
+            (#name, vec![#(#elems),*])
+        });
+    }
     if !bare_children.is_empty() {
         fields.push(quote! {
             ("child", vec![#(#bare_children),*])
@@ -299,7 +352,7 @@ fn parse_direct_node(tokens: &mut Tokens, ctx: &Ident) -> Result<TokenStream> {
         Some(TokenTree::Group(g)) if g.delimiter() == Delimiter::Brace => {
             let group = expect_group(tokens, Delimiter::Brace)?;
             let expr = group.stream();
-            Ok(quote! { #expr })
+            Ok(quote! { ::std::convert::Into::<usize>::into(#expr) })
         }
         Some(TokenTree::Group(g)) if g.delimiter() == Delimiter::Parenthesis => {
             let group = expect_group(tokens, Delimiter::Parenthesis)?;
@@ -329,12 +382,17 @@ fn parse_direct_node_inner(tokens: &mut Tokens, ctx: &Ident) -> Result<TokenStre
         return Ok(quote! { #ctx.literal(#kind_str, #lit) });
     }
 
-    // Check for (kind #{expr}) — computed literal, expr converted via .to_string()
+    // Check for (kind #{expr}) — computed literal, expr converted via YeastDisplay
     if peek_is_hash(tokens) {
         tokens.next(); // consume #
         let group = expect_group(tokens, Delimiter::Brace)?;
         let expr = group.stream();
-        return Ok(quote! { #ctx.literal(#kind_str, &(#expr).to_string()) });
+        return Ok(quote! {
+            {
+                let __value = yeast::YeastDisplay::yeast_to_string(&(#expr), &*#ctx.ast);
+                #ctx.literal(#kind_str, &__value)
+            }
+        });
     }
 
     // Check for (kind $fresh)
@@ -374,7 +432,11 @@ fn parse_direct_node_inner(tokens: &mut Tokens, ctx: &Ident) -> Result<TokenStre
                     inner.next(); // consume first .
                     inner.next(); // consume second .
                     let expr: proc_macro2::TokenStream = inner.collect();
-                    stmts.push(quote! { let #temp: Vec<usize> = #expr; });
+                    stmts.push(quote! {
+                        let #temp: Vec<usize> = (#expr).into_iter()
+                            .map(::std::convert::Into::<usize>::into)
+                            .collect();
+                    });
                     field_args.push(quote! { (#field_str, #temp) });
                     continue;
                 }
@@ -382,7 +444,7 @@ fn parse_direct_node_inner(tokens: &mut Tokens, ctx: &Ident) -> Result<TokenStre
         }
 
         let value = parse_direct_node(tokens, ctx)?;
-        stmts.push(quote! { let #temp = #value; });
+        stmts.push(quote! { let #temp: usize = #value; });
         field_args.push(quote! { (#field_str, vec![#temp]) });
     }
 
@@ -427,10 +489,16 @@ fn parse_direct_list(tokens: &mut Tokens, ctx: &Ident) -> Result<Vec<TokenStream
                 inner.next(); // consume first .
                 inner.next(); // consume second .
                 let expr: TokenStream = inner.collect();
-                items.push(quote! { __nodes.extend(#expr); });
+                items.push(quote! {
+                    __nodes.extend(
+                        (#expr).into_iter().map(::std::convert::Into::<usize>::into)
+                    );
+                });
             } else {
                 let expr = group.stream();
-                items.push(quote! { __nodes.push(#expr); });
+                items.push(quote! {
+                    __nodes.push(::std::convert::Into::<usize>::into(#expr));
+                });
             }
             continue;
         }
@@ -580,13 +648,24 @@ pub fn parse_rule_top(input: TokenStream) -> Result<TokenStream> {
             let name_str = &cap.name;
             match cap.multiplicity {
                 CaptureMultiplicity::Repeated => {
-                    quote! { let #name: Vec<usize> = __captures.get_all(#name_str); }
+                    quote! {
+                        let #name: Vec<yeast::NodeRef> = __captures.get_all(#name_str)
+                            .into_iter()
+                            .map(yeast::NodeRef)
+                            .collect();
+                    }
                 }
                 CaptureMultiplicity::Optional => {
-                    quote! { let #name: Option<usize> = __captures.get_opt(#name_str); }
+                    quote! {
+                        let #name: Option<yeast::NodeRef> =
+                            __captures.get_opt(#name_str).map(yeast::NodeRef);
+                    }
                 }
                 CaptureMultiplicity::Single => {
-                    quote! { let #name: usize = __captures.get_var(#name_str).unwrap(); }
+                    quote! {
+                        let #name: yeast::NodeRef =
+                            yeast::NodeRef(__captures.get_var(#name_str).unwrap());
+                    }
                 }
             }
         })
@@ -613,19 +692,26 @@ pub fn parse_rule_top(input: TokenStream) -> Result<TokenStream> {
                     CaptureMultiplicity::Repeated => quote! {
                         let __field_id = #ctx_ident.ast.field_id_for_name(#name_str)
                             .unwrap_or_else(|| panic!("field '{}' not found", #name_str));
-                        __fields.insert(__field_id, #name);
+                        __fields.insert(
+                            __field_id,
+                            #name.into_iter()
+                                .map(::std::convert::Into::<usize>::into)
+                                .collect(),
+                        );
                     },
                     CaptureMultiplicity::Optional => quote! {
                         let __field_id = #ctx_ident.ast.field_id_for_name(#name_str)
                             .unwrap_or_else(|| panic!("field '{}' not found", #name_str));
                         if let Some(__id) = #name {
-                            __fields.entry(__field_id).or_insert_with(Vec::new).push(__id);
+                            __fields.entry(__field_id).or_insert_with(Vec::new)
+                                .push(::std::convert::Into::<usize>::into(__id));
                         }
                     },
                     CaptureMultiplicity::Single => quote! {
                         let __field_id = #ctx_ident.ast.field_id_for_name(#name_str)
                             .unwrap_or_else(|| panic!("field '{}' not found", #name_str));
-                        __fields.entry(__field_id).or_insert_with(Vec::new).push(#name);
+                        __fields.entry(__field_id).or_insert_with(Vec::new)
+                            .push(::std::convert::Into::<usize>::into(#name));
                     },
                 }
             })
diff --git a/shared/yeast/doc/yeast.md b/shared/yeast/doc/yeast.md
index 893cdea24dde..823bf1c19425 100644
--- a/shared/yeast/doc/yeast.md
+++ b/shared/yeast/doc/yeast.md
@@ -349,8 +349,8 @@ to enable rewriting:
 
 ```rust
 let desugar = yeast::DesugaringConfig::new()
-    .add_phase("cleanup", cleanup_rules())
-    .add_phase("desugar", desugar_rules())
+    .add_phase("cleanup", yeast::PhaseKind::Repeating, cleanup_rules())
+    .add_phase("translate", yeast::PhaseKind::OneShot, translate_rules())
     .with_output_node_types_yaml(include_str!("output-node-types.yml"));
 
 let lang = simple::LanguageSpec {
@@ -365,6 +365,15 @@ let lang = simple::LanguageSpec {
 A single-phase config is just `.add_phase(...)` called once. Phase names
 appear in error messages so you can tell which phase failed.
 
+There are two kinds of phases:
+- **Repeating**:
+    Each node is re-processed until none of the rules in the phase matches.
+    When a node no longer matches any rules, its children are recursively processed. In practice this is used to desugar or simplify an AST, while staying mostly within the same schema.
+- **One-shot**:
+    Each node is processed by the first matching rule, and the engine panics if no rule matches.
+    Rules are then recursively applied to every captured node.
+    In practice this is used when translating from one AST schema to another, where an exhaustive match is required.
+
 The same YAML node-types is used for both the runtime yeast `Schema` (so
 rules can refer to output-only kinds and fields) and TRAP validation (it
 is converted to JSON internally).
diff --git a/shared/yeast/src/captures.rs b/shared/yeast/src/captures.rs
index a92c5096e94e..ef184cd9f69a 100644
--- a/shared/yeast/src/captures.rs
+++ b/shared/yeast/src/captures.rs
@@ -61,6 +61,21 @@ impl Captures {
             }
         }
     }
+
+    /// Apply a fallible function to every captured id (across all keys),
+    /// replacing each id with the result. Stops and returns the error on
+    /// the first failure.
+    pub fn try_map_all_captures<E>(
+        &mut self,
+        mut f: impl FnMut(Id) -> Result<Id, E>,
+    ) -> Result<(), E> {
+        for ids in self.captures.values_mut() {
+            for id in ids {
+                *id = f(*id)?;
+            }
+        }
+        Ok(())
+    }
     pub fn map_captures_to(&mut self, from: &str, to: &'static str, f: &mut impl FnMut(Id) -> Id) {
         if let Some(from_ids) = self.captures.get(from) {
             let new_values = from_ids.iter().copied().map(f).collect();
diff --git a/shared/yeast/src/dump.rs b/shared/yeast/src/dump.rs
index 99ba019cc3ea..07ee134e058c 100644
--- a/shared/yeast/src/dump.rs
+++ b/shared/yeast/src/dump.rs
@@ -1,6 +1,6 @@
 use std::fmt::Write;
 
-use crate::{Ast, Node, NodeContent, CHILD_FIELD};
+use crate::{schema::Schema, Ast, Node, NodeContent, CHILD_FIELD};
 
 /// Options for controlling AST dump output.
 pub struct DumpOptions {
@@ -45,16 +45,143 @@ pub fn dump_ast_with_options(
     options: &DumpOptions,
 ) -> String {
     let mut out = String::new();
-    dump_node(ast, root, source, options, 0, &mut out);
+    dump_node(ast, root, source, options, 0, None, &mut out);
     out
 }
 
+/// Dump an AST and annotate type mismatches against a schema inline.
+///
+/// Any node that does not match the expected type set for its parent field is
+/// rendered with a trailing `" <-- ERROR: ..."` annotation on the same line.
+pub fn dump_ast_with_type_errors(
+    ast: &Ast,
+    root: usize,
+    source: &str,
+    schema: &Schema,
+) -> String {
+    dump_ast_with_type_errors_and_options(ast, root, source, schema, &DumpOptions::default())
+}
+
+/// Dump an AST and annotate type mismatches against a schema inline.
+///
+/// Any node that does not match the expected type set for its parent field is
+/// rendered with a trailing `" <-- ERROR: ..."` annotation on the same line.
+pub fn dump_ast_with_type_errors_and_options(
+    ast: &Ast,
+    root: usize,
+    source: &str,
+    schema: &Schema,
+    options: &DumpOptions,
+) -> String {
+    let mut out = String::new();
+    dump_node(ast, root, source, options, 0, Some((schema, None, None)), &mut out);
+    out
+}
+
+fn format_node_types(node_types: &[crate::schema::NodeType]) -> String {
+    node_types
+        .iter()
+        .map(|t| {
+            if t.named {
+                t.kind.clone()
+            } else {
+                format!("\"{}\"", t.kind)
+            }
+        })
+        .collect::<Vec<_>>()
+        .join(" | ")
+}
+
+const EMPTY_NODE_TYPES: &[crate::schema::NodeType] = &[];
+
+/// Generate a type-checking error message for a node if it doesn't match expected types.
+///
+/// # Arguments
+/// - `schema`: The AST schema to validate against.
+/// - `node`: The node being checked.
+/// - `expected`: The set of allowed types for this node, or `None` if type-checking is disabled.
+/// - `parent_field`: Optional tuple of (parent_kind, field_name) for context in error messages.
+///
+/// # Returns
+/// `Some(error_message)` if the node violates the schema (e.g., wrong kind, missing field declaration).
+/// `None` if the node matches the expected types or if type-checking is disabled.
+fn type_error_for_node(
+    schema: &Schema,
+    node: &Node,
+    expected: Option<&[crate::schema::NodeType]>,
+    parent_field: Option<(&str, &str)>,
+) -> Option<String> {
+    if schema.id_for_node_kind(node.kind_name()).is_none()
+        && schema.id_for_unnamed_node_kind(node.kind_name()).is_none()
+    {
+        return Some(format!("node kind '{}' not in schema", node.kind_name()));
+    }
+
+    let expected = expected?;
+    if expected.is_empty() {
+        if let Some((kind, field)) = parent_field {
+            return Some(format!("the node '{kind}' has no field '{field}'"));
+        }
+        return Some("field not declared in schema for this parent node".to_string());
+    }
+    if schema.node_matches_types(node.kind_name(), node.is_named(), expected) {
+        None
+    } else {
+        let actual = if node.is_named() {
+            node.kind_name().to_string()
+        } else {
+            format!("\"{}\"", node.kind_name())
+        };
+
+        if let Some((kind, field)) = parent_field {
+            Some(format!(
+                "The field {}.{} should contain {}, but got {}",
+                kind,
+                field,
+                format_node_types(expected),
+                actual
+            ))
+        } else {
+            Some(format!(
+                "expected {}, got {}",
+                format_node_types(expected),
+                actual
+            ))
+        }
+    }
+}
+
+/// Look up the allowed types for a field in the schema.
+///
+/// # Arguments
+/// - `schema`: The AST schema to query.
+/// - `parent_kind`: The node kind of the parent that contains this field.
+/// - `field_id`: The field ID within that parent node.
+///
+/// # Returns
+/// `Some(&[NodeType])` if the field is declared in the schema and has type constraints.
+/// `None` if the field is not declared or has no constraints (undeclared field).
+fn expected_for_field<'a>(
+    schema: &'a Schema,
+    parent_kind: &str,
+    field_id: u16,
+) -> Option<&'a [crate::schema::NodeType]> {
+    schema
+        .field_types(parent_kind, field_id)
+        .map(|v| v.as_slice())
+}
+
 fn dump_node(
     ast: &Ast,
     id: usize,
     source: &str,
     options: &DumpOptions,
     indent: usize,
+    type_check: Option<(
+        &Schema,
+        Option<&[crate::schema::NodeType]>,
+        Option<(&str, &str)>,
+    )>,
     out: &mut String,
 ) {
     let node = match ast.get_node(id) {
@@ -90,6 +217,12 @@ fn dump_node(
         }
     }
 
+    if let Some((schema, expected, parent_field)) = type_check {
+        if let Some(err) = type_error_for_node(schema, node, expected, parent_field) {
+            write!(out, " <-- ERROR: {err}").unwrap();
+        }
+    }
+
     writeln!(out).unwrap();
 
     // Named fields first
@@ -98,31 +231,68 @@ fn dump_node(
             continue; // Handle unnamed children last
         }
         let field_name = ast.field_name_for_id(field_id).unwrap_or("?");
+        let child_type_check = type_check.map(|(schema, _, _)| {
+            let expected = expected_for_field(schema, node.kind_name(), field_id)
+                .or(Some(EMPTY_NODE_TYPES));
+            let parent_field = Some((node.kind_name(), field_name));
+            (schema, expected, parent_field)
+        });
+
         if children.len() == 1 {
             write!(out, "{prefix}  {field_name}:").unwrap();
             // Inline single child
             let child = ast.get_node(children[0]);
             if child.is_some_and(is_leaf) {
                 write!(out, " ").unwrap();
-                dump_node_inline(ast, children[0], source, options, out);
+                dump_node_inline(ast, children[0], source, options, child_type_check, out);
             } else {
                 writeln!(out).unwrap();
-                dump_node(ast, children[0], source, options, indent + 2, out);
+                dump_node(
+                    ast,
+                    children[0],
+                    source,
+                    options,
+                    indent + 2,
+                    child_type_check,
+                    out,
+                );
             }
         } else {
             writeln!(out, "{prefix}  {field_name}:").unwrap();
             for &child_id in children {
-                dump_node(ast, child_id, source, options, indent + 2, out);
+                dump_node(
+                    ast,
+                    child_id,
+                    source,
+                    options,
+                    indent + 2,
+                    child_type_check,
+                    out,
+                );
             }
         }
     }
 
     // Unnamed children — skip unnamed tokens (keywords, punctuation)
     if let Some(children) = node.fields.get(&CHILD_FIELD) {
+        let child_type_check = type_check.map(|(schema, _, _)| {
+            let expected = expected_for_field(schema, node.kind_name(), CHILD_FIELD)
+                .or(Some(EMPTY_NODE_TYPES));
+            let parent_field = Some((node.kind_name(), "children"));
+            (schema, expected, parent_field)
+        });
         for &child_id in children {
             if let Some(child) = ast.get_node(child_id) {
                 if child.is_named() {
-                    dump_node(ast, child_id, source, options, indent + 1, out);
+                    dump_node(
+                        ast,
+                        child_id,
+                        source,
+                        options,
+                        indent + 1,
+                        child_type_check,
+                        out,
+                    );
                 }
             }
         }
@@ -130,7 +300,18 @@ fn dump_node(
 }
 
 /// Dump a leaf node inline (no newline prefix, caller provides context).
-fn dump_node_inline(ast: &Ast, id: usize, source: &str, options: &DumpOptions, out: &mut String) {
+fn dump_node_inline(
+    ast: &Ast,
+    id: usize,
+    source: &str,
+    options: &DumpOptions,
+    type_check: Option<(
+        &Schema,
+        Option<&[crate::schema::NodeType]>,
+        Option<(&str, &str)>,
+    )>,
+    out: &mut String,
+) {
     let node = match ast.get_node(id) {
         Some(n) => n,
         None => return,
@@ -159,6 +340,12 @@ fn dump_node_inline(ast: &Ast, id: usize, source: &str, options: &DumpOptions, o
         }
     }
 
+    if let Some((schema, expected, parent_field)) = type_check {
+        if let Some(err) = type_error_for_node(schema, node, expected, parent_field) {
+            write!(out, " <-- ERROR: {err}").unwrap();
+        }
+    }
+
     writeln!(out).unwrap();
 }
 
diff --git a/shared/yeast/src/lib.rs b/shared/yeast/src/lib.rs
index 281f44a98b26..8826c3d6c1e3 100644
--- a/shared/yeast/src/lib.rs
+++ b/shared/yeast/src/lib.rs
@@ -23,12 +23,73 @@ pub use cursor::Cursor;
 use query::QueryNode;
 
 /// Node ids are indexes into the arena
-type Id = usize;
+pub type Id = usize;
 
 /// Field and Kind ids are provided by tree-sitter
 type FieldId = u16;
 type KindId = u16;
 
+/// A typed reference to a node in an [`Ast`] arena. Wraps an [`Id`] but
+/// deliberately does not implement [`std::fmt::Display`]: rendering a node
+/// requires the [`Ast`] it lives in (to resolve [`NodeContent::Range`] back
+/// to source text). Use [`YeastDisplay::yeast_to_string`] to format it.
+#[derive(Copy, Clone, Eq, PartialEq, Debug, Hash)]
+pub struct NodeRef(pub Id);
+
+impl NodeRef {
+    pub fn id(self) -> Id {
+        self.0
+    }
+}
+
+impl From<NodeRef> for Id {
+    fn from(value: NodeRef) -> Self {
+        value.0
+    }
+}
+
+/// Like [`std::fmt::Display`], but the formatting routine is given access to
+/// the [`Ast`] so that node references can resolve to their source text.
+///
+/// All standard primitive and string types implement [`YeastDisplay`] via
+/// the [`impl_yeast_display_via_display`] macro below. Coherence prevents a
+/// blanket `impl<T: Display>`, so additional types must be added explicitly.
+pub trait YeastDisplay {
+    fn yeast_to_string(&self, ast: &Ast) -> String;
+}
+
+impl YeastDisplay for NodeRef {
+    fn yeast_to_string(&self, ast: &Ast) -> String {
+        ast.source_text(self.0)
+    }
+}
+
+macro_rules! impl_yeast_display_via_display {
+    ($($t:ty),* $(,)?) => {
+        $(
+            impl YeastDisplay for $t {
+                fn yeast_to_string(&self, _ast: &Ast) -> String {
+                    ::std::string::ToString::to_string(self)
+                }
+            }
+        )*
+    };
+}
+
+impl_yeast_display_via_display! {
+    i8, i16, i32, i64, i128, isize,
+    u8, u16, u32, u64, u128, usize,
+    f32, f64,
+    bool, char,
+    str, String,
+}
+
+impl<T: YeastDisplay + ?Sized> YeastDisplay for &T {
+    fn yeast_to_string(&self, ast: &Ast) -> String {
+        (**self).yeast_to_string(ast)
+    }
+}
+
 pub const CHILD_FIELD: u16 = u16::MAX;
 
 #[derive(Debug)]
@@ -160,6 +221,9 @@ pub struct Ast {
     root: Id,
     nodes: Vec<Node>,
     schema: schema::Schema,
+    /// Original source bytes the tree was parsed from. Used to resolve
+    /// `NodeContent::Range` to text for synthesized literal nodes.
+    source: Vec<u8>,
 }
 
 impl std::fmt::Debug for Ast {
@@ -182,21 +246,93 @@ impl Ast {
         schema: schema::Schema,
         tree: &tree_sitter::Tree,
         language: &tree_sitter::Language,
+    ) -> Self {
+        Self::from_tree_with_schema_and_source(schema, tree, language, Vec::new())
+    }
+
+    pub fn from_tree_with_schema_and_source(
+        schema: schema::Schema,
+        tree: &tree_sitter::Tree,
+        language: &tree_sitter::Language,
+        source: Vec<u8>,
     ) -> Self {
         let mut visitor = visitor::Visitor::new(language.clone());
         visitor.visit(tree);
 
-        visitor.build_with_schema(schema)
+        let mut ast = visitor.build_with_schema(schema);
+        ast.source = source;
+        ast
+    }
+
+    /// Returns the source text for `id`, resolving `NodeContent::Range`
+    /// against the stored source bytes when available.
+    pub fn source_text(&self, id: Id) -> String {
+        let Some(node) = self.get_node(id) else { return String::new(); };
+        let read_range = |range: &tree_sitter::Range| {
+            let start = range.start_byte;
+            let end = range.end_byte;
+            if end <= self.source.len() && start <= end {
+                String::from_utf8_lossy(&self.source[start..end]).into_owned()
+            } else {
+                String::new()
+            }
+        };
+        match &node.content {
+            NodeContent::Range(range) => read_range(range),
+            NodeContent::String(s) => s.to_string(),
+            NodeContent::DynamicString(s) if !s.is_empty() => s.clone(),
+            // Synthesized nodes (from rule transforms) carry an empty
+            // `DynamicString`; resolve them against the inherited source
+            // range so `#{capture}` after a translation still yields the
+            // original source text.
+            NodeContent::DynamicString(_) => match node.source_range {
+                Some(range) => read_range(&range),
+                None => String::new(),
+            },
+        }
     }
 
     pub fn walk(&self) -> AstCursor {
         AstCursor::new(self)
     }
 
+    /// Return all nodes currently allocated in the AST arena.
+    ///
+    /// This includes nodes that are no longer reachable from `get_root()`
+    /// after desugaring rewrites. Use `reachable_node_ids()` for output-level
+    /// validation/traversal semantics.
     pub fn nodes(&self) -> &[Node] {
         &self.nodes
     }
 
+    /// Return node ids reachable from `get_root()` by following child edges.
+    ///
+    /// This reflects the effective AST after desugaring and excludes orphaned
+    /// arena nodes left behind by rewrite operations.
+    pub fn reachable_node_ids(&self) -> Vec<usize> {
+        let mut reachable = Vec::new();
+        let mut stack = vec![self.root];
+        let mut seen = vec![false; self.nodes.len()];
+
+        while let Some(id) = stack.pop() {
+            if id >= self.nodes.len() || seen[id] {
+                continue;
+            }
+            seen[id] = true;
+            reachable.push(id);
+
+            if let Some(node) = self.get_node(id) {
+                for children in node.fields.values() {
+                    for &child in children {
+                        stack.push(child);
+                    }
+                }
+            }
+        }
+
+        reachable
+    }
+
     pub fn get_root(&self) -> Id {
         self.root
     }
@@ -493,18 +629,39 @@ impl Rule {
         node: Id,
         fresh: &tree_builder::FreshScope,
     ) -> Result<Option<Vec<Id>>, String> {
+        match self.try_match(ast, node)? {
+            Some(captures) => Ok(Some(self.run_transform(ast, captures, node, fresh))),
+            None => Ok(None),
+        }
+    }
+
+    /// Attempt to match this rule's query against `node`, returning the
+    /// resulting captures on success. Does not invoke the transform.
+    fn try_match(&self, ast: &Ast, node: Id) -> Result<Option<Captures>, String> {
         let mut captures = Captures::new();
         if self.query.do_match(ast, node, &mut captures)? {
-            fresh.next_scope();
-            let source_range = ast.get_node(node).and_then(|n| match n.content {
-                NodeContent::Range(r) => Some(r),
-                _ => n.source_range,
-            });
-            Ok(Some((self.transform)(ast, captures, fresh, source_range)))
+            Ok(Some(captures))
         } else {
             Ok(None)
         }
     }
+
+    /// Run this rule's transform with the given captures, using `node`'s
+    /// source range as the source range of the produced nodes.
+    fn run_transform(
+        &self,
+        ast: &mut Ast,
+        captures: Captures,
+        node: Id,
+        fresh: &tree_builder::FreshScope,
+    ) -> Vec<Id> {
+        fresh.next_scope();
+        let source_range = ast.get_node(node).and_then(|n| match n.content {
+            NodeContent::Range(r) => Some(r),
+            _ => n.source_range,
+        });
+        (self.transform)(ast, captures, fresh, source_range)
+    }
 }
 
 const MAX_REWRITE_DEPTH: usize = 100;
@@ -539,17 +696,17 @@ impl<'a> RuleIndex<'a> {
     }
 }
 
-fn apply_rules(
+fn apply_repeating_rules(
     rules: &[Rule],
     ast: &mut Ast,
     id: Id,
     fresh: &tree_builder::FreshScope,
 ) -> Result<Vec<Id>, String> {
     let index = RuleIndex::new(rules);
-    apply_rules_inner(&index, ast, id, fresh, 0, None)
+    apply_repeating_rules_inner(&index, ast, id, fresh, 0, None)
 }
 
-fn apply_rules_inner(
+fn apply_repeating_rules_inner(
     index: &RuleIndex,
     ast: &mut Ast,
     id: Id,
@@ -578,7 +735,7 @@ fn apply_rules_inner(
             let next_skip = if rule.repeated { None } else { Some(rule_ptr) };
             let mut results = Vec::new();
             for node in result_node {
-                results.extend(apply_rules_inner(
+                results.extend(apply_repeating_rules_inner(
                     index,
                     ast,
                     node,
@@ -603,7 +760,7 @@ fn apply_rules_inner(
     for children in fields.values_mut() {
         let mut new_children: Option<Vec<Id>> = None;
         for (i, &child_id) in children.iter().enumerate() {
-            let result = apply_rules_inner(index, ast, child_id, fresh, rewrite_depth, None)?;
+            let result = apply_repeating_rules_inner(index, ast, child_id, fresh, rewrite_depth, None)?;
             let unchanged = result.len() == 1 && result[0] == child_id;
             match (&mut new_children, unchanged) {
                 (None, true) => {} // unchanged so far, no allocation needed
@@ -628,6 +785,92 @@ fn apply_rules_inner(
     Ok(vec![id])
 }
 
+/// Apply rules using `OneShot` semantics: the first matching rule fires on
+/// each visited node, recursion proceeds only through captured nodes (not
+/// through the input node's children directly), and an error is returned if
+/// no rule matches a visited node.
+fn apply_one_shot_rules(
+    rules: &[Rule],
+    ast: &mut Ast,
+    id: Id,
+    fresh: &tree_builder::FreshScope,
+) -> Result<Vec<Id>, String> {
+    let index = RuleIndex::new(rules);
+    apply_one_shot_rules_inner(&index, ast, id, fresh, 0)
+}
+
+fn apply_one_shot_rules_inner(
+    index: &RuleIndex,
+    ast: &mut Ast,
+    id: Id,
+    fresh: &tree_builder::FreshScope,
+    rewrite_depth: usize,
+) -> Result<Vec<Id>, String> {
+
+    if rewrite_depth > MAX_REWRITE_DEPTH {
+        return Err(format!(
+            "Desugaring exceeded maximum rewrite depth ({MAX_REWRITE_DEPTH}). \
+             This likely indicates a non-terminating rule cycle."
+        ));
+    }
+
+    let node_kind = ast.get_node(id).map(|n| n.kind()).unwrap_or("");
+
+    // Don't rewrite unnamed nodes (punctuation, keywords, etc.); leave them
+    // as-is. Rules target named nodes only.
+    if let Some(node) = ast.get_node(id) {
+        if !node.is_named() {
+            return Ok(vec![id]);
+        }
+    }
+
+    for rule in index.rules_for_kind(node_kind) {
+        if let Some(mut captures) = rule.try_match(ast, id)? {
+            // Recursively translate every captured node before invoking the
+            // transform. The transform's output uses output-schema kinds, so
+            // we must translate captured input-schema nodes to their
+            // output-schema equivalents first.
+            captures.try_map_all_captures(|captured_id| {
+                // Avoid infinite recursion when a capture refers to the root
+                // node of the matched tree (e.g. an `@_` capture on the
+                // pattern root): re-analyzing it would match the same rule
+                // again indefinitely.
+                if captured_id == id {
+                    return Ok(captured_id);
+                }
+                let result =
+                    apply_one_shot_rules_inner(index, ast, captured_id, fresh, rewrite_depth + 1)?;
+                if result.len() != 1 {
+                    return Err(format!(
+                        "OneShot: recursion on captured node produced {} results, expected exactly 1",
+                        result.len()
+                    ));
+                }
+                Ok(result[0])
+            })?;
+            return Ok(rule.run_transform(ast, captures, id, fresh));
+        }
+    }
+
+    Err(format!(
+        "OneShot: no rule matched node of kind '{node_kind}'"
+    ))
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum PhaseKind {
+    /// A node is re-processed until none of the rules in the phase matches,
+    /// albeit a single rule cannot be applied twice in a row unless that rule is also marked as repeating.
+    /// When a node no longer matches any rules, its children are recursively processed (top down).
+    Repeating,
+
+    /// A node is processed by the first matching rule, and the engine panics if no rule matches.
+    /// Rules are then recursively applied to every captured node.
+    /// In practice this is used when translating from one AST schema to another, where every node must be rewritten,
+    /// and it would be a type error to match the rule patterns (based on the input schema) against the output nodes (which conform to the output schema).
+    OneShot,
+}
+
 /// One phase of a desugaring pass: a named bundle of rules that runs to
 /// completion (a full traversal applying its rules) before the next phase
 /// starts. Rules within a phase compete for matches as usual; rules in
@@ -637,13 +880,15 @@ pub struct Phase {
     /// Name used in error messages.
     pub name: String,
     pub rules: Vec<Rule>,
+    pub kind: PhaseKind,
 }
 
 impl Phase {
-    pub fn new(name: impl Into<String>, rules: Vec<Rule>) -> Self {
+    pub fn new(name: impl Into<String>, kind: PhaseKind, rules: Vec<Rule>) -> Self {
         Self {
             name: name.into(),
             rules,
+            kind,
         }
     }
 }
@@ -661,8 +906,8 @@ impl Phase {
 ///
 /// ```ignore
 /// let config = yeast::DesugaringConfig::new()
-///     .add_phase("cleanup", cleanup_rules)
-///     .add_phase("desugar", desugar_rules)
+///     .add_phase("cleanup", PhaseKind::Repeating, cleanup_rules)
+///     .add_phase("desugar", PhaseKind::Repeating, desugar_rules)
 ///     .with_output_node_types_yaml(yaml);
 /// ```
 #[derive(Default)]
@@ -682,9 +927,14 @@ impl DesugaringConfig {
         Self::default()
     }
 
-    /// Append a new phase with the given name and rules.
-    pub fn add_phase(mut self, name: impl Into<String>, rules: Vec<Rule>) -> Self {
-        self.phases.push(Phase::new(name, rules));
+    /// Append a new phase with the given name, kind, and rules.
+    pub fn add_phase(
+        mut self,
+        name: impl Into<String>,
+        kind: PhaseKind,
+        rules: Vec<Rule>,
+    ) -> Self {
+        self.phases.push(Phase::new(name, kind, rules));
         self
     }
 
@@ -747,8 +997,17 @@ impl<'a> Runner<'a> {
         })
     }
 
-    pub fn run_from_tree(&self, tree: &tree_sitter::Tree) -> Result<Ast, String> {
-        let mut ast = Ast::from_tree_with_schema(self.schema.clone(), tree, &self.language);
+    pub fn run_from_tree(
+        &self,
+        tree: &tree_sitter::Tree,
+        source: &[u8],
+    ) -> Result<Ast, String> {
+        let mut ast = Ast::from_tree_with_schema_and_source(
+            self.schema.clone(),
+            tree,
+            &self.language,
+            source.to_vec(),
+        );
         self.run_phases(&mut ast)?;
         Ok(ast)
     }
@@ -761,7 +1020,12 @@ impl<'a> Runner<'a> {
         let tree = parser
             .parse(input, None)
             .ok_or_else(|| "Failed to parse input".to_string())?;
-        let mut ast = Ast::from_tree_with_schema(self.schema.clone(), &tree, &self.language);
+        let mut ast = Ast::from_tree_with_schema_and_source(
+            self.schema.clone(),
+            &tree,
+            &self.language,
+            input.as_bytes().to_vec(),
+        );
         self.run_phases(&mut ast)?;
         Ok(ast)
     }
@@ -773,8 +1037,11 @@ impl<'a> Runner<'a> {
         let fresh = tree_builder::FreshScope::new();
         let mut root = ast.get_root();
         for phase in self.phases {
-            let res = apply_rules(&phase.rules, ast, root, &fresh)
-                .map_err(|e| format!("Phase `{}`: {e}", phase.name))?;
+            let res = match phase.kind {
+                PhaseKind::Repeating => apply_repeating_rules(&phase.rules, ast, root, &fresh),
+                PhaseKind::OneShot => apply_one_shot_rules(&phase.rules, ast, root, &fresh),
+            }
+            .map_err(|e| format!("Phase `{}`: {e}", phase.name))?;
             if res.len() != 1 {
                 return Err(format!(
                     "Phase `{}`: expected exactly one result node, got {}",
diff --git a/shared/yeast/src/node_types_yaml.rs b/shared/yeast/src/node_types_yaml.rs
index d321ba8a2cf0..eb191076be48 100644
--- a/shared/yeast/src/node_types_yaml.rs
+++ b/shared/yeast/src/node_types_yaml.rs
@@ -23,6 +23,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::fmt::Write;
 
+use crate::CHILD_FIELD;
 use serde::Deserialize;
 use serde_json::json;
 
@@ -100,32 +101,38 @@ fn parse_field_name(raw: &str) -> FieldSpec {
 
 /// Resolve a TypeRef to a (type, named) pair, given the sets of known named
 /// and unnamed types.
-fn resolve_type_ref(
+fn resolve_type_ref_pair(
     type_ref: &TypeRef,
     named_types: &BTreeSet<String>,
     unnamed_types: &BTreeSet<String>,
-) -> serde_json::Value {
+) -> (String, bool) {
     match type_ref {
-        TypeRef::Explicit { unnamed } => {
-            json!({"type": unnamed, "named": false})
-        }
+        TypeRef::Explicit { unnamed } => (unnamed.clone(), false),
         TypeRef::Name(name) => {
             let is_named = named_types.contains(name);
             let is_unnamed = unnamed_types.contains(name);
-
             if is_named && is_unnamed {
-                // Ambiguous: default to named
-                json!({"type": name, "named": true})
+                (name.clone(), true)
             } else if is_unnamed {
-                json!({"type": name, "named": false})
+                (name.clone(), false)
             } else {
-                // Named, or unknown (assume named)
-                json!({"type": name, "named": true})
+                (name.clone(), true)
             }
         }
     }
 }
 
+/// Resolve a TypeRef to a {type, named} JSON record, given the sets of known named
+/// and unnamed types.
+fn resolve_type_ref(
+    type_ref: &TypeRef,
+    named_types: &BTreeSet<String>,
+    unnamed_types: &BTreeSet<String>,
+) -> serde_json::Value {
+    let (kind, named) = resolve_type_ref_pair(type_ref, named_types, unnamed_types);
+    json!({"type": kind, "named": named})
+}
+
 /// Convert YAML string to node-types JSON string.
 pub fn convert(yaml_input: &str) -> Result<String, String> {
     let yaml: YamlNodeTypes =
@@ -233,14 +240,12 @@ pub fn convert(yaml_input: &str) -> Result<String, String> {
     serde_json::to_string_pretty(&output).map_err(|e| format!("Failed to serialize JSON: {e}"))
 }
 
-/// Build a Schema from a YAML node-types string.
-/// Registers all node kinds and field names found in the YAML.
-pub fn schema_from_yaml(yaml_input: &str) -> Result<crate::schema::Schema, String> {
-    let yaml: YamlNodeTypes =
-        serde_yaml::from_str(yaml_input).map_err(|e| format!("Failed to parse YAML: {e}"))?;
-
-    let mut schema = crate::schema::Schema::new();
-
+/// Apply YAML node-type definitions to a mutable Schema.
+/// Registers all types, fields, and allowed types from the YAML into the schema.
+fn apply_yaml_to_schema(
+    yaml: &YamlNodeTypes,
+    schema: &mut crate::schema::Schema,
+) {
     // Register all supertypes as node kinds
     for name in yaml.supertypes.keys() {
         schema.register_kind(name);
@@ -264,6 +269,62 @@ pub fn schema_from_yaml(yaml_input: &str) -> Result<crate::schema::Schema, Strin
         schema.register_unnamed_kind(name);
     }
 
+    let mut named_types = BTreeSet::new();
+    for name in yaml.supertypes.keys() {
+        named_types.insert(name.clone());
+    }
+    for name in yaml.named.keys() {
+        named_types.insert(name.clone());
+    }
+    let unnamed_types: BTreeSet<String> = yaml.unnamed.iter().cloned().collect();
+
+    for (supertype, members) in &yaml.supertypes {
+        let node_types = members
+            .iter()
+            .map(|m| {
+                let (kind, named) = resolve_type_ref_pair(m, &named_types, &unnamed_types);
+                crate::schema::NodeType { kind, named }
+            })
+            .collect();
+        schema.set_supertype_members(supertype, node_types);
+    }
+
+    // Register allowed field child types for type checking.
+    for (parent_kind, fields_opt) in &yaml.named {
+        let Some(fields) = fields_opt else {
+            continue;
+        };
+
+        for (raw_field_name, type_refs) in fields {
+            let spec = parse_field_name(raw_field_name);
+            let field_id = match &spec.name {
+                Some(name) => schema.register_field(name),
+                None => CHILD_FIELD,
+            };
+
+            let mut node_types = type_refs
+                .clone()
+                .into_vec()
+                .into_iter()
+                .map(|type_ref| {
+                    let (kind, named) = resolve_type_ref_pair(&type_ref, &named_types, &unnamed_types);
+                    crate::schema::NodeType { kind, named }
+                })
+                .collect::<Vec<_>>();
+            node_types.sort_by(|a, b| a.kind.cmp(&b.kind).then(a.named.cmp(&b.named)));
+            node_types.dedup_by(|a, b| a.kind == b.kind && a.named == b.named);
+            schema.set_field_types(parent_kind, field_id, node_types);
+        }
+    }
+}
+
+pub fn schema_from_yaml(yaml_input: &str) -> Result<crate::schema::Schema, String> {
+    let yaml: YamlNodeTypes =
+        serde_yaml::from_str(yaml_input).map_err(|e| format!("Failed to parse YAML: {e}"))?;
+
+    let mut schema = crate::schema::Schema::new();
+    apply_yaml_to_schema(&yaml, &mut schema);
+
     Ok(schema)
 }
 
@@ -278,29 +339,7 @@ pub fn schema_from_yaml_with_language(
         serde_yaml::from_str(yaml_input).map_err(|e| format!("Failed to parse YAML: {e}"))?;
 
     let mut schema = crate::schema::Schema::from_language(language);
-
-    // Register supertypes
-    for name in yaml.supertypes.keys() {
-        schema.register_kind(name);
-    }
-
-    // Register named node kinds and their fields
-    for (name, fields_opt) in &yaml.named {
-        schema.register_kind(name);
-        if let Some(fields) = fields_opt {
-            for raw_field_name in fields.keys() {
-                let spec = parse_field_name(raw_field_name);
-                if let Some(field_name) = &spec.name {
-                    schema.register_field(field_name);
-                }
-            }
-        }
-    }
-
-    // Register unnamed tokens
-    for name in &yaml.unnamed {
-        schema.register_unnamed_kind(name);
-    }
+    apply_yaml_to_schema(&yaml, &mut schema);
 
     Ok(schema)
 }
diff --git a/shared/yeast/src/schema.rs b/shared/yeast/src/schema.rs
index 12554d9c8692..c832a57b23ad 100644
--- a/shared/yeast/src/schema.rs
+++ b/shared/yeast/src/schema.rs
@@ -1,7 +1,13 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 
 use crate::{FieldId, KindId, CHILD_FIELD};
 
+#[derive(Clone, Debug)]
+pub struct NodeType {
+    pub kind: String,
+    pub named: bool,
+}
+
 /// A schema defining node kinds and field names for the output AST.
 /// Built from a node-types.yml file, independent of any tree-sitter grammar.
 ///
@@ -25,6 +31,8 @@ pub struct Schema {
     unnamed_kind_ids: BTreeMap<String, KindId>,
     kind_names: BTreeMap<KindId, &'static str>,
     next_kind_id: KindId,
+    field_types: BTreeMap<(String, FieldId), Vec<NodeType>>,
+    supertypes: BTreeMap<String, Vec<NodeType>>,
 }
 
 impl Default for Schema {
@@ -43,6 +51,8 @@ impl Schema {
             unnamed_kind_ids: BTreeMap::new(),
             kind_names: BTreeMap::new(),
             next_kind_id: 1, // 0 is reserved
+            field_types: BTreeMap::new(),
+            supertypes: BTreeMap::new(),
         }
     }
 
@@ -166,4 +176,68 @@ impl Schema {
     pub fn node_kind_for_id(&self, id: KindId) -> Option<&'static str> {
         self.kind_names.get(&id).copied()
     }
+
+    pub fn set_field_types(
+        &mut self,
+        parent_kind: &str,
+        field_id: FieldId,
+        node_types: Vec<NodeType>,
+    ) {
+        self.field_types
+            .insert((parent_kind.to_string(), field_id), node_types);
+    }
+
+    pub fn field_types(
+        &self,
+        parent_kind: &str,
+        field_id: FieldId,
+    ) -> Option<&Vec<NodeType>> {
+        self.field_types
+            .get(&(parent_kind.to_string(), field_id))
+    }
+
+    pub fn set_supertype_members(&mut self, supertype: &str, node_types: Vec<NodeType>) {
+        self.supertypes.insert(supertype.to_string(), node_types);
+    }
+
+    fn allows_node(
+        &self,
+        node_type: &NodeType,
+        node_kind: &str,
+        node_named: bool,
+        active: &mut BTreeSet<String>,
+    ) -> bool {
+        if node_type.kind == node_kind && node_type.named == node_named {
+            return true;
+        }
+
+        if !node_type.named {
+            return false;
+        }
+
+        let Some(members) = self.supertypes.get(&node_type.kind) else {
+            return false;
+        };
+
+        if !active.insert(node_type.kind.clone()) {
+            return false;
+        }
+
+        let matched = members
+            .iter()
+            .any(|member| self.allows_node(member, node_kind, node_named, active));
+        active.remove(&node_type.kind);
+        matched
+    }
+
+    pub fn node_matches_types(
+        &self,
+        node_kind: &str,
+        node_named: bool,
+        node_types: &[NodeType],
+    ) -> bool {
+        node_types.iter().any(|node_type| {
+            self.allows_node(node_type, node_kind, node_named, &mut BTreeSet::new())
+        })
+    }
 }
diff --git a/shared/yeast/src/visitor.rs b/shared/yeast/src/visitor.rs
index 1b9c5eab3627..4bd2606c958b 100644
--- a/shared/yeast/src/visitor.rs
+++ b/shared/yeast/src/visitor.rs
@@ -52,6 +52,7 @@ impl Visitor {
             root: 0,
             schema,
             nodes: self.nodes.into_iter().map(|n| n.inner).collect(),
+            source: Vec::new(),
         }
     }
 
diff --git a/shared/yeast/tests/test.rs b/shared/yeast/tests/test.rs
index ed4202493a46..7f4db1541836 100644
--- a/shared/yeast/tests/test.rs
+++ b/shared/yeast/tests/test.rs
@@ -1,6 +1,6 @@
 #![cfg(test)]
 
-use yeast::dump::dump_ast;
+use yeast::dump::{dump_ast, dump_ast_with_type_errors};
 use yeast::*;
 
 const OUTPUT_SCHEMA_YAML: &str = include_str!("node-types.yml");
@@ -15,7 +15,7 @@ fn parse_and_dump(input: &str) -> String {
 /// Helper: parse Ruby source with a custom output schema and a single
 /// phase of rules, return dump.
 fn run_and_dump(input: &str, rules: Vec<Rule>) -> String {
-    run_phased_and_dump(input, vec![Phase::new("test", rules)])
+    run_phased_and_dump(input, vec![Phase::new("test", PhaseKind::Repeating, rules)])
 }
 
 /// Helper: parse Ruby source with a custom output schema and multiple
@@ -35,13 +35,42 @@ fn run_and_get_error(input: &str, rules: Vec<Rule>) -> String {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
-    let phases = vec![Phase::new("test", rules)];
+    let phases = vec![Phase::new("test", PhaseKind::Repeating, rules)];
     let runner = Runner::with_schema(lang, &schema, &phases);
     runner
         .run(input)
         .expect_err("expected runner to return an error")
 }
 
+/// Helper: parse Ruby source with no rules and dump with schema type errors.
+fn parse_and_dump_typed(input: &str, schema_yaml: &str) -> String {
+    let runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
+    let ast = runner.run(input).unwrap();
+    let schema = yeast::node_types_yaml::schema_from_yaml(schema_yaml).unwrap();
+    dump_ast_with_type_errors(&ast, ast.get_root(), input, &schema)
+}
+
+/// Helper: parse Ruby source with no rules and dump with schema type errors,
+/// building schema with language IDs so field checks align with parser fields.
+fn parse_and_dump_typed_with_language(input: &str, schema_yaml: &str) -> String {
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let runner = Runner::new(lang.clone(), &[]);
+    let ast = runner.run(input).unwrap();
+    let schema = yeast::node_types_yaml::schema_from_yaml_with_language(schema_yaml, &lang)
+        .unwrap();
+    dump_ast_with_type_errors(&ast, ast.get_root(), input, &schema)
+}
+
+/// Helper: parse Ruby source with custom rules and dump with schema type errors.
+fn run_and_dump_typed(input: &str, rules: Vec<Rule>, schema_yaml: &str) -> String {
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema = yeast::node_types_yaml::schema_from_yaml(schema_yaml).unwrap();
+    let phases = vec![Phase::new("test", PhaseKind::Repeating, rules)];
+    let runner = Runner::with_schema(lang, &schema, &phases);
+    let ast = runner.run(input).unwrap();
+    dump_ast_with_type_errors(&ast, ast.get_root(), input, &schema)
+}
+
 /// Assert that a dump equals the expected string, treating the expected
 /// string as an indented multiline literal: leading/trailing blank lines
 /// are stripped, and the common leading indentation is removed from every
@@ -125,6 +154,85 @@ fn test_parse_for_loop() {
     );
 }
 
+#[test]
+fn test_dump_highlights_type_errors_inline() {
+        let schema_yaml = r#"
+named:
+    program:
+        $children*: assignment
+    assignment:
+        left: identifier
+        right: identifier
+    identifier:
+"#;
+
+        let dump = parse_and_dump_typed("x = 1", schema_yaml);
+        assert!(dump.contains("integer \"1\" <-- ERROR:"));
+}
+
+#[test]
+fn test_dump_reports_preserved_unknown_kind_after_transformation() {
+        let schema_yaml = r#"
+named:
+    program:
+        $children*: assignment
+    assignment:
+        left: identifier
+        right: identifier
+    identifier:
+"#;
+
+        // This rewrite runs and preserves the RHS node kind via capture.
+        // With schema above, preserving `integer` should be reported inline.
+        let rules = vec![yeast::rule!(
+                (assignment left: (_) @left right: (_) @right)
+                =>
+                (assignment
+                        left: {left}
+                        right: {right}
+                )
+        )];
+
+        let dump = run_and_dump_typed("x = 1", rules, schema_yaml);
+        assert!(dump.contains("integer \"1\" <-- ERROR:"));
+        assert!(dump.contains("node kind 'integer' not in schema"));
+}
+
+#[test]
+fn test_dump_reports_undeclared_field_on_node() {
+        let schema_yaml = r#"
+named:
+    program:
+        $children*: assignment
+    assignment:
+        left: identifier
+    identifier:
+"#;
+
+        let dump = parse_and_dump_typed_with_language("x = y", schema_yaml);
+        assert!(dump.contains("right: identifier \"y\" <-- ERROR:"));
+        assert!(dump.contains("the node 'assignment' has no field 'right'"));
+}
+
+#[test]
+fn test_dump_reports_disallowed_kind_in_field_type() {
+        let schema_yaml = r#"
+named:
+    program:
+        $children*: assignment
+    assignment:
+        left: identifier
+        right: identifier
+    identifier:
+    integer:
+"#;
+
+        let dump = parse_and_dump_typed_with_language("x = 1", schema_yaml);
+        assert!(dump.contains("right: integer \"1\" <-- ERROR:"));
+        assert!(dump.contains("should contain"));
+        assert!(dump.contains("but got integer"));
+}
+
 // ---- Query tests ----
 
 #[test]
@@ -166,6 +274,32 @@ fn test_query_no_match() {
     assert!(!matched);
 }
 
+#[test]
+fn test_reachable_nodes_excludes_orphaned_rewrite_nodes() {
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema = yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang)
+        .unwrap();
+    let phases = vec![Phase::new(
+        "test",
+        PhaseKind::Repeating,
+        vec![yeast::rule!((integer) => (identifier "replaced"))],
+    )];
+    let runner = Runner::with_schema(lang, &schema, &phases);
+
+    let input = "x = 1";
+    let ast = runner.run(input).unwrap();
+    let reachable_ids = ast.reachable_node_ids();
+
+    assert!(
+        ast.nodes().len() > reachable_ids.len(),
+        "expected rewrite to leave orphaned arena nodes"
+    );
+
+    let dump = dump_ast(&ast, ast.get_root(), input);
+    assert!(dump.contains("identifier \"replaced\""));
+    assert!(!dump.contains("integer \"1\""));
+}
+
 #[test]
 fn test_query_repeated_capture() {
     let runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
@@ -653,8 +787,8 @@ fn test_phased_desugaring() {
     let dump = run_phased_and_dump(
         "x = 1",
         vec![
-            Phase::new("cleanup", cleanup),
-            Phase::new("desugar", desugar),
+            Phase::new("cleanup", PhaseKind::Repeating, cleanup),
+            Phase::new("desugar", PhaseKind::Repeating, desugar),
         ],
     );
     assert_dump_eq(
@@ -675,7 +809,11 @@ fn test_phase_error_includes_phase_name() {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
-    let phases = vec![Phase::new("buggy", vec![swap_assignment_rule().repeated()])];
+    let phases = vec![Phase::new(
+        "buggy",
+        PhaseKind::Repeating,
+        vec![swap_assignment_rule().repeated()],
+    )];
     let runner = Runner::with_schema(lang, &schema, &phases);
     let err = runner
         .run("x = 1")
@@ -690,6 +828,168 @@ fn test_phase_error_includes_phase_name() {
     );
 }
 
+/// Helper: an exhaustive set of OneShot rules covering every node reachable
+/// (via captures) when translating `"x = 1"`.
+fn one_shot_xeq1_rules() -> Vec<Rule> {
+    vec![
+        yeast::rule!(
+            (program (_)* @stmts)
+            =>
+            (program stmt: {..stmts})
+        ),
+        yeast::rule!(
+            (assignment left: (_) @left right: (_) @right)
+            =>
+            (first_node left: {left} right: {right})
+        ),
+        yeast::rule!((identifier) => (identifier "ID")),
+        yeast::rule!((integer) => (integer "INT")),
+    ]
+}
+
+#[test]
+fn test_one_shot_phase() {
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema =
+        yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
+    let phases = vec![Phase::new(
+        "translate",
+        PhaseKind::OneShot,
+        one_shot_xeq1_rules(),
+    )];
+    let runner = Runner::with_schema(lang, &schema, &phases);
+
+    let input = "x = 1";
+    let ast = runner.run(input).unwrap();
+    let dump = dump_ast(&ast, ast.get_root(), input);
+    assert_dump_eq(
+        &dump,
+        r#"
+        program
+          stmt:
+            first_node
+              left: identifier "ID"
+              right: integer "INT"
+    "#,
+    );
+}
+
+#[test]
+fn test_one_shot_phase_errors_when_no_rule_matches() {
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema =
+        yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
+    // Drop the `integer` rule so the recursion has no rule for `integer`.
+    let mut rules = one_shot_xeq1_rules();
+    rules.pop();
+    let phases = vec![Phase::new("translate", PhaseKind::OneShot, rules)];
+    let runner = Runner::with_schema(lang, &schema, &phases);
+
+    let err = runner
+        .run("x = 1")
+        .expect_err("expected OneShot to error on unmatched node");
+    assert!(
+        err.contains("Phase `translate`"),
+        "error should name the phase, got: {err}"
+    );
+    assert!(
+        err.contains("no rule matched") && err.contains("integer"),
+        "error should describe the unmatched node kind, got: {err}"
+    );
+}
+
+/// OneShot recursion must apply rules to *captured* nodes, even if the rule
+/// returns a captured child verbatim. A buggy implementation that only
+/// recurses into the children of the rule's output (rather than into the
+/// captures) would leave the returned capture untransformed.
+#[test]
+fn test_one_shot_recurses_into_returned_capture() {
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema =
+        yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
+    let rules = vec![
+        yeast::rule!(
+            (program (_)* @stmts)
+            =>
+            (program stmt: {..stmts})
+        ),
+        // Returns the captured `left` verbatim, discarding `right`.
+        yeast::rule!(
+            (assignment left: (_) @left right: (_) @right)
+            =>
+            {left}
+        ),
+        yeast::rule!((identifier) => (identifier "ID")),
+        yeast::rule!((integer) => (integer "INT")),
+    ];
+    let phases = vec![Phase::new("translate", PhaseKind::OneShot, rules)];
+    let runner = Runner::with_schema(lang, &schema, &phases);
+
+    let input = "x = 1";
+    let ast = runner.run(input).unwrap();
+    let dump = dump_ast(&ast, ast.get_root(), input);
+    // `left` is an `identifier`; OneShot must apply the identifier rule to
+    // it before the assignment transform returns it verbatim.
+    assert_dump_eq(
+        &dump,
+        r#"
+        program
+          stmt: identifier "ID"
+    "#,
+    );
+}
+
+/// OneShot recursion must NOT descend into the children of the rule's output.
+/// A rule may legitimately wrap a captured node in fresh output-schema nodes
+/// that have no matching rule of their own (since rule patterns target the
+/// input schema). Recursing into the output would erroneously try to find
+/// rules for those wrapper kinds and fail.
+#[test]
+fn test_one_shot_does_not_recurse_into_wrapper_output() {
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema =
+        yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
+    let rules = vec![
+        yeast::rule!(
+            (program (_)* @stmts)
+            =>
+            (program stmt: {..stmts})
+        ),
+        // Wraps `left` in nested `first_node`/`second_node` output kinds.
+        // Neither wrapper kind has a matching rule, so a buggy implementation
+        // that recurses into the wrapper's children would error.
+        yeast::rule!(
+            (assignment left: (_) @left right: (_) @right)
+            =>
+            (first_node
+                left: (second_node left: {left} right: {right})
+                right: {left}
+            )
+        ),
+        yeast::rule!((identifier) => (identifier "ID")),
+        yeast::rule!((integer) => (integer "INT")),
+    ];
+    let phases = vec![Phase::new("translate", PhaseKind::OneShot, rules)];
+    let runner = Runner::with_schema(lang, &schema, &phases);
+
+    let input = "x = 1";
+    let ast = runner.run(input).unwrap();
+    let dump = dump_ast(&ast, ast.get_root(), input);
+    assert_dump_eq(
+        &dump,
+        r#"
+        program
+          stmt:
+            first_node
+              left:
+                second_node
+                  left: identifier "ID"
+                  right: integer "INT"
+              right: identifier "ID"
+    "#,
+    );
+}
+
 // ---- Cursor tests ----
 
 #[test]
@@ -760,3 +1060,54 @@ fn test_desugar_for_with_multiple_assignment() {
     "#,
     );
 }
+
+/// Regression test: `#{capture}` in a template must render the *source text*
+/// of the captured node, not its arena `Id`. Previously, captures were bound
+/// as `usize`, so `#{cap}` printed the integer id (e.g. `"3"`) via `Display`.
+/// Captures are now bound as `NodeRef`, which has no `Display` impl and
+/// resolves to the captured node's source text via `YeastDisplay`.
+#[test]
+fn test_hash_brace_renders_capture_source_text() {
+    let rule = rule!(
+        (call
+            method: (identifier) @name
+            receiver: (identifier) @recv
+        )
+        =>
+        (call
+            method: (identifier #{name})
+            receiver: (identifier #{recv})
+            arguments: (argument_list)
+        )
+    );
+    let dump = run_and_dump("foo.bar()", vec![rule]);
+    assert_dump_eq(
+        &dump,
+        r#"
+        program
+          call
+            arguments: argument_list "foo.bar()"
+            method: identifier "bar"
+            receiver: identifier "foo"
+    "#,
+    );
+}
+
+/// Regression test: non-`NodeRef` values in `#{expr}` still render via their
+/// `Display` impl (covered by `YeastDisplay`'s blanket impls for primitives).
+#[test]
+fn test_hash_brace_renders_integer_expression() {
+    let rule = rule!(
+        (identifier) @_
+        =>
+        (identifier #{1 + 2})
+    );
+    let dump = run_and_dump("foo", vec![rule]);
+    assert_dump_eq(
+        &dump,
+        r#"
+        program
+          identifier "3"
+    "#,
+    );
+}
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 01461fd5bfeb..1eb5afb48e74 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 6.7.0
+
+### Major Analysis Improvements
+
+* Upgraded to allow analysis of Swift 6.3.2.
+
+### Minor Analysis Improvements
+
+* The sensitive data heuristics used to identify code that handles passwords and private data have been improved. Most of the changes permit more variations of established patterns, thereby finding more sensitive data. Queries that use the sensitive data library (for example `swift/cleartext-logging`) may find more correct results and fewer false positive results after these changes.
+
 ## 6.6.0
 
 ### New Features
diff --git a/swift/ql/lib/change-notes/released/6.7.0.md b/swift/ql/lib/change-notes/released/6.7.0.md
new file mode 100644
index 000000000000..8d7bf41cc1df
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.7.0.md
@@ -0,0 +1,9 @@
+## 6.7.0
+
+### Major Analysis Improvements
+
+* Upgraded to allow analysis of Swift 6.3.2.
+
+### Minor Analysis Improvements
+
+* The sensitive data heuristics used to identify code that handles passwords and private data have been improved. Most of the changes permit more variations of established patterns, thereby finding more sensitive data. Queries that use the sensitive data library (for example `swift/cleartext-logging`) may find more correct results and fewer false positive results after these changes.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index 4d7f31f2d8e2..55a13d309e55 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 6.6.0
+lastReleaseVersion: 6.7.0
diff --git a/swift/ql/lib/codeql/swift/security/WeakPasswordHashingExtensions.qll b/swift/ql/lib/codeql/swift/security/WeakPasswordHashingExtensions.qll
index 76ae9c21dab3..1700c5dc60e8 100644
--- a/swift/ql/lib/codeql/swift/security/WeakPasswordHashingExtensions.qll
+++ b/swift/ql/lib/codeql/swift/security/WeakPasswordHashingExtensions.qll
@@ -54,12 +54,15 @@ private class WeakSensitiveDataHashingSinks extends SinkModelCsv {
         // CryptoKit
         // (SHA-256, SHA-384 and SHA-512 are all variants of the SHA-2 algorithm)
         ";SHA256;true;hash(data:);;;Argument[0];weak-password-hash-input-SHA256",
+        ";SHA256;true;hash(bufferPointer:);;;Argument[0];weak-password-hash-input-SHA256",
         ";SHA256;true;update(data:);;;Argument[0];weak-password-hash-input-SHA256",
         ";SHA256;true;update(bufferPointer:);;;Argument[0];weak-password-hash-input-SHA256",
         ";SHA384;true;hash(data:);;;Argument[0];weak-password-hash-input-SHA384",
+        ";SHA384;true;hash(bufferPointer:);;;Argument[0];weak-password-hash-input-SHA384",
         ";SHA384;true;update(data:);;;Argument[0];weak-password-hash-input-SHA384",
         ";SHA384;true;update(bufferPointer:);;;Argument[0];weak-password-hash-input-SHA384",
         ";SHA512;true;hash(data:);;;Argument[0];weak-password-hash-input-SHA512",
+        ";SHA512;true;hash(bufferPointer:);;;Argument[0];weak-password-hash-input-SHA512",
         ";SHA512;true;update(data:);;;Argument[0];weak-password-hash-input-SHA512",
         ";SHA512;true;update(bufferPointer:);;;Argument[0];weak-password-hash-input-SHA512",
         // CryptoSwift
@@ -111,6 +114,36 @@ private class DefaultWeakPasswordHashingSink extends WeakPasswordHashingSink {
   override string getAlgorithm() { result = algorithm }
 }
 
+/**
+ * A sink for weak password hashing through a call with a metatype qualifier.
+ */
+private class WeakPasswordHashingMetatypeSink extends WeakPasswordHashingSink {
+  string algorithm;
+
+  WeakPasswordHashingMetatypeSink() {
+    exists(CallExpr ce, Type t |
+      // call target
+      ce.getStaticTarget().getName() =
+        ["hash(data:)", "hash(bufferPointer:)", "update(data:)", "update(bufferPointer:)"] and
+      // argument
+      ce.getAnArgument().getExpr() = this.asExpr() and
+      // qualifier
+      t = ce.getQualifier().getType() and
+      algorithm = ["SHA256", "SHA384", "SHA512"] and
+      (
+        t.getFullName() = algorithm
+        or
+        exists(TypeDecl td |
+          td.getInterfaceType() = t and
+          td.getFullName() = algorithm
+        )
+      )
+    )
+  }
+
+  override string getAlgorithm() { result = algorithm }
+}
+
 /**
  * A barrier for weak password hashing, when it occurs inside of
  * certain cryptographic algorithms as part of their design.
diff --git a/swift/ql/lib/codeql/swift/security/WeakSensitiveDataHashingExtensions.qll b/swift/ql/lib/codeql/swift/security/WeakSensitiveDataHashingExtensions.qll
index 5f0cc9d756a0..02cb82a22c89 100755
--- a/swift/ql/lib/codeql/swift/security/WeakSensitiveDataHashingExtensions.qll
+++ b/swift/ql/lib/codeql/swift/security/WeakSensitiveDataHashingExtensions.qll
@@ -40,9 +40,11 @@ private class WeakSensitiveDataHashingSinks extends SinkModelCsv {
       [
         // CryptoKit
         ";Insecure.MD5;true;hash(data:);;;Argument[0];weak-hash-input-MD5",
+        ";Insecure.MD5;true;hash(bufferPointer:);;;Argument[0];weak-hash-input-MD5",
         ";Insecure.MD5;true;update(data:);;;Argument[0];weak-hash-input-MD5",
         ";Insecure.MD5;true;update(bufferPointer:);;;Argument[0];weak-hash-input-MD5",
         ";Insecure.SHA1;true;hash(data:);;;Argument[0];weak-hash-input-SHA1",
+        ";Insecure.SHA1;true;hash(bufferPointer:);;;Argument[0];weak-hash-input-SHA1",
         ";Insecure.SHA1;true;update(data:);;;Argument[0];weak-hash-input-SHA1",
         ";Insecure.SHA1;true;update(bufferPointer:);;;Argument[0];weak-hash-input-SHA1",
         // CryptoSwift
@@ -69,10 +71,40 @@ private class WeakSensitiveDataHashingSinks extends SinkModelCsv {
 /**
  * A sink defined in a CSV model.
  */
-private class DefaultWeakSenitiveDataHashingSink extends WeakSensitiveDataHashingSink {
+private class DefaultWeakSensitiveDataHashingSink extends WeakSensitiveDataHashingSink {
   string algorithm;
 
-  DefaultWeakSenitiveDataHashingSink() { sinkNode(this, "weak-hash-input-" + algorithm) }
+  DefaultWeakSensitiveDataHashingSink() { sinkNode(this, "weak-hash-input-" + algorithm) }
+
+  override string getAlgorithm() { result = algorithm }
+}
+
+/**
+ * A sink for weak sensitive data hashing through a call with a metatype qualifier.
+ */
+private class WeakSensitiveDataHashingMetatypeSink extends WeakSensitiveDataHashingSink {
+  string algorithm;
+
+  WeakSensitiveDataHashingMetatypeSink() {
+    exists(CallExpr ce, Type t |
+      // call target
+      ce.getStaticTarget().getName() =
+        ["hash(data:)", "hash(bufferPointer:)", "update(data:)", "update(bufferPointer:)"] and
+      // argument
+      ce.getAnArgument().getExpr() = this.asExpr() and
+      // qualifier
+      t = ce.getQualifier().getType() and
+      algorithm = ["MD5", "SHA1"] and
+      (
+        t.getFullName() = "Insecure." + algorithm
+        or
+        exists(TypeDecl td |
+          td.getInterfaceType() = t and
+          td.getFullName() = "Insecure." + algorithm
+        )
+      )
+    )
+  }
 
   override string getAlgorithm() { result = algorithm }
 }
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index e1d436bb7f6a..960d679e6d91 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 6.6.0
+version: 6.7.1-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index 4bd8088718a6..4e3b53c37b32 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.4
+
+No user-facing changes.
+
 ## 1.3.3
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/2026-05-26-hashing-sinks.md b/swift/ql/src/change-notes/2026-05-26-hashing-sinks.md
new file mode 100644
index 000000000000..92a2c1c3a064
--- /dev/null
+++ b/swift/ql/src/change-notes/2026-05-26-hashing-sinks.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Fixed an issue where common usage patterns for `CryptoKit` weren't being recognized as hashing sinks for the `swift/weak-sensitive-data-hashing` and `swift/weak-password-hashing` queries. These queries may find additional results after this change.
diff --git a/swift/ql/src/change-notes/released/1.3.4.md b/swift/ql/src/change-notes/released/1.3.4.md
new file mode 100644
index 000000000000..5073aca7222c
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.3.4.md
@@ -0,0 +1,3 @@
+## 1.3.4
+
+No user-facing changes.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index eb1f7dabc842..8263ddf2c8b8 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.3
+lastReleaseVersion: 1.3.4
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index e3e90856f70a..578456c089aa 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.3.3
+version: 1.3.5-dev
 groups:
   - swift
   - queries
diff --git a/swift/ql/test/query-tests/Security/CWE-311/CleartextTransmission.expected b/swift/ql/test/query-tests/Security/CWE-311/CleartextTransmission.expected
index c772466344ae..7665b72b11a6 100644
--- a/swift/ql/test/query-tests/Security/CWE-311/CleartextTransmission.expected
+++ b/swift/ql/test/query-tests/Security/CWE-311/CleartextTransmission.expected
@@ -64,6 +64,7 @@ nodes
 | testSend.swift:78:27:78:30 | .CarePlanID | semmle.label | .CarePlanID |
 | testSend.swift:79:27:79:30 | .BankCardNo | semmle.label | .BankCardNo |
 | testSend.swift:80:27:80:30 | .MyCreditRating | semmle.label | .MyCreditRating |
+| testSend.swift:81:27:81:30 | .OneTimeCode | semmle.label | .OneTimeCode |
 | testSend.swift:86:7:86:7 | self | semmle.label | self |
 | testSend.swift:94:27:94:30 | .password | semmle.label | .password |
 | testSend.swift:94:27:94:39 | .value | semmle.label | .value |
@@ -118,6 +119,7 @@ subpaths
 | testSend.swift:78:27:78:30 | .CarePlanID | testSend.swift:78:27:78:30 | .CarePlanID | testSend.swift:78:27:78:30 | .CarePlanID | This operation transmits '.CarePlanID', which may contain unencrypted sensitive data from $@. | testSend.swift:78:27:78:30 | .CarePlanID | .CarePlanID |
 | testSend.swift:79:27:79:30 | .BankCardNo | testSend.swift:79:27:79:30 | .BankCardNo | testSend.swift:79:27:79:30 | .BankCardNo | This operation transmits '.BankCardNo', which may contain unencrypted sensitive data from $@. | testSend.swift:79:27:79:30 | .BankCardNo | .BankCardNo |
 | testSend.swift:80:27:80:30 | .MyCreditRating | testSend.swift:80:27:80:30 | .MyCreditRating | testSend.swift:80:27:80:30 | .MyCreditRating | This operation transmits '.MyCreditRating', which may contain unencrypted sensitive data from $@. | testSend.swift:80:27:80:30 | .MyCreditRating | .MyCreditRating |
+| testSend.swift:81:27:81:30 | .OneTimeCode | testSend.swift:81:27:81:30 | .OneTimeCode | testSend.swift:81:27:81:30 | .OneTimeCode | This operation transmits '.OneTimeCode', which may contain unencrypted sensitive data from $@. | testSend.swift:81:27:81:30 | .OneTimeCode | .OneTimeCode |
 | testSend.swift:94:27:94:39 | .value | testSend.swift:94:27:94:30 | .password | testSend.swift:94:27:94:39 | .value | This operation transmits '.value', which may contain unencrypted sensitive data from $@. | testSend.swift:94:27:94:30 | .password | .password |
 | testURL.swift:39:18:39:50 | ... .+(_:_:) ... | testURL.swift:39:50:39:50 | passwd | testURL.swift:39:18:39:50 | ... .+(_:_:) ... | This operation transmits '... .+(_:_:) ...', which may contain unencrypted sensitive data from $@. | testURL.swift:39:50:39:50 | passwd | passwd |
 | testURL.swift:41:18:41:51 | ... .+(_:_:) ... | testURL.swift:41:51:41:51 | account_no | testURL.swift:41:18:41:51 | ... .+(_:_:) ... | This operation transmits '... .+(_:_:) ...', which may contain unencrypted sensitive data from $@. | testURL.swift:41:51:41:51 | account_no | account_no |
diff --git a/swift/ql/test/query-tests/Security/CWE-311/SensitiveExprs.expected b/swift/ql/test/query-tests/Security/CWE-311/SensitiveExprs.expected
index c4ff7f42b2e1..62fc29a9a582 100644
--- a/swift/ql/test/query-tests/Security/CWE-311/SensitiveExprs.expected
+++ b/swift/ql/test/query-tests/Security/CWE-311/SensitiveExprs.expected
@@ -170,6 +170,7 @@
 | testSend.swift:78:27:78:30 | .CarePlanID | label:CarePlanID, type:private information |
 | testSend.swift:79:27:79:30 | .BankCardNo | label:BankCardNo, type:private information |
 | testSend.swift:80:27:80:30 | .MyCreditRating | label:MyCreditRating, type:private information |
+| testSend.swift:81:27:81:30 | .OneTimeCode | label:OneTimeCode, type:credential |
 | testSend.swift:94:27:94:30 | .password | label:password, type:password |
 | testURL.swift:39:50:39:50 | passwd | label:passwd, type:password |
 | testURL.swift:41:51:41:51 | account_no | label:account_no, type:private information |
diff --git a/swift/ql/test/query-tests/Security/CWE-311/testSend.swift b/swift/ql/test/query-tests/Security/CWE-311/testSend.swift
index 8acb83e51c19..bea4dfa16b63 100644
--- a/swift/ql/test/query-tests/Security/CWE-311/testSend.swift
+++ b/swift/ql/test/query-tests/Security/CWE-311/testSend.swift
@@ -78,7 +78,7 @@ func test2(password : String, license_key: String, ms: MyStruct, connection : NW
 	connection.send(content: ms.CarePlanID, completion: .idempotent) // BAD
 	connection.send(content: ms.BankCardNo, completion: .idempotent) // BAD
 	connection.send(content: ms.MyCreditRating, completion: .idempotent) // BAD
-	connection.send(content: ms.OneTimeCode, completion: .idempotent) // BAD [NOT DETECTED]
+	connection.send(content: ms.OneTimeCode, completion: .idempotent) // BAD
 }
 
 struct MyOuter {
diff --git a/swift/ql/test/query-tests/Security/CWE-328/WeakPasswordHashing.expected b/swift/ql/test/query-tests/Security/CWE-328/WeakPasswordHashing.expected
index 46f3d211ccd7..273f26164fd7 100644
--- a/swift/ql/test/query-tests/Security/CWE-328/WeakPasswordHashing.expected
+++ b/swift/ql/test/query-tests/Security/CWE-328/WeakPasswordHashing.expected
@@ -1,26 +1,33 @@
 edges
-| testCryptoKit.swift:193:38:193:38 | passwordString | testCryptoKit.swift:193:38:193:53 | .utf8 | provenance |  |
-| testCryptoKit.swift:193:38:193:53 | .utf8 | testCryptoKit.swift:193:33:193:57 | call to Data.init(_:) | provenance |  |
+| testCryptoKit.swift:224:38:224:38 | passwordString | testCryptoKit.swift:224:38:224:53 | .utf8 | provenance |  |
+| testCryptoKit.swift:224:38:224:53 | .utf8 | testCryptoKit.swift:224:33:224:57 | call to Data.init(_:) | provenance |  |
 nodes
-| testCryptoKit.swift:65:47:65:47 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:71:44:71:44 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:77:37:77:37 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:83:37:83:37 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:89:37:89:37 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:98:23:98:23 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:107:23:107:23 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:116:23:116:23 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:125:23:125:23 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:134:23:134:23 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:143:32:143:32 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:152:32:152:32 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:161:32:161:32 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:170:32:170:32 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:179:32:179:32 | passwd | semmle.label | passwd |
-| testCryptoKit.swift:189:49:189:49 | passwordData | semmle.label | passwordData |
-| testCryptoKit.swift:193:33:193:57 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
-| testCryptoKit.swift:193:38:193:38 | passwordString | semmle.label | passwordString |
-| testCryptoKit.swift:193:38:193:53 | .utf8 | semmle.label | .utf8 |
+| testCryptoKit.swift:84:47:84:47 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:85:52:85:52 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:91:36:91:36 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:92:45:92:45 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:98:44:98:44 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:99:53:99:53 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:105:37:105:37 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:106:46:106:46 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:112:37:112:37 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:113:46:113:46 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:119:37:119:37 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:120:46:120:46 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:129:23:129:23 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:138:23:138:23 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:147:23:147:23 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:156:23:156:23 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:165:23:165:23 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:174:32:174:32 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:183:32:183:32 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:192:32:192:32 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:201:32:201:32 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:210:32:210:32 | passwd | semmle.label | passwd |
+| testCryptoKit.swift:220:49:220:49 | passwordData | semmle.label | passwordData |
+| testCryptoKit.swift:224:33:224:57 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
+| testCryptoKit.swift:224:38:224:38 | passwordString | semmle.label | passwordString |
+| testCryptoKit.swift:224:38:224:53 | .utf8 | semmle.label | .utf8 |
 | testCryptoSwift.swift:154:30:154:30 | passwdArray | semmle.label | passwdArray |
 | testCryptoSwift.swift:157:31:157:31 | passwdArray | semmle.label | passwdArray |
 | testCryptoSwift.swift:160:47:160:47 | passwdArray | semmle.label | passwdArray |
@@ -47,23 +54,30 @@ nodes
 | testCryptoSwift.swift:231:9:231:9 | passwd | semmle.label | passwd |
 subpaths
 #select
-| testCryptoKit.swift:65:47:65:47 | passwd | testCryptoKit.swift:65:47:65:47 | passwd | testCryptoKit.swift:65:47:65:47 | passwd | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:65:47:65:47 | passwd | password (passwd) |
-| testCryptoKit.swift:71:44:71:44 | passwd | testCryptoKit.swift:71:44:71:44 | passwd | testCryptoKit.swift:71:44:71:44 | passwd | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:71:44:71:44 | passwd | password (passwd) |
-| testCryptoKit.swift:77:37:77:37 | passwd | testCryptoKit.swift:77:37:77:37 | passwd | testCryptoKit.swift:77:37:77:37 | passwd | Insecure hashing algorithm (SHA256) depends on $@. | testCryptoKit.swift:77:37:77:37 | passwd | password (passwd) |
-| testCryptoKit.swift:83:37:83:37 | passwd | testCryptoKit.swift:83:37:83:37 | passwd | testCryptoKit.swift:83:37:83:37 | passwd | Insecure hashing algorithm (SHA384) depends on $@. | testCryptoKit.swift:83:37:83:37 | passwd | password (passwd) |
-| testCryptoKit.swift:89:37:89:37 | passwd | testCryptoKit.swift:89:37:89:37 | passwd | testCryptoKit.swift:89:37:89:37 | passwd | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:89:37:89:37 | passwd | password (passwd) |
-| testCryptoKit.swift:98:23:98:23 | passwd | testCryptoKit.swift:98:23:98:23 | passwd | testCryptoKit.swift:98:23:98:23 | passwd | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:98:23:98:23 | passwd | password (passwd) |
-| testCryptoKit.swift:107:23:107:23 | passwd | testCryptoKit.swift:107:23:107:23 | passwd | testCryptoKit.swift:107:23:107:23 | passwd | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:107:23:107:23 | passwd | password (passwd) |
-| testCryptoKit.swift:116:23:116:23 | passwd | testCryptoKit.swift:116:23:116:23 | passwd | testCryptoKit.swift:116:23:116:23 | passwd | Insecure hashing algorithm (SHA256) depends on $@. | testCryptoKit.swift:116:23:116:23 | passwd | password (passwd) |
-| testCryptoKit.swift:125:23:125:23 | passwd | testCryptoKit.swift:125:23:125:23 | passwd | testCryptoKit.swift:125:23:125:23 | passwd | Insecure hashing algorithm (SHA384) depends on $@. | testCryptoKit.swift:125:23:125:23 | passwd | password (passwd) |
-| testCryptoKit.swift:134:23:134:23 | passwd | testCryptoKit.swift:134:23:134:23 | passwd | testCryptoKit.swift:134:23:134:23 | passwd | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:134:23:134:23 | passwd | password (passwd) |
-| testCryptoKit.swift:143:32:143:32 | passwd | testCryptoKit.swift:143:32:143:32 | passwd | testCryptoKit.swift:143:32:143:32 | passwd | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:143:32:143:32 | passwd | password (passwd) |
-| testCryptoKit.swift:152:32:152:32 | passwd | testCryptoKit.swift:152:32:152:32 | passwd | testCryptoKit.swift:152:32:152:32 | passwd | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:152:32:152:32 | passwd | password (passwd) |
-| testCryptoKit.swift:161:32:161:32 | passwd | testCryptoKit.swift:161:32:161:32 | passwd | testCryptoKit.swift:161:32:161:32 | passwd | Insecure hashing algorithm (SHA256) depends on $@. | testCryptoKit.swift:161:32:161:32 | passwd | password (passwd) |
-| testCryptoKit.swift:170:32:170:32 | passwd | testCryptoKit.swift:170:32:170:32 | passwd | testCryptoKit.swift:170:32:170:32 | passwd | Insecure hashing algorithm (SHA384) depends on $@. | testCryptoKit.swift:170:32:170:32 | passwd | password (passwd) |
-| testCryptoKit.swift:179:32:179:32 | passwd | testCryptoKit.swift:179:32:179:32 | passwd | testCryptoKit.swift:179:32:179:32 | passwd | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:179:32:179:32 | passwd | password (passwd) |
-| testCryptoKit.swift:189:49:189:49 | passwordData | testCryptoKit.swift:189:49:189:49 | passwordData | testCryptoKit.swift:189:49:189:49 | passwordData | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:189:49:189:49 | passwordData | password (passwordData) |
-| testCryptoKit.swift:193:33:193:57 | call to Data.init(_:) | testCryptoKit.swift:193:38:193:38 | passwordString | testCryptoKit.swift:193:33:193:57 | call to Data.init(_:) | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:193:38:193:38 | passwordString | password (passwordString) |
+| testCryptoKit.swift:84:47:84:47 | passwd | testCryptoKit.swift:84:47:84:47 | passwd | testCryptoKit.swift:84:47:84:47 | passwd | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:84:47:84:47 | passwd | password (passwd) |
+| testCryptoKit.swift:85:52:85:52 | passwd | testCryptoKit.swift:85:52:85:52 | passwd | testCryptoKit.swift:85:52:85:52 | passwd | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:85:52:85:52 | passwd | password (passwd) |
+| testCryptoKit.swift:91:36:91:36 | passwd | testCryptoKit.swift:91:36:91:36 | passwd | testCryptoKit.swift:91:36:91:36 | passwd | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:91:36:91:36 | passwd | password (passwd) |
+| testCryptoKit.swift:92:45:92:45 | passwd | testCryptoKit.swift:92:45:92:45 | passwd | testCryptoKit.swift:92:45:92:45 | passwd | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:92:45:92:45 | passwd | password (passwd) |
+| testCryptoKit.swift:98:44:98:44 | passwd | testCryptoKit.swift:98:44:98:44 | passwd | testCryptoKit.swift:98:44:98:44 | passwd | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:98:44:98:44 | passwd | password (passwd) |
+| testCryptoKit.swift:99:53:99:53 | passwd | testCryptoKit.swift:99:53:99:53 | passwd | testCryptoKit.swift:99:53:99:53 | passwd | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:99:53:99:53 | passwd | password (passwd) |
+| testCryptoKit.swift:105:37:105:37 | passwd | testCryptoKit.swift:105:37:105:37 | passwd | testCryptoKit.swift:105:37:105:37 | passwd | Insecure hashing algorithm (SHA256) depends on $@. | testCryptoKit.swift:105:37:105:37 | passwd | password (passwd) |
+| testCryptoKit.swift:106:46:106:46 | passwd | testCryptoKit.swift:106:46:106:46 | passwd | testCryptoKit.swift:106:46:106:46 | passwd | Insecure hashing algorithm (SHA256) depends on $@. | testCryptoKit.swift:106:46:106:46 | passwd | password (passwd) |
+| testCryptoKit.swift:112:37:112:37 | passwd | testCryptoKit.swift:112:37:112:37 | passwd | testCryptoKit.swift:112:37:112:37 | passwd | Insecure hashing algorithm (SHA384) depends on $@. | testCryptoKit.swift:112:37:112:37 | passwd | password (passwd) |
+| testCryptoKit.swift:113:46:113:46 | passwd | testCryptoKit.swift:113:46:113:46 | passwd | testCryptoKit.swift:113:46:113:46 | passwd | Insecure hashing algorithm (SHA384) depends on $@. | testCryptoKit.swift:113:46:113:46 | passwd | password (passwd) |
+| testCryptoKit.swift:119:37:119:37 | passwd | testCryptoKit.swift:119:37:119:37 | passwd | testCryptoKit.swift:119:37:119:37 | passwd | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:119:37:119:37 | passwd | password (passwd) |
+| testCryptoKit.swift:120:46:120:46 | passwd | testCryptoKit.swift:120:46:120:46 | passwd | testCryptoKit.swift:120:46:120:46 | passwd | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:120:46:120:46 | passwd | password (passwd) |
+| testCryptoKit.swift:129:23:129:23 | passwd | testCryptoKit.swift:129:23:129:23 | passwd | testCryptoKit.swift:129:23:129:23 | passwd | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:129:23:129:23 | passwd | password (passwd) |
+| testCryptoKit.swift:138:23:138:23 | passwd | testCryptoKit.swift:138:23:138:23 | passwd | testCryptoKit.swift:138:23:138:23 | passwd | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:138:23:138:23 | passwd | password (passwd) |
+| testCryptoKit.swift:147:23:147:23 | passwd | testCryptoKit.swift:147:23:147:23 | passwd | testCryptoKit.swift:147:23:147:23 | passwd | Insecure hashing algorithm (SHA256) depends on $@. | testCryptoKit.swift:147:23:147:23 | passwd | password (passwd) |
+| testCryptoKit.swift:156:23:156:23 | passwd | testCryptoKit.swift:156:23:156:23 | passwd | testCryptoKit.swift:156:23:156:23 | passwd | Insecure hashing algorithm (SHA384) depends on $@. | testCryptoKit.swift:156:23:156:23 | passwd | password (passwd) |
+| testCryptoKit.swift:165:23:165:23 | passwd | testCryptoKit.swift:165:23:165:23 | passwd | testCryptoKit.swift:165:23:165:23 | passwd | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:165:23:165:23 | passwd | password (passwd) |
+| testCryptoKit.swift:174:32:174:32 | passwd | testCryptoKit.swift:174:32:174:32 | passwd | testCryptoKit.swift:174:32:174:32 | passwd | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:174:32:174:32 | passwd | password (passwd) |
+| testCryptoKit.swift:183:32:183:32 | passwd | testCryptoKit.swift:183:32:183:32 | passwd | testCryptoKit.swift:183:32:183:32 | passwd | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:183:32:183:32 | passwd | password (passwd) |
+| testCryptoKit.swift:192:32:192:32 | passwd | testCryptoKit.swift:192:32:192:32 | passwd | testCryptoKit.swift:192:32:192:32 | passwd | Insecure hashing algorithm (SHA256) depends on $@. | testCryptoKit.swift:192:32:192:32 | passwd | password (passwd) |
+| testCryptoKit.swift:201:32:201:32 | passwd | testCryptoKit.swift:201:32:201:32 | passwd | testCryptoKit.swift:201:32:201:32 | passwd | Insecure hashing algorithm (SHA384) depends on $@. | testCryptoKit.swift:201:32:201:32 | passwd | password (passwd) |
+| testCryptoKit.swift:210:32:210:32 | passwd | testCryptoKit.swift:210:32:210:32 | passwd | testCryptoKit.swift:210:32:210:32 | passwd | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:210:32:210:32 | passwd | password (passwd) |
+| testCryptoKit.swift:220:49:220:49 | passwordData | testCryptoKit.swift:220:49:220:49 | passwordData | testCryptoKit.swift:220:49:220:49 | passwordData | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:220:49:220:49 | passwordData | password (passwordData) |
+| testCryptoKit.swift:224:33:224:57 | call to Data.init(_:) | testCryptoKit.swift:224:38:224:38 | passwordString | testCryptoKit.swift:224:33:224:57 | call to Data.init(_:) | Insecure hashing algorithm (SHA512) depends on $@. | testCryptoKit.swift:224:38:224:38 | passwordString | password (passwordString) |
 | testCryptoSwift.swift:154:30:154:30 | passwdArray | testCryptoSwift.swift:154:30:154:30 | passwdArray | testCryptoSwift.swift:154:30:154:30 | passwdArray | Insecure hashing algorithm (MD5) depends on $@. | testCryptoSwift.swift:154:30:154:30 | passwdArray | password (passwdArray) |
 | testCryptoSwift.swift:157:31:157:31 | passwdArray | testCryptoSwift.swift:157:31:157:31 | passwdArray | testCryptoSwift.swift:157:31:157:31 | passwdArray | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoSwift.swift:157:31:157:31 | passwdArray | password (passwdArray) |
 | testCryptoSwift.swift:160:47:160:47 | passwdArray | testCryptoSwift.swift:160:47:160:47 | passwdArray | testCryptoSwift.swift:160:47:160:47 | passwdArray | Insecure hashing algorithm (SHA2) depends on $@. | testCryptoSwift.swift:160:47:160:47 | passwdArray | password (passwdArray) |
diff --git a/swift/ql/test/query-tests/Security/CWE-328/WeakSensitiveDataHashing.expected b/swift/ql/test/query-tests/Security/CWE-328/WeakSensitiveDataHashing.expected
index 2cd31692f8d6..ebb8154b0f8e 100644
--- a/swift/ql/test/query-tests/Security/CWE-328/WeakSensitiveDataHashing.expected
+++ b/swift/ql/test/query-tests/Security/CWE-328/WeakSensitiveDataHashing.expected
@@ -1,23 +1,69 @@
 edges
+| testCryptoKit.swift:230:18:230:38 | call to Data.init(_:) | testCryptoKit.swift:231:44:231:44 | value1 | provenance |  |
+| testCryptoKit.swift:230:23:230:23 | cardNumber | testCryptoKit.swift:230:23:230:34 | .utf8 | provenance |  |
+| testCryptoKit.swift:230:23:230:34 | .utf8 | testCryptoKit.swift:230:18:230:38 | call to Data.init(_:) | provenance |  |
+| testCryptoKit.swift:233:18:233:38 | call to Data.init(_:) | testCryptoKit.swift:235:39:235:39 | value2 | provenance |  |
+| testCryptoKit.swift:233:23:233:23 | cardNumber | testCryptoKit.swift:233:23:233:34 | .utf8 | provenance |  |
+| testCryptoKit.swift:233:23:233:34 | .utf8 | testCryptoKit.swift:233:18:233:38 | call to Data.init(_:) | provenance |  |
+| testCryptoKit.swift:237:18:237:38 | call to Data.init(_:) | testCryptoKit.swift:238:51:238:51 | value3 | provenance |  |
+| testCryptoKit.swift:237:23:237:23 | cardNumber | testCryptoKit.swift:237:23:237:34 | .utf8 | provenance |  |
+| testCryptoKit.swift:237:23:237:34 | .utf8 | testCryptoKit.swift:237:18:237:38 | call to Data.init(_:) | provenance |  |
+| testCryptoKit.swift:240:18:240:38 | call to Data.init(_:) | testCryptoKit.swift:241:26:241:26 | value4 | provenance |  |
+| testCryptoKit.swift:240:23:240:23 | cardNumber | testCryptoKit.swift:240:23:240:34 | .utf8 | provenance |  |
+| testCryptoKit.swift:240:23:240:34 | .utf8 | testCryptoKit.swift:240:18:240:38 | call to Data.init(_:) | provenance |  |
+| testCryptoKit.swift:241:26:241:26 | value4 | testCryptoKit.swift:250:20:250:27 | value | provenance |  |
+| testCryptoKit.swift:243:18:243:38 | call to Data.init(_:) | testCryptoKit.swift:244:53:244:53 | value5 | provenance |  |
+| testCryptoKit.swift:243:23:243:23 | cardNumber | testCryptoKit.swift:243:23:243:34 | .utf8 | provenance |  |
+| testCryptoKit.swift:243:23:243:34 | .utf8 | testCryptoKit.swift:243:18:243:38 | call to Data.init(_:) | provenance |  |
+| testCryptoKit.swift:244:53:244:53 | value5 | testCryptoKit.swift:254:47:254:54 | value | provenance |  |
+| testCryptoKit.swift:250:20:250:27 | value | testCryptoKit.swift:251:43:251:43 | value | provenance |  |
+| testCryptoKit.swift:254:47:254:54 | value | testCryptoKit.swift:255:37:255:37 | value | provenance |  |
 nodes
-| testCryptoKit.swift:66:43:66:43 | cert | semmle.label | cert |
-| testCryptoKit.swift:68:43:68:43 | account_no | semmle.label | account_no |
-| testCryptoKit.swift:69:43:69:43 | credit_card_no | semmle.label | credit_card_no |
-| testCryptoKit.swift:72:44:72:44 | cert | semmle.label | cert |
-| testCryptoKit.swift:74:44:74:44 | account_no | semmle.label | account_no |
-| testCryptoKit.swift:75:44:75:44 | credit_card_no | semmle.label | credit_card_no |
-| testCryptoKit.swift:99:23:99:23 | cert | semmle.label | cert |
-| testCryptoKit.swift:101:23:101:23 | account_no | semmle.label | account_no |
-| testCryptoKit.swift:102:23:102:23 | credit_card_no | semmle.label | credit_card_no |
-| testCryptoKit.swift:108:23:108:23 | cert | semmle.label | cert |
-| testCryptoKit.swift:110:23:110:23 | account_no | semmle.label | account_no |
-| testCryptoKit.swift:111:23:111:23 | credit_card_no | semmle.label | credit_card_no |
-| testCryptoKit.swift:144:32:144:32 | cert | semmle.label | cert |
-| testCryptoKit.swift:146:32:146:32 | account_no | semmle.label | account_no |
-| testCryptoKit.swift:147:32:147:32 | credit_card_no | semmle.label | credit_card_no |
-| testCryptoKit.swift:153:32:153:32 | cert | semmle.label | cert |
-| testCryptoKit.swift:155:32:155:32 | account_no | semmle.label | account_no |
-| testCryptoKit.swift:156:32:156:32 | credit_card_no | semmle.label | credit_card_no |
+| testCryptoKit.swift:86:43:86:43 | cert | semmle.label | cert |
+| testCryptoKit.swift:88:43:88:43 | account_no | semmle.label | account_no |
+| testCryptoKit.swift:89:43:89:43 | credit_card_no | semmle.label | credit_card_no |
+| testCryptoKit.swift:93:36:93:36 | cert | semmle.label | cert |
+| testCryptoKit.swift:95:36:95:36 | account_no | semmle.label | account_no |
+| testCryptoKit.swift:96:36:96:36 | credit_card_no | semmle.label | credit_card_no |
+| testCryptoKit.swift:100:44:100:44 | cert | semmle.label | cert |
+| testCryptoKit.swift:102:44:102:44 | account_no | semmle.label | account_no |
+| testCryptoKit.swift:103:44:103:44 | credit_card_no | semmle.label | credit_card_no |
+| testCryptoKit.swift:130:23:130:23 | cert | semmle.label | cert |
+| testCryptoKit.swift:132:23:132:23 | account_no | semmle.label | account_no |
+| testCryptoKit.swift:133:23:133:23 | credit_card_no | semmle.label | credit_card_no |
+| testCryptoKit.swift:139:23:139:23 | cert | semmle.label | cert |
+| testCryptoKit.swift:141:23:141:23 | account_no | semmle.label | account_no |
+| testCryptoKit.swift:142:23:142:23 | credit_card_no | semmle.label | credit_card_no |
+| testCryptoKit.swift:175:32:175:32 | cert | semmle.label | cert |
+| testCryptoKit.swift:177:32:177:32 | account_no | semmle.label | account_no |
+| testCryptoKit.swift:178:32:178:32 | credit_card_no | semmle.label | credit_card_no |
+| testCryptoKit.swift:184:32:184:32 | cert | semmle.label | cert |
+| testCryptoKit.swift:186:32:186:32 | account_no | semmle.label | account_no |
+| testCryptoKit.swift:187:32:187:32 | credit_card_no | semmle.label | credit_card_no |
+| testCryptoKit.swift:230:18:230:38 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
+| testCryptoKit.swift:230:23:230:23 | cardNumber | semmle.label | cardNumber |
+| testCryptoKit.swift:230:23:230:34 | .utf8 | semmle.label | .utf8 |
+| testCryptoKit.swift:231:44:231:44 | value1 | semmle.label | value1 |
+| testCryptoKit.swift:233:18:233:38 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
+| testCryptoKit.swift:233:23:233:23 | cardNumber | semmle.label | cardNumber |
+| testCryptoKit.swift:233:23:233:34 | .utf8 | semmle.label | .utf8 |
+| testCryptoKit.swift:235:39:235:39 | value2 | semmle.label | value2 |
+| testCryptoKit.swift:237:18:237:38 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
+| testCryptoKit.swift:237:23:237:23 | cardNumber | semmle.label | cardNumber |
+| testCryptoKit.swift:237:23:237:34 | .utf8 | semmle.label | .utf8 |
+| testCryptoKit.swift:238:51:238:51 | value3 | semmle.label | value3 |
+| testCryptoKit.swift:240:18:240:38 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
+| testCryptoKit.swift:240:23:240:23 | cardNumber | semmle.label | cardNumber |
+| testCryptoKit.swift:240:23:240:34 | .utf8 | semmle.label | .utf8 |
+| testCryptoKit.swift:241:26:241:26 | value4 | semmle.label | value4 |
+| testCryptoKit.swift:243:18:243:38 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
+| testCryptoKit.swift:243:23:243:23 | cardNumber | semmle.label | cardNumber |
+| testCryptoKit.swift:243:23:243:34 | .utf8 | semmle.label | .utf8 |
+| testCryptoKit.swift:244:53:244:53 | value5 | semmle.label | value5 |
+| testCryptoKit.swift:250:20:250:27 | value | semmle.label | value |
+| testCryptoKit.swift:251:43:251:43 | value | semmle.label | value |
+| testCryptoKit.swift:254:47:254:54 | value | semmle.label | value |
+| testCryptoKit.swift:255:37:255:37 | value | semmle.label | value |
 | testCryptoSwift.swift:153:30:153:30 | phoneNumberArray | semmle.label | phoneNumberArray |
 | testCryptoSwift.swift:156:31:156:31 | phoneNumberArray | semmle.label | phoneNumberArray |
 | testCryptoSwift.swift:166:20:166:20 | phoneNumberArray | semmle.label | phoneNumberArray |
@@ -30,24 +76,32 @@ nodes
 | testCryptoSwift.swift:221:9:221:9 | creditCardNumber | semmle.label | creditCardNumber |
 subpaths
 #select
-| testCryptoKit.swift:66:43:66:43 | cert | testCryptoKit.swift:66:43:66:43 | cert | testCryptoKit.swift:66:43:66:43 | cert | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:66:43:66:43 | cert | sensitive data (credential cert) |
-| testCryptoKit.swift:68:43:68:43 | account_no | testCryptoKit.swift:68:43:68:43 | account_no | testCryptoKit.swift:68:43:68:43 | account_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:68:43:68:43 | account_no | sensitive data (private information account_no) |
-| testCryptoKit.swift:69:43:69:43 | credit_card_no | testCryptoKit.swift:69:43:69:43 | credit_card_no | testCryptoKit.swift:69:43:69:43 | credit_card_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:69:43:69:43 | credit_card_no | sensitive data (private information credit_card_no) |
-| testCryptoKit.swift:72:44:72:44 | cert | testCryptoKit.swift:72:44:72:44 | cert | testCryptoKit.swift:72:44:72:44 | cert | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:72:44:72:44 | cert | sensitive data (credential cert) |
-| testCryptoKit.swift:74:44:74:44 | account_no | testCryptoKit.swift:74:44:74:44 | account_no | testCryptoKit.swift:74:44:74:44 | account_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:74:44:74:44 | account_no | sensitive data (private information account_no) |
-| testCryptoKit.swift:75:44:75:44 | credit_card_no | testCryptoKit.swift:75:44:75:44 | credit_card_no | testCryptoKit.swift:75:44:75:44 | credit_card_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:75:44:75:44 | credit_card_no | sensitive data (private information credit_card_no) |
-| testCryptoKit.swift:99:23:99:23 | cert | testCryptoKit.swift:99:23:99:23 | cert | testCryptoKit.swift:99:23:99:23 | cert | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:99:23:99:23 | cert | sensitive data (credential cert) |
-| testCryptoKit.swift:101:23:101:23 | account_no | testCryptoKit.swift:101:23:101:23 | account_no | testCryptoKit.swift:101:23:101:23 | account_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:101:23:101:23 | account_no | sensitive data (private information account_no) |
-| testCryptoKit.swift:102:23:102:23 | credit_card_no | testCryptoKit.swift:102:23:102:23 | credit_card_no | testCryptoKit.swift:102:23:102:23 | credit_card_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:102:23:102:23 | credit_card_no | sensitive data (private information credit_card_no) |
-| testCryptoKit.swift:108:23:108:23 | cert | testCryptoKit.swift:108:23:108:23 | cert | testCryptoKit.swift:108:23:108:23 | cert | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:108:23:108:23 | cert | sensitive data (credential cert) |
-| testCryptoKit.swift:110:23:110:23 | account_no | testCryptoKit.swift:110:23:110:23 | account_no | testCryptoKit.swift:110:23:110:23 | account_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:110:23:110:23 | account_no | sensitive data (private information account_no) |
-| testCryptoKit.swift:111:23:111:23 | credit_card_no | testCryptoKit.swift:111:23:111:23 | credit_card_no | testCryptoKit.swift:111:23:111:23 | credit_card_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:111:23:111:23 | credit_card_no | sensitive data (private information credit_card_no) |
-| testCryptoKit.swift:144:32:144:32 | cert | testCryptoKit.swift:144:32:144:32 | cert | testCryptoKit.swift:144:32:144:32 | cert | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:144:32:144:32 | cert | sensitive data (credential cert) |
-| testCryptoKit.swift:146:32:146:32 | account_no | testCryptoKit.swift:146:32:146:32 | account_no | testCryptoKit.swift:146:32:146:32 | account_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:146:32:146:32 | account_no | sensitive data (private information account_no) |
-| testCryptoKit.swift:147:32:147:32 | credit_card_no | testCryptoKit.swift:147:32:147:32 | credit_card_no | testCryptoKit.swift:147:32:147:32 | credit_card_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:147:32:147:32 | credit_card_no | sensitive data (private information credit_card_no) |
-| testCryptoKit.swift:153:32:153:32 | cert | testCryptoKit.swift:153:32:153:32 | cert | testCryptoKit.swift:153:32:153:32 | cert | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:153:32:153:32 | cert | sensitive data (credential cert) |
-| testCryptoKit.swift:155:32:155:32 | account_no | testCryptoKit.swift:155:32:155:32 | account_no | testCryptoKit.swift:155:32:155:32 | account_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:155:32:155:32 | account_no | sensitive data (private information account_no) |
-| testCryptoKit.swift:156:32:156:32 | credit_card_no | testCryptoKit.swift:156:32:156:32 | credit_card_no | testCryptoKit.swift:156:32:156:32 | credit_card_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:156:32:156:32 | credit_card_no | sensitive data (private information credit_card_no) |
+| testCryptoKit.swift:86:43:86:43 | cert | testCryptoKit.swift:86:43:86:43 | cert | testCryptoKit.swift:86:43:86:43 | cert | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:86:43:86:43 | cert | sensitive data (credential cert) |
+| testCryptoKit.swift:88:43:88:43 | account_no | testCryptoKit.swift:88:43:88:43 | account_no | testCryptoKit.swift:88:43:88:43 | account_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:88:43:88:43 | account_no | sensitive data (private information account_no) |
+| testCryptoKit.swift:89:43:89:43 | credit_card_no | testCryptoKit.swift:89:43:89:43 | credit_card_no | testCryptoKit.swift:89:43:89:43 | credit_card_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:89:43:89:43 | credit_card_no | sensitive data (private information credit_card_no) |
+| testCryptoKit.swift:93:36:93:36 | cert | testCryptoKit.swift:93:36:93:36 | cert | testCryptoKit.swift:93:36:93:36 | cert | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:93:36:93:36 | cert | sensitive data (credential cert) |
+| testCryptoKit.swift:95:36:95:36 | account_no | testCryptoKit.swift:95:36:95:36 | account_no | testCryptoKit.swift:95:36:95:36 | account_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:95:36:95:36 | account_no | sensitive data (private information account_no) |
+| testCryptoKit.swift:96:36:96:36 | credit_card_no | testCryptoKit.swift:96:36:96:36 | credit_card_no | testCryptoKit.swift:96:36:96:36 | credit_card_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:96:36:96:36 | credit_card_no | sensitive data (private information credit_card_no) |
+| testCryptoKit.swift:100:44:100:44 | cert | testCryptoKit.swift:100:44:100:44 | cert | testCryptoKit.swift:100:44:100:44 | cert | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:100:44:100:44 | cert | sensitive data (credential cert) |
+| testCryptoKit.swift:102:44:102:44 | account_no | testCryptoKit.swift:102:44:102:44 | account_no | testCryptoKit.swift:102:44:102:44 | account_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:102:44:102:44 | account_no | sensitive data (private information account_no) |
+| testCryptoKit.swift:103:44:103:44 | credit_card_no | testCryptoKit.swift:103:44:103:44 | credit_card_no | testCryptoKit.swift:103:44:103:44 | credit_card_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:103:44:103:44 | credit_card_no | sensitive data (private information credit_card_no) |
+| testCryptoKit.swift:130:23:130:23 | cert | testCryptoKit.swift:130:23:130:23 | cert | testCryptoKit.swift:130:23:130:23 | cert | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:130:23:130:23 | cert | sensitive data (credential cert) |
+| testCryptoKit.swift:132:23:132:23 | account_no | testCryptoKit.swift:132:23:132:23 | account_no | testCryptoKit.swift:132:23:132:23 | account_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:132:23:132:23 | account_no | sensitive data (private information account_no) |
+| testCryptoKit.swift:133:23:133:23 | credit_card_no | testCryptoKit.swift:133:23:133:23 | credit_card_no | testCryptoKit.swift:133:23:133:23 | credit_card_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:133:23:133:23 | credit_card_no | sensitive data (private information credit_card_no) |
+| testCryptoKit.swift:139:23:139:23 | cert | testCryptoKit.swift:139:23:139:23 | cert | testCryptoKit.swift:139:23:139:23 | cert | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:139:23:139:23 | cert | sensitive data (credential cert) |
+| testCryptoKit.swift:141:23:141:23 | account_no | testCryptoKit.swift:141:23:141:23 | account_no | testCryptoKit.swift:141:23:141:23 | account_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:141:23:141:23 | account_no | sensitive data (private information account_no) |
+| testCryptoKit.swift:142:23:142:23 | credit_card_no | testCryptoKit.swift:142:23:142:23 | credit_card_no | testCryptoKit.swift:142:23:142:23 | credit_card_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:142:23:142:23 | credit_card_no | sensitive data (private information credit_card_no) |
+| testCryptoKit.swift:175:32:175:32 | cert | testCryptoKit.swift:175:32:175:32 | cert | testCryptoKit.swift:175:32:175:32 | cert | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:175:32:175:32 | cert | sensitive data (credential cert) |
+| testCryptoKit.swift:177:32:177:32 | account_no | testCryptoKit.swift:177:32:177:32 | account_no | testCryptoKit.swift:177:32:177:32 | account_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:177:32:177:32 | account_no | sensitive data (private information account_no) |
+| testCryptoKit.swift:178:32:178:32 | credit_card_no | testCryptoKit.swift:178:32:178:32 | credit_card_no | testCryptoKit.swift:178:32:178:32 | credit_card_no | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:178:32:178:32 | credit_card_no | sensitive data (private information credit_card_no) |
+| testCryptoKit.swift:184:32:184:32 | cert | testCryptoKit.swift:184:32:184:32 | cert | testCryptoKit.swift:184:32:184:32 | cert | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:184:32:184:32 | cert | sensitive data (credential cert) |
+| testCryptoKit.swift:186:32:186:32 | account_no | testCryptoKit.swift:186:32:186:32 | account_no | testCryptoKit.swift:186:32:186:32 | account_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:186:32:186:32 | account_no | sensitive data (private information account_no) |
+| testCryptoKit.swift:187:32:187:32 | credit_card_no | testCryptoKit.swift:187:32:187:32 | credit_card_no | testCryptoKit.swift:187:32:187:32 | credit_card_no | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoKit.swift:187:32:187:32 | credit_card_no | sensitive data (private information credit_card_no) |
+| testCryptoKit.swift:231:44:231:44 | value1 | testCryptoKit.swift:230:23:230:23 | cardNumber | testCryptoKit.swift:231:44:231:44 | value1 | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:230:23:230:23 | cardNumber | sensitive data (private information cardNumber) |
+| testCryptoKit.swift:235:39:235:39 | value2 | testCryptoKit.swift:233:23:233:23 | cardNumber | testCryptoKit.swift:235:39:235:39 | value2 | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:233:23:233:23 | cardNumber | sensitive data (private information cardNumber) |
+| testCryptoKit.swift:238:51:238:51 | value3 | testCryptoKit.swift:237:23:237:23 | cardNumber | testCryptoKit.swift:238:51:238:51 | value3 | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:237:23:237:23 | cardNumber | sensitive data (private information cardNumber) |
+| testCryptoKit.swift:251:43:251:43 | value | testCryptoKit.swift:240:23:240:23 | cardNumber | testCryptoKit.swift:251:43:251:43 | value | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:240:23:240:23 | cardNumber | sensitive data (private information cardNumber) |
+| testCryptoKit.swift:255:37:255:37 | value | testCryptoKit.swift:243:23:243:23 | cardNumber | testCryptoKit.swift:255:37:255:37 | value | Insecure hashing algorithm (MD5) depends on $@. | testCryptoKit.swift:243:23:243:23 | cardNumber | sensitive data (private information cardNumber) |
 | testCryptoSwift.swift:153:30:153:30 | phoneNumberArray | testCryptoSwift.swift:153:30:153:30 | phoneNumberArray | testCryptoSwift.swift:153:30:153:30 | phoneNumberArray | Insecure hashing algorithm (MD5) depends on $@. | testCryptoSwift.swift:153:30:153:30 | phoneNumberArray | sensitive data (private information phoneNumberArray) |
 | testCryptoSwift.swift:156:31:156:31 | phoneNumberArray | testCryptoSwift.swift:156:31:156:31 | phoneNumberArray | testCryptoSwift.swift:156:31:156:31 | phoneNumberArray | Insecure hashing algorithm (SHA1) depends on $@. | testCryptoSwift.swift:156:31:156:31 | phoneNumberArray | sensitive data (private information phoneNumberArray) |
 | testCryptoSwift.swift:166:20:166:20 | phoneNumberArray | testCryptoSwift.swift:166:20:166:20 | phoneNumberArray | testCryptoSwift.swift:166:20:166:20 | phoneNumberArray | Insecure hashing algorithm (MD5) depends on $@. | testCryptoSwift.swift:166:20:166:20 | phoneNumberArray | sensitive data (private information phoneNumberArray) |
diff --git a/swift/ql/test/query-tests/Security/CWE-328/testCryptoKit.swift b/swift/ql/test/query-tests/Security/CWE-328/testCryptoKit.swift
index dd37c6238c0b..6869805e65aa 100644
--- a/swift/ql/test/query-tests/Security/CWE-328/testCryptoKit.swift
+++ b/swift/ql/test/query-tests/Security/CWE-328/testCryptoKit.swift
@@ -7,55 +7,74 @@ class Data
     init<S>(_ elements: S) {}
 }
 
-struct SHA256 {
-    static func hash<D>(data: D) -> [UInt8] {
-        return []
-    }
+public protocol HashFunction {
+    associatedtype Digest
 
-    func update<D>(data: D) {}
-    func update(bufferPointer: UnsafeRawBufferPointer) {}
-    func finalize() -> [UInt8] { return [] }
+    init()
+    mutating func update(bufferPointer: UnsafeRawBufferPointer)
+    func finalize() -> Digest
 }
 
-struct SHA384 {
-    static func hash<D>(data: D) -> [UInt8] {
-        return []
+extension HashFunction {
+    @inlinable
+    public static func hash(bufferPointer: UnsafeRawBufferPointer) -> Digest {
+        var hasher = Self()
+        hasher.update(bufferPointer: bufferPointer)
+        return hasher.finalize()
     }
 
-    func update<D>(data: D) {}
-    func update(bufferPointer: UnsafeRawBufferPointer) {}
-    func finalize() -> [UInt8] { return [] }
-}
+    @inlinable
+    public static func hash<D>(data: D) -> Self.Digest {
+        var hasher = Self()
+        hasher.update(data: data)
+        return hasher.finalize()
+    }
 
-struct SHA512 {
-    static func hash<D>(data: D) -> [UInt8] {
-        return []
+    @inlinable
+    public mutating func update<D>(data: D) {
+        // ...
     }
+}
+
+public struct SHA256: HashFunction {
+    public typealias Digest = [UInt8]
+
+    public init() {}
+    public mutating func update(bufferPointer: UnsafeRawBufferPointer) {}
+    public func finalize() -> Digest { return [] }
+}
 
-    func update<D>(data: D) {}
-    func update(bufferPointer: UnsafeRawBufferPointer) {}
-    func finalize() -> [UInt8] { return [] }
+public struct SHA384: HashFunction {
+    public typealias Digest = [UInt8]
+
+    public init() {}
+    public mutating func update(bufferPointer: UnsafeRawBufferPointer) {}
+    public func finalize() -> Digest { return [] }
 }
 
+public struct SHA512: HashFunction {
+    public typealias Digest = [UInt8]
+
+    public init() {}
+    public mutating func update(bufferPointer: UnsafeRawBufferPointer) {}
+    public func finalize() -> Digest { return [] }
+}
 
 enum Insecure {
-    struct MD5 {
-        static func hash<D>(data: D) -> [UInt8] {
-            return []
-        }
-
-        func update<D>(data: D) {}
-        func update(bufferPointer: UnsafeRawBufferPointer) {}
-        func finalize() -> [UInt8] { return [] }
+    public struct MD5: HashFunction {
+        public typealias Digest = [UInt8]
+
+        public init() {}
+        public mutating func update(bufferPointer: UnsafeRawBufferPointer) {}
+        public func finalize() -> Digest { return [] }
     }
-    struct SHA1 {
-        static func hash<D>(data: D) -> [UInt8] {
-            return []
-        }
-
-        func update<D>(data: D) {}
-        func update(bufferPointer: UnsafeRawBufferPointer) {}
-        func finalize() -> [UInt8] { return [] }
+
+    public struct SHA1: HashFunction {
+        public typealias Digest = [UInt8]
+
+        public init() {}
+        public mutating func update(bufferPointer: UnsafeRawBufferPointer) {}
+        public func finalize() -> Digest { return [] }
     }
 }
 
@@ -63,30 +82,42 @@ enum Insecure {
 
 func testHashMethods(passwd : UnsafeRawBufferPointer, cert: String, encrypted_passwd : String, account_no : String, credit_card_no : String) {
     var hash = Crypto.Insecure.MD5.hash(data: passwd)  // BAD
+    hash = Crypto.Insecure.MD5.hash(bufferPointer: passwd)  // BAD
     hash = Crypto.Insecure.MD5.hash(data: cert)   // BAD
     hash = Crypto.Insecure.MD5.hash(data: encrypted_passwd)  // GOOD  (not sensitive)
     hash = Crypto.Insecure.MD5.hash(data: account_no)   // BAD
     hash = Crypto.Insecure.MD5.hash(data: credit_card_no)   // BAD
 
+    hash = Insecure.MD5.hash(data: passwd)  // BAD
+    hash = Insecure.MD5.hash(bufferPointer: passwd)  // BAD
+    hash = Insecure.MD5.hash(data: cert)   // BAD
+    hash = Insecure.MD5.hash(data: encrypted_passwd)  // GOOD  (not sensitive)
+    hash = Insecure.MD5.hash(data: account_no)   // BAD
+    hash = Insecure.MD5.hash(data: credit_card_no)   // BAD
+
     hash = Crypto.Insecure.SHA1.hash(data: passwd)  // BAD
+    hash = Crypto.Insecure.SHA1.hash(bufferPointer: passwd)  // BAD
     hash = Crypto.Insecure.SHA1.hash(data: cert)   // BAD
     hash = Crypto.Insecure.SHA1.hash(data: encrypted_passwd)  // GOOD  (not sensitive)
     hash = Crypto.Insecure.SHA1.hash(data: account_no)   // BAD
     hash = Crypto.Insecure.SHA1.hash(data: credit_card_no)   // BAD
 
     hash = Crypto.SHA256.hash(data: passwd)   // BAD, not a computationally expensive hash
+    hash = Crypto.SHA256.hash(bufferPointer: passwd)   // BAD, not a computationally expensive hash
     hash = Crypto.SHA256.hash(data: cert)   // GOOD, computationally expensive hash not required
     hash = Crypto.SHA256.hash(data: encrypted_passwd)   // GOOD, not sensitive
     hash = Crypto.SHA256.hash(data: account_no)   // GOOD, computationally expensive hash not required
     hash = Crypto.SHA256.hash(data: credit_card_no)   // GOOD, computationally expensive hash not required
 
     hash = Crypto.SHA384.hash(data: passwd)   // BAD, not a computationally expensive hash
+    hash = Crypto.SHA384.hash(bufferPointer: passwd)   // BAD, not a computationally expensive hash
     hash = Crypto.SHA384.hash(data: cert)   // GOOD, computationally expensive hash not required
     hash = Crypto.SHA384.hash(data: encrypted_passwd)   // GOOD, not sensitive
     hash = Crypto.SHA384.hash(data: account_no)   // GOOD, computationally expensive hash not required
     hash = Crypto.SHA384.hash(data: credit_card_no)   // GOOD, computationally expensive hash not required
 
     hash = Crypto.SHA512.hash(data: passwd)   // BAD, not a computationally expensive hash
+    hash = Crypto.SHA512.hash(bufferPointer: passwd)   // BAD, not a computationally expensive hash
     hash = Crypto.SHA512.hash(data: cert)   // GOOD, computationally expensive hash not required
     hash = Crypto.SHA512.hash(data: encrypted_passwd)   // GOOD, not sensitive
     hash = Crypto.SHA512.hash(data: account_no)   // GOOD, computationally expensive hash not required
@@ -183,7 +214,7 @@ func testSHA512UpdateWithUnsafeRawBufferPointer(passwd : UnsafeRawBufferPointer,
     hash.update(bufferPointer: credit_card_no)   // GOOD
 }
 
-func tesBadExample(passwordString: String) {
+func testBadExample(passwordString: String) {
     // this is the "bad" example from the .qhelp
     let passwordData = Data(passwordString.utf8)
     let passwordHash = Crypto.SHA512.hash(data: passwordData) // BAD, not a computationally expensive hash
@@ -194,3 +225,36 @@ func tesBadExample(passwordString: String) {
 	    // ...
     }
 }
+
+func testWithFlowAndMetatypes(cardNumber: String) {
+    let value1 = Data(cardNumber.utf8);
+    let _digest1 = Insecure.MD5.hash(data: value1); // BAD
+
+    let value2 = Data(cardNumber.utf8);
+    let hasher2 = Insecure.MD5.self; // metatype
+    let _digest2 = hasher2.hash(data: value2); // BAD
+
+    let value3 = Data(cardNumber.utf8);
+    let _digest3 = (Insecure.MD5.self).hash(data: value3); // BAD
+
+    let value4 = Data(cardNumber.utf8);
+    testReceiver1(value: value4);
+
+    let value5 = Data(cardNumber.utf8);
+    testReceiver2(hasher: Insecure.MD5.self, value: value5);
+
+    let value6 = Data(cardNumber.utf8);
+    testReceiver3(hasher: Insecure.MD5.self, value: value6);
+}
+
+func testReceiver1(value: Data) {
+    let _digest = Insecure.MD5.hash(data: value); // BAD
+}
+
+func testReceiver2(hasher: Insecure.MD5.Type, value: Data) {
+    let _digest = hasher.hash(data: value); // BAD
+}
+
+func testReceiver3<H: HashFunction>(hasher: H.Type, value: Data) {
+    let _digest = hasher.hash(data: value); // BAD [NOT DETECTED]
+}
diff --git a/swift/third_party/resources/resource-dir-linux.zip b/swift/third_party/resources/resource-dir-linux.zip
index 8692eb89fd4c..da93aefcc706 100644
--- a/swift/third_party/resources/resource-dir-linux.zip
+++ b/swift/third_party/resources/resource-dir-linux.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25718237e4b0d725f62baceb8e9eb6b1090433c3a64c15b54205bbd3b1241a78
-size 408416862
+oid sha256:bd132a4fb44688913eff72f94110e2745048ceda3354ba199d8338750881e0e5
+size 408312701
diff --git a/swift/third_party/resources/resource-dir-macos.zip b/swift/third_party/resources/resource-dir-macos.zip
index 51c367e2b136..11ac3ddf0d7d 100644
--- a/swift/third_party/resources/resource-dir-macos.zip
+++ b/swift/third_party/resources/resource-dir-macos.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97c427650a83bd1d70846ef24965cbe2451c3e9b3bb86530f0cb704936ffa07a
-size 548168307
+oid sha256:fd4eaa3a688849279e990da69768da796f6a130ca6e01572d022142ff09e4868
+size 548155566
diff --git a/swift/third_party/resources/swift-prebuilt-linux.tar.zst b/swift/third_party/resources/swift-prebuilt-linux.tar.zst
index 769117fefeaf..2adf23cda687 100644
--- a/swift/third_party/resources/swift-prebuilt-linux.tar.zst
+++ b/swift/third_party/resources/swift-prebuilt-linux.tar.zst
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b313be2bee2c0afbedbe710435b7e0836e1a06f6a8b57d300c9843ebd1f469e3
-size 143494508
+oid sha256:e00f464ad0b793c8e14df844aecbeec5cdd587e8f34a85915593a470dba1beda
+size 143508114
diff --git a/swift/third_party/resources/swift-prebuilt-macos.tar.zst b/swift/third_party/resources/swift-prebuilt-macos.tar.zst
index a48c2ce04661..f63c93f1caa9 100644
--- a/swift/third_party/resources/swift-prebuilt-macos.tar.zst
+++ b/swift/third_party/resources/swift-prebuilt-macos.tar.zst
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4aea62dad0e67b8bb6ac5536a3fff1730f48a15f516b5b6d48b6c42f16508687
-size 125103802
+oid sha256:212229f7f0545aab03e3034f55d13a665bc568633a5defc72a662c83a06e90cc
+size 125133134
diff --git a/unified/AGENTS.md b/unified/AGENTS.md
index 488a94f44bd4..aa5007a56561 100644
--- a/unified/AGENTS.md
+++ b/unified/AGENTS.md
@@ -20,10 +20,15 @@ grammar source), run `scripts/regenerate-grammar.sh` to:
 it shows the impact of a grammar tweak on the named node kinds, fields,
 and child types in a form much easier to read than the raw JSON.
 
-## Testing
-- If you changed the extractor code, always rebuild it before running tests.
+## Extractor Testing
+- To run extractor tests, run `cargo test` in the `extractor` directory.
 
-- To run all tests, run `codeql test run --search-path extractor-pack ql/test`
+- Do not edit the printed ASTs in `extractor/test/corpus` directly. To regenerate the ASTs, run `scripts/update-corpus.sh`.
+
+## CodeQL Testing
+- If you changed the extractor code, always rebuild it before running CodeQL tests.
+
+- To run all CodeQL tests, run `codeql test run --search-path extractor-pack ql/test`
 
 - Do not edit `.expected` files manually. To update the expected output, pass `--learn` to the `codeql test run` command.
 
diff --git a/unified/extractor/ast_types.yml b/unified/extractor/ast_types.yml
new file mode 100644
index 000000000000..22a5e8b19fb8
--- /dev/null
+++ b/unified/extractor/ast_types.yml
@@ -0,0 +1,144 @@
+supertypes:
+  expr:
+    - name_expr
+    - int_literal
+    - string_literal
+    - binary_expr
+    - unary_expr
+    - call_expr
+    - member_access_expr
+    - lambda_expr
+    - unsupported_node
+  stmt:
+    - empty_stmt
+    - block_stmt
+    - expr_stmt
+    - if_stmt
+    - variable_declaration_stmt
+    - guard_if_stmt
+    - unsupported_node
+  condition:
+    - expr_condition
+    - let_pattern_condition
+    - sequence_condition
+    - unsupported_node
+  pattern:
+    - var_pattern
+    - apply_pattern
+    - tuple_pattern
+    - ignore_pattern
+    - unsupported_node
+named:
+  # Top-level is the root node, currently containing a list of expressions
+  top_level:
+    body*: [expr, stmt]
+
+  # An identifier used in the context of an expression
+  name_expr:
+    identifier: identifier
+
+  # An integer literal
+  int_literal:
+
+  # A string literal
+  string_literal:
+
+  # Application of a binary operator, such as `a + b`
+  binary_expr:
+    left: expr
+    operator: operator
+    right: expr
+
+  # Application of a unary operator, such as `!x`
+  unary_expr:
+    operand: expr
+    operator: operator
+
+  # A function or method call, such as `f(x)` or `obj.m(x)`. Method calls
+  # are represented as a call whose `function` is a `member_access_expr`.
+  call_expr:
+    function: expr
+    argument*: expr
+
+  # Member access, such as `obj.member`.
+  member_access_expr:
+    target: expr
+    member: identifier
+
+  lambda_expr:
+    parameter*: parameter
+    body: [expr, stmt]
+
+  # A parameter
+  parameter:
+    pattern: pattern
+
+  empty_stmt:
+
+  block_stmt:
+    body*: stmt
+
+  expr_stmt:
+    expr: expr
+
+  if_stmt:
+    condition: condition
+    then?: stmt
+    else?: stmt
+
+  variable_declaration_stmt:
+    variable_declarator+: variable_declarator
+
+  # A variable declaration, or assignment to a pattern.
+  # The initializer is optional (but typically only possible in combination with a simple variable pattern).
+  variable_declarator:
+    pattern: pattern
+    value?: expr
+
+  # Evaluate 'condition', and if false, execute 'else' which must break from the enclosing block scope (return, break, etc).
+  # Any variables bound by 'condition' will be in scope for the remainder of the enclosing block scope
+  # (which differs from how if_stmt works).
+  guard_if_stmt:
+    condition: condition
+    else: stmt
+
+  # Evaluates the given condition and interprets it as a boolean (by language conventions)
+  expr_condition:
+    expr: expr
+
+  # A series of statements that are executed before evaluating the trailing condition.
+  # Useful for languages where a conditional clause may be preceded by side-effecting
+  # syntactic elements (e.g. binding clauses) that don't themselves form a condition.
+  sequence_condition:
+    stmt*: stmt
+    condition: condition
+
+  # Evaluate 'expr' and match its result against 'pattern', and return true if it matches.
+  # Variables bound by the pattern will be in scope within the 'true' branch controlled by this condition.
+  let_pattern_condition:
+    pattern: pattern
+    value: expr
+
+  # A pattern matching anything, binding its value to the given variable
+  var_pattern:
+    identifier: identifier
+
+  # A pattern matching anything, binding no variables, usually using the syntax "_"
+  ignore_pattern:
+
+  # A pattern such as `Some(x)` where `Some` is the constructor and `x` is an argument
+  apply_pattern:
+    constructor: expr
+    argument*: pattern
+
+  # A tuple pattern such as `(a, b)` in `let (a, b) = pair`.
+  tuple_pattern:
+    element*: pattern
+
+  # An simple unqualified identifier token
+  identifier:
+
+  # A node that we don't yet translate
+  unsupported_node:
+
+  operator:
diff --git a/unified/extractor/src/extractor.rs b/unified/extractor/src/extractor.rs
index eb6f06eb259b..7601fa8addbe 100644
--- a/unified/extractor/src/extractor.rs
+++ b/unified/extractor/src/extractor.rs
@@ -3,9 +3,7 @@ use std::path::PathBuf;
 
 use codeql_extractor::extractor::simple;
 use codeql_extractor::trap;
-
-#[path = "languages/swift/swift.rs"]
-mod swift;
+use crate::languages;
 
 #[derive(Args)]
 pub struct Options {
@@ -25,11 +23,17 @@ pub struct Options {
 pub fn run(options: Options) -> std::io::Result<()> {
     codeql_extractor::extractor::set_tracing_level("unified");
 
+    // The generated dbscheme/QL library uses the unified_* relation namespace.
+    // Keep per-language specs for parser/rules/file globs, but normalize the
+    // extraction table prefix so emitted TRAP relations match the dbscheme.
+    let mut languages = languages::all_language_specs();
+    for lang in &mut languages {
+        lang.prefix = "unified";
+    }
+
     let extractor = simple::Extractor {
         prefix: "unified".to_string(),
-        languages: vec![
-            swift::language_spec(),
-        ],
+        languages,
         trap_dir: options.output_dir,
         trap_compression: trap::Compression::from_env("CODEQL_EXTRACTOR_UNIFIED_OPTION_TRAP_COMPRESSION"),
         source_archive_dir: options.source_archive_dir,
diff --git a/unified/extractor/src/generator.rs b/unified/extractor/src/generator.rs
index ce1f37144a4e..cbf971a8ff25 100644
--- a/unified/extractor/src/generator.rs
+++ b/unified/extractor/src/generator.rs
@@ -3,6 +3,8 @@ use std::path::PathBuf;
 
 use codeql_extractor::generator::{generate, language::Language};
 
+use crate::languages;
+
 #[derive(Args)]
 pub struct Options {
     /// Path of the generated dbscheme file
@@ -17,10 +19,16 @@ pub struct Options {
 pub fn run(options: Options) -> std::io::Result<()> {
     codeql_extractor::extractor::set_tracing_level("unified");
 
+    // The QL-visible schema is the unified output AST, not the per-language
+    // input grammars. Pass it via `desugar.output_node_types_yaml` so the
+    // generator converts the YAML to JSON node-types.
+    let desugar = yeast::DesugaringConfig::new()
+        .with_output_node_types_yaml(languages::OUTPUT_AST_SCHEMA);
+
     let languages = vec![Language {
-        name: "Swift".to_owned(),
-        node_types: tree_sitter_swift::NODE_TYPES,
-        desugar: None,
+        name: "Unified".to_owned(),
+        node_types: "",   // unused: generator picks up output_node_types_yaml above
+        desugar: Some(desugar),
     }];
 
     generate(languages, options.dbscheme, options.library, "run unified/scripts/create-extractor-pack.sh")
diff --git a/unified/extractor/src/languages/mod.rs b/unified/extractor/src/languages/mod.rs
new file mode 100644
index 000000000000..20ad599edfb6
--- /dev/null
+++ b/unified/extractor/src/languages/mod.rs
@@ -0,0 +1,11 @@
+use codeql_extractor::extractor::simple;
+
+#[path = "swift/swift.rs"]
+mod swift;
+
+/// Shared YEAST output AST schema for all languages.
+pub(crate) const OUTPUT_AST_SCHEMA: &str = include_str!("../../ast_types.yml");
+
+pub fn all_language_specs() -> Vec<simple::LanguageSpec> {
+    vec![swift::language_spec(OUTPUT_AST_SCHEMA)]
+}
diff --git a/unified/extractor/src/languages/swift/swift.rs b/unified/extractor/src/languages/swift/swift.rs
index c3843a5979c5..595f56a0b39a 100644
--- a/unified/extractor/src/languages/swift/swift.rs
+++ b/unified/extractor/src/languages/swift/swift.rs
@@ -1,18 +1,358 @@
 use codeql_extractor::extractor::simple;
-use yeast::{rule, DesugaringConfig};
+use yeast::{build::BuildCtx, rule, DesugaringConfig, PhaseKind};
 
-fn desugaring_rules() -> Vec<yeast::Rule> {
+/// Names of output AST kinds that belong to the `expr` supertype. Kept in
+/// sync with `ast_types.yml`. `unsupported_node` is intentionally omitted
+/// because it is also a member of the `stmt` supertype.
+const EXPR_KINDS: &[&str] = &[
+    "name_expr",
+    "int_literal",
+    "string_literal",
+    "binary_expr",
+    "unary_expr",
+    "call_expr",
+    "member_access_expr",
+    "lambda_expr",
+];
+
+/// If `id` is an `expr`, wrap it in `expr_stmt` so it can sit in a `stmt`
+/// position; otherwise return it unchanged.
+fn wrap_expr_in_stmt(ctx: &mut BuildCtx, id: usize) -> usize {
+    let kind = ctx.ast.get_node(id).map(|n| n.kind()).unwrap_or("");
+    if EXPR_KINDS.contains(&kind) {
+        yeast::tree!(ctx, (expr_stmt expr: {id}))
+    } else {
+        id
+    }
+}
+
+fn translation_rules() -> Vec<yeast::Rule> {
     vec![
         rule!(
-            (additive_expression)
+            (source_file (_)* @children)
+            =>
+            (top_level
+                body: {..children}
+            )
+        ),
+        // ---- Binary expressions ----
+        // Swift's parser produces a different node kind for each operator
+        // family, but the field shape (`lhs` / `op` / `rhs`) is uniform, so
+        // each maps onto `binary_expr`.
+        rule!(
+            (additive_expression
+                lhs: (_) @left
+                op: _ @operator
+                rhs: (_) @right)
+            =>
+            (binary_expr
+                left: {left}
+                operator: (operator #{operator})
+                right: {right})
+        ),
+        rule!(
+            (multiplicative_expression
+                lhs: (_) @left
+                op: _ @operator
+                rhs: (_) @right)
+            =>
+            (binary_expr
+                left: {left}
+                operator: (operator #{operator})
+                right: {right})
+        ),
+        rule!(
+            (comparison_expression
+                lhs: (_) @left
+                op: _ @operator
+                rhs: (_) @right)
+            =>
+            (binary_expr
+                left: {left}
+                operator: (operator #{operator})
+                right: {right})
+        ),
+        rule!(
+            (equality_expression
+                lhs: (_) @left
+                op: _ @operator
+                rhs: (_) @right)
+            =>
+            (binary_expr
+                left: {left}
+                operator: (operator #{operator})
+                right: {right})
+        ),
+        rule!(
+            (conjunction_expression
+                lhs: (_) @left
+                op: _ @operator
+                rhs: (_) @right)
+            =>
+            (binary_expr
+                left: {left}
+                operator: (operator #{operator})
+                right: {right})
+        ),
+        rule!(
+            (disjunction_expression
+                lhs: (_) @left
+                op: _ @operator
+                rhs: (_) @right)
+            =>
+            (binary_expr
+                left: {left}
+                operator: (operator #{operator})
+                right: {right})
+        ),
+        rule!(
+            (nil_coalescing_expression
+                lhs: (_) @left
+                op: _ @operator
+                rhs: (_) @right)
+            =>
+            (binary_expr
+                left: {left}
+                operator: (operator #{operator})
+                right: {right})
+        ),
+        rule!(
+            (range_expression
+                start: (_) @left
+                op: _ @operator
+                end: (_) @right)
+            =>
+            (binary_expr
+                left: {left}
+                operator: (operator #{operator})
+                right: {right})
+        ),
+        // ---- Unary expressions ----
+        rule!(
+            (prefix_expression
+                operation: _ @operator
+                target: (_) @operand)
+            =>
+            (unary_expr
+                operand: {operand}
+                operator: (operator #{operator}))
+        ),
+        // ---- Identifiers / name expressions ----
+        rule!(
+            (simple_identifier) @name
+            =>
+            (name_expr
+                identifier: (identifier #{name}))
+        ),
+        // ---- Literals ----
+        rule!(
+            (integer_literal) @lit
+            =>
+            (int_literal #{lit})
+        ),
+        // String literals: render the *raw* source text, including the
+        // surrounding quotes. Interpolations (e.g. `"hi \(x)"`) are not
+        // yet broken out into structured pieces \u2014 they show up as part
+        // of the literal's source text.
+        rule!(
+            (line_string_literal) @lit
+            =>
+            (string_literal #{lit})
+        ),        // ---- Lambdas / closures ----
+        // Map a `lambda_literal` whose body is a single statement to
+        // `lambda_expr`. Multi-statement bodies fall through to
+        // `unsupported_node` because `lambda_expr.body` is single-valued
+        // in the current `ast_types.yml`. Parameters from explicit-typed
+        // closures (`{ (x: Int) -> Int in ... }`) are not yet captured.
+        rule!(
+            (lambda_literal
+                (statements (_) @body))
+            =>
+            (lambda_expr
+                body: {body})
+        ),
+        // ---- Block / statement wrapping ----
+        // A `(statements ...)` node corresponds to a brace-delimited block.
+        // Each child is mapped through translation; bare expression results
+        // get wrapped in `expr_stmt` so they fit the `body*: stmt` field.
+        rule!(
+            (statements (_)* @stmts)
+            =>
+            (block_stmt body: {..stmts.iter().copied().map(|n|
+                wrap_expr_in_stmt(&mut __yeast_ctx, n.into())
+            ).collect::<Vec<usize>>()})
+        ),
+        // ---- Calls and member access ----
+        // Member access, e.g. `obj.member`. The Swift parser wraps the
+        // member name as `(navigation_suffix suffix: (simple_identifier))`.
+        rule!(
+            (navigation_expression
+                target: (_) @target
+                suffix: (navigation_suffix
+                    suffix: (simple_identifier) @member))
+            =>
+            (member_access_expr
+                target: {target}
+                member: (identifier #{member}))
+        ),
+        // Function / method call. The callee is the first child of
+        // `call_expression`; the second is a `call_suffix` whose
+        // `value_arguments` (if present) hold the parenthesized args. A
+        // trailing closure (`call_suffix` with a `lambda_literal` child)
+        // is appended as a final argument.
+        rule!(
+            (call_expression
+                (_) @callee
+                (call_suffix
+                    (value_arguments
+                        (value_argument value: (_) @args)*)?
+                    (lambda_literal)? @trailing))
+            =>
+            (call_expr
+                function: {callee}
+                argument: {..args}
+                argument: {..trailing}
+            )
+        ),
+        // ---- Guard statement ----
+        // `guard let x = e else { ... }` — currently only handles the
+        // let-binding form. The Swift parser models the `let` keyword as a
+        // `value_binding_pattern` child of `condition`, followed by an
+        // unnamed `=` and the source expression.
+        rule!(
+            (guard_statement
+                bound_identifier: (simple_identifier) @id
+                condition: (value_binding_pattern)
+                condition: (_) @value
+                (else)
+                (statements) @else_branch)
+            =>
+            (guard_if_stmt
+                condition: (let_pattern_condition
+                    pattern: (var_pattern identifier: (identifier #{id}))
+                    value: {value})
+                else: {else_branch})
+        ),
+        // ---- If statement ----
+        // if-let binding (with optional else branch). The Swift parser puts
+        // the bound name in `bound_identifier`, the `let` keyword as a
+        // `value_binding_pattern` child of `condition`, and the source
+        // expression as a separate child of `condition`.
+        rule!(
+            (if_statement
+                bound_identifier: (simple_identifier) @id
+                condition: (value_binding_pattern)
+                condition: (_) @value
+                (statements) @then
+                (else)
+                (_) @else_branch)
+            =>
+            (if_stmt
+                condition: (let_pattern_condition
+                    pattern: (var_pattern identifier: (identifier #{id}))
+                    value: {value})
+                then: {then}
+                else: {else_branch})
+        ),
+        rule!(
+            (if_statement
+                bound_identifier: (simple_identifier) @id
+                condition: (value_binding_pattern)
+                condition: (_) @value
+                (statements) @then)
+            =>
+            (if_stmt
+                condition: (let_pattern_condition
+                    pattern: (var_pattern identifier: (identifier #{id}))
+                    value: {value})
+                then: {then})
+        ),
+        // With explicit else branch (block or chained if).
+        rule!(
+            (if_statement
+                condition: (_) @cond
+                (statements) @then
+                (else)
+                (_) @else_branch)
+            =>
+            (if_stmt
+                condition: (expr_condition expr: {cond})
+                then: {then}
+                else: {else_branch})
+        ),
+        // Without else branch.
+        rule!(
+            (if_statement
+                condition: (_) @cond
+                (statements) @then)
+            =>
+            (if_stmt
+                condition: (expr_condition expr: {cond})
+                then: {then})
+        ),        // ---- Patterns ----
+        // The Swift parser uses a `pattern` node with a `bound_identifier`
+        // field for simple bindings such as `let x = ...`.
+        rule!(
+            (pattern bound_identifier: (simple_identifier) @id)
+            =>
+            (var_pattern
+                identifier: (identifier #{id}))
+        ),
+        // Inside tuple patterns, the inner `pattern` node holds a bare
+        // `simple_identifier` (with no `bound_identifier` field).
+        rule!(
+            (pattern (simple_identifier) @id)
+            =>
+            (var_pattern
+                identifier: (identifier #{id}))
+        ),
+        // Tuple destructuring pattern, e.g. `let (a, b) = pair`. The parser
+        // emits a `pattern` node whose unnamed children are themselves
+        // `pattern` nodes.
+        rule!(
+            (pattern (pattern)+ @parts)
+            =>
+            (tuple_pattern element: {..parts})
+        ),
+        // ---- Variable declarations ----
+        // Handles single (`let x = e`), multiple (`let x = 1, y = 2`),
+        // and uninitialized (`var x: T`) bindings.
+        rule!(
+            (property_declaration
+                name: (_)* @pats
+                value: (_)* @vals)
+            =>
+            (variable_declaration_stmt
+                variable_declarator: {..pats.iter().enumerate().map(|(i, &pat)| {
+                    match vals.get(i).copied() {
+                        Some(val) => yeast::tree!(
+                            (variable_declarator
+                                pattern: {pat}
+                                value: {val})),
+                        None => yeast::tree!(
+                            (variable_declarator
+                                pattern: {pat})),
+                    }
+                })})
+        ),
+        // ---- Fallbacks ----
+        rule!(
+            (_)
+            =>
+            (unsupported_node)
+        ),
+        rule!(
+            _ @node
             =>
-            (simple_identifier "blah")
+            {node}
         ),
     ]
 }
 
-pub fn language_spec() -> simple::LanguageSpec {
-    let desugar = DesugaringConfig::new().add_phase("desugar", desugaring_rules());
+pub fn language_spec(desugared_ast_schema: &'static str) -> simple::LanguageSpec {
+    let desugar = DesugaringConfig::new()
+        .add_phase("translate", PhaseKind::OneShot, translation_rules())
+        .with_output_node_types_yaml(desugared_ast_schema);
     simple::LanguageSpec {
         prefix: "swift",
         ts_language: tree_sitter_swift::LANGUAGE.into(),
diff --git a/unified/extractor/src/main.rs b/unified/extractor/src/main.rs
index e6721d4e2243..5a3407c37a29 100644
--- a/unified/extractor/src/main.rs
+++ b/unified/extractor/src/main.rs
@@ -3,6 +3,7 @@ use clap::Parser;
 mod autobuilder;
 mod extractor;
 mod generator;
+mod languages;
 
 #[derive(Parser)]
 #[command(author, version, about)]
diff --git a/unified/extractor/tests/corpus/swift/closures.txt b/unified/extractor/tests/corpus/swift/closures.txt
new file mode 100644
index 000000000000..0afea480a19f
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/closures.txt
@@ -0,0 +1,238 @@
+===
+Closure with explicit parameters
+===
+
+let f = { (x: Int) -> Int in x * 2 }
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "f"
+          value:
+            lambda_literal
+              statement:
+                multiplicative_expression
+                  lhs: simple_identifier "x"
+                  op: *
+                  rhs: integer_literal "2"
+              type:
+                lambda_function_type
+                  params:
+                    lambda_function_type_parameters
+                      parameter:
+                        lambda_parameter
+                          name: simple_identifier "x"
+                          type:
+                            type
+                              name:
+                                user_type
+                                  part:
+                                    simple_user_type
+                                      name: type_identifier "Int"
+                  return_type:
+                    type
+                      name:
+                        user_type
+                          part:
+                            simple_user_type
+                              name: type_identifier "Int"
+
+---
+
+top_level
+  body:
+
+===
+Closure with shorthand parameters
+===
+
+let f = { $0 + $1 }
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "f"
+          value:
+            lambda_literal
+              statement:
+                additive_expression
+                  lhs: simple_identifier "$0"
+                  op: +
+                  rhs: simple_identifier "$1"
+
+---
+
+top_level
+  body:
+
+===
+Trailing closure
+===
+
+xs.map { $0 * 2 }
+
+---
+
+source_file
+  statement:
+    call_expression
+      function:
+        navigation_expression
+          suffix:
+            navigation_suffix
+              suffix: simple_identifier "map"
+          target: simple_identifier "xs"
+      suffix:
+        call_suffix
+          lambda:
+            lambda_literal
+              statement:
+                multiplicative_expression
+                  lhs: simple_identifier "$0"
+                  op: *
+                  rhs: integer_literal "2"
+
+---
+
+top_level
+  body:
+
+===
+Closure with capture list
+===
+
+let f = { [weak self] in self?.doThing() }
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "f"
+          value:
+            lambda_literal
+              captures:
+                capture_list
+                  item:
+                    capture_list_item
+                      name: simple_identifier "self"
+                      ownership:
+                        ownership_modifier
+              statement:
+                call_expression
+                  function:
+                    navigation_expression
+                      suffix:
+                        navigation_suffix
+                          suffix: simple_identifier "doThing"
+                      target:
+                        optional_chain_marker
+                          expr:
+                            self_expression
+                  suffix:
+                    call_suffix
+                      arguments:
+                        value_arguments
+
+---
+
+top_level
+  body:
+
+===
+Multi-statement closure
+===
+
+let f = { (x: Int) -> Int in
+  let y = x + 1
+  return y * 2
+}
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "f"
+          value:
+            lambda_literal
+              statement:
+                property_declaration
+                  binding:
+                    value_binding_pattern
+                      mutability: let
+                  declarator:
+                    property_binding
+                      name:
+                        pattern
+                          bound_identifier: simple_identifier "y"
+                      value:
+                        additive_expression
+                          lhs: simple_identifier "x"
+                          op: +
+                          rhs: integer_literal "1"
+                control_transfer_statement
+                  kind: return
+                  result:
+                    multiplicative_expression
+                      lhs: simple_identifier "y"
+                      op: *
+                      rhs: integer_literal "2"
+              type:
+                lambda_function_type
+                  params:
+                    lambda_function_type_parameters
+                      parameter:
+                        lambda_parameter
+                          name: simple_identifier "x"
+                          type:
+                            type
+                              name:
+                                user_type
+                                  part:
+                                    simple_user_type
+                                      name: type_identifier "Int"
+                  return_type:
+                    type
+                      name:
+                        user_type
+                          part:
+                            simple_user_type
+                              name: type_identifier "Int"
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus/swift/collections.txt b/unified/extractor/tests/corpus/swift/collections.txt
new file mode 100644
index 000000000000..afafc1e69ef2
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/collections.txt
@@ -0,0 +1,311 @@
+===
+Array literal
+===
+
+let xs = [1, 2, 3]
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "xs"
+          value:
+            array_literal
+              element:
+                integer_literal "1"
+                integer_literal "2"
+                integer_literal "3"
+
+---
+
+top_level
+  body:
+
+===
+Empty array literal with type
+===
+
+let xs: [Int] = []
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "xs"
+          type:
+            type_annotation
+              type:
+                type
+                  name:
+                    array_type
+                      element:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Int"
+          value:
+            array_literal
+
+---
+
+top_level
+  body:
+
+===
+Dictionary literal
+===
+
+let d = ["a": 1, "b": 2]
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "d"
+          value:
+            dictionary_literal
+              element:
+                dictionary_literal_item
+                  key:
+                    line_string_literal
+                      text: line_str_text "a"
+                  value: integer_literal "1"
+                dictionary_literal_item
+                  key:
+                    line_string_literal
+                      text: line_str_text "b"
+                  value: integer_literal "2"
+
+---
+
+top_level
+  body:
+
+===
+Set literal
+===
+
+let s: Set<Int> = [1, 2, 3]
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "s"
+          type:
+            type_annotation
+              type:
+                type
+                  name:
+                    user_type
+                      part:
+                        simple_user_type
+                          arguments:
+                            type_arguments
+                              argument:
+                                type
+                                  name:
+                                    user_type
+                                      part:
+                                        simple_user_type
+                                          name: type_identifier "Int"
+                          name: type_identifier "Set"
+          value:
+            array_literal
+              element:
+                integer_literal "1"
+                integer_literal "2"
+                integer_literal "3"
+
+---
+
+top_level
+  body:
+
+===
+Tuple literal
+===
+
+let t = (1, "two", 3.0)
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "t"
+          value:
+            tuple_expression
+              element:
+                tuple_expression_item
+                  value: integer_literal "1"
+                tuple_expression_item
+                  value:
+                    line_string_literal
+                      text: line_str_text "two"
+                tuple_expression_item
+                  value: real_literal "3.0"
+
+---
+
+top_level
+  body:
+
+===
+Subscript access
+===
+
+// TODO: tree-sitter-swift parses `xs[0]` as a call_expression (same shape
+// as `xs(0)`), so the mapping currently produces a call_expr. Update the
+// parser / add a separate subscript_expr node and remap when fixed.
+let first = xs[0]
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "first"
+          value:
+            call_expression
+              function: simple_identifier "xs"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: integer_literal "0"
+  comment "// TODO: tree-sitter-swift parses `xs[0]` as a call_expression (same shape"
+  comment "// as `xs(0)`), so the mapping currently produces a call_expr. Update the"
+  comment "// parser / add a separate subscript_expr node and remap when fixed."
+
+---
+
+top_level
+  body:
+    unsupported_node "// TODO: tree-sitter-swift parses `xs[0]` as a call_expression (same shape"
+    unsupported_node "// as `xs(0)`), so the mapping currently produces a call_expr. Update the"
+    unsupported_node "// parser / add a separate subscript_expr node and remap when fixed."
+
+===
+Dictionary subscript
+===
+
+// TODO: same parser issue as the array subscript case above —
+// `d["key"]` is parsed as `call_expression(d, ("key"))`.
+let v = d["key"]
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "v"
+          value:
+            call_expression
+              function: simple_identifier "d"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value:
+                            line_string_literal
+                              text: line_str_text "key"
+  comment "// TODO: same parser issue as the array subscript case above —"
+  comment "// `d[\"key\"]` is parsed as `call_expression(d, (\"key\"))`."
+
+---
+
+top_level
+  body:
+    unsupported_node "// TODO: same parser issue as the array subscript case above —"
+    unsupported_node "// `d[\"key\"]` is parsed as `call_expression(d, (\"key\"))`."
+
+===
+Tuple member access
+===
+
+let n = t.0
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "n"
+          value:
+            navigation_expression
+              suffix:
+                navigation_suffix
+                  suffix: integer_literal "0"
+              target: simple_identifier "t"
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus/swift/control-flow.txt b/unified/extractor/tests/corpus/swift/control-flow.txt
new file mode 100644
index 000000000000..600e1126cbff
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/control-flow.txt
@@ -0,0 +1,447 @@
+===
+If statement
+===
+
+if x > 0 {
+  print(x)
+}
+
+---
+
+source_file
+  statement:
+    if_statement
+      body:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "x"
+      condition:
+        if_condition
+          kind:
+            comparison_expression
+              lhs: simple_identifier "x"
+              op: >
+              rhs: integer_literal "0"
+
+---
+
+top_level
+  body:
+
+===
+If-else
+===
+
+if x > 0 {
+  print(x)
+} else {
+  print(-x)
+}
+
+---
+
+source_file
+  statement:
+    if_statement
+      body:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "x"
+      condition:
+        if_condition
+          kind:
+            comparison_expression
+              lhs: simple_identifier "x"
+              op: >
+              rhs: integer_literal "0"
+      else_branch:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value:
+                            prefix_expression
+                              operation: -
+                              target: simple_identifier "x"
+
+---
+
+top_level
+  body:
+
+===
+If-else-if chain
+===
+
+if x > 0 {
+  print(1)
+} else if x < 0 {
+  print(2)
+} else {
+  print(3)
+}
+
+---
+
+source_file
+  statement:
+    if_statement
+      body:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: integer_literal "1"
+      condition:
+        if_condition
+          kind:
+            comparison_expression
+              lhs: simple_identifier "x"
+              op: >
+              rhs: integer_literal "0"
+      else_branch:
+        if_statement
+          body:
+            block
+              statement:
+                call_expression
+                  function: simple_identifier "print"
+                  suffix:
+                    call_suffix
+                      arguments:
+                        value_arguments
+                          argument:
+                            value_argument
+                              value: integer_literal "2"
+          condition:
+            if_condition
+              kind:
+                comparison_expression
+                  lhs: simple_identifier "x"
+                  op: <
+                  rhs: integer_literal "0"
+          else_branch:
+            block
+              statement:
+                call_expression
+                  function: simple_identifier "print"
+                  suffix:
+                    call_suffix
+                      arguments:
+                        value_arguments
+                          argument:
+                            value_argument
+                              value: integer_literal "3"
+
+---
+
+top_level
+  body:
+
+===
+If-let optional binding
+===
+
+if let value = optional {
+  print(value)
+}
+
+---
+
+source_file
+  statement:
+    if_statement
+      body:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "value"
+      condition:
+        if_condition
+          kind:
+            if_let_binding
+              pattern:
+                pattern
+                  binding:
+                    value_binding_pattern
+                      mutability: let
+                  bound_identifier: simple_identifier "value"
+              value: simple_identifier "optional"
+
+---
+
+top_level
+  body:
+
+===
+Guard let
+===
+
+guard let value = optional else { return }
+
+---
+
+source_file
+  statement:
+    guard_statement
+      body:
+        block
+          statement:
+            control_transfer_statement
+              kind: return
+      condition:
+        if_condition
+          kind:
+            if_let_binding
+              pattern:
+                pattern
+                  binding:
+                    value_binding_pattern
+                      mutability: let
+                  bound_identifier: simple_identifier "value"
+              value: simple_identifier "optional"
+
+---
+
+top_level
+  body:
+
+===
+Ternary expression
+===
+
+let y = x > 0 ? 1 : -1
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "y"
+          value:
+            ternary_expression
+              condition:
+                comparison_expression
+                  lhs: simple_identifier "x"
+                  op: >
+                  rhs: integer_literal "0"
+              if_false:
+                prefix_expression
+                  operation: -
+                  target: integer_literal "1"
+              if_true: integer_literal "1"
+
+---
+
+top_level
+  body:
+
+===
+Switch statement
+===
+
+switch x {
+case 1:
+  print("one")
+case 2, 3:
+  print("two or three")
+default:
+  print("other")
+}
+
+---
+
+source_file
+  statement:
+    switch_statement
+      entry:
+        switch_entry
+          pattern:
+            switch_pattern
+              pattern:
+                pattern
+                  kind: integer_literal "1"
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value:
+                            line_string_literal
+                              text: line_str_text "one"
+        switch_entry
+          pattern:
+            switch_pattern
+              pattern:
+                pattern
+                  kind: integer_literal "2"
+            switch_pattern
+              pattern:
+                pattern
+                  kind: integer_literal "3"
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value:
+                            line_string_literal
+                              text: line_str_text "two or three"
+        switch_entry
+          default: default_keyword "default"
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value:
+                            line_string_literal
+                              text: line_str_text "other"
+      expr: simple_identifier "x"
+
+---
+
+top_level
+  body:
+
+===
+Switch with binding pattern
+===
+
+switch shape {
+case .circle(let r):
+  print(r)
+case .square(let s):
+  print(s)
+}
+
+---
+
+source_file
+  statement:
+    switch_statement
+      entry:
+        switch_entry
+          pattern:
+            switch_pattern
+              pattern:
+                pattern
+                  kind:
+                    case_pattern
+                      arguments:
+                        tuple_pattern
+                          item:
+                            tuple_pattern_item
+                              pattern:
+                                pattern
+                                  kind:
+                                    binding_pattern
+                                      binding:
+                                        value_binding_pattern
+                                          mutability: let
+                                      pattern:
+                                        pattern
+                                          bound_identifier: simple_identifier "r"
+                      name: simple_identifier "circle"
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "r"
+        switch_entry
+          pattern:
+            switch_pattern
+              pattern:
+                pattern
+                  kind:
+                    case_pattern
+                      arguments:
+                        tuple_pattern
+                          item:
+                            tuple_pattern_item
+                              pattern:
+                                pattern
+                                  kind:
+                                    binding_pattern
+                                      binding:
+                                        value_binding_pattern
+                                          mutability: let
+                                      pattern:
+                                        pattern
+                                          bound_identifier: simple_identifier "s"
+                      name: simple_identifier "square"
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "s"
+      expr: simple_identifier "shape"
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus/swift/desugar.txt b/unified/extractor/tests/corpus/swift/desugar.txt
new file mode 100644
index 000000000000..9f9ffeb070a8
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/desugar.txt
@@ -0,0 +1,39 @@
+===
+Additive expression is desugared
+===
+
+1 + 2
+
+---
+
+source_file
+  statement:
+    additive_expression
+      lhs: integer_literal "1"
+      op: +
+      rhs: integer_literal "2"
+
+---
+
+top_level
+  body:
+
+===
+Another additive expression is desugared
+===
+
+foo + bar
+
+---
+
+source_file
+  statement:
+    additive_expression
+      lhs: simple_identifier "foo"
+      op: +
+      rhs: simple_identifier "bar"
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus/swift/functions.txt b/unified/extractor/tests/corpus/swift/functions.txt
new file mode 100644
index 000000000000..0a8210a4cf76
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/functions.txt
@@ -0,0 +1,389 @@
+===
+Function with no parameters
+===
+
+func greet() {
+  print("hello")
+}
+
+---
+
+source_file
+  statement:
+    function_declaration
+      body:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value:
+                            line_string_literal
+                              text: line_str_text "hello"
+      name: simple_identifier "greet"
+
+---
+
+top_level
+  body:
+
+===
+Function with parameters and return type
+===
+
+func add(_ a: Int, _ b: Int) -> Int {
+  return a + b
+}
+
+---
+
+source_file
+  statement:
+    function_declaration
+      body:
+        block
+          statement:
+            control_transfer_statement
+              kind: return
+              result:
+                additive_expression
+                  lhs: simple_identifier "a"
+                  op: +
+                  rhs: simple_identifier "b"
+      name: simple_identifier "add"
+      parameter:
+        function_parameter
+          parameter:
+            parameter
+              external_name: simple_identifier "_"
+              name: simple_identifier "a"
+              type:
+                type
+                  name:
+                    user_type
+                      part:
+                        simple_user_type
+                          name: type_identifier "Int"
+        function_parameter
+          parameter:
+            parameter
+              external_name: simple_identifier "_"
+              name: simple_identifier "b"
+              type:
+                type
+                  name:
+                    user_type
+                      part:
+                        simple_user_type
+                          name: type_identifier "Int"
+      return_type:
+        type
+          name:
+            user_type
+              part:
+                simple_user_type
+                  name: type_identifier "Int"
+
+---
+
+top_level
+  body:
+
+===
+Function with named parameters
+===
+
+func greet(person name: String) {
+  print(name)
+}
+
+---
+
+source_file
+  statement:
+    function_declaration
+      body:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "name"
+      name: simple_identifier "greet"
+      parameter:
+        function_parameter
+          parameter:
+            parameter
+              external_name: simple_identifier "person"
+              name: simple_identifier "name"
+              type:
+                type
+                  name:
+                    user_type
+                      part:
+                        simple_user_type
+                          name: type_identifier "String"
+
+---
+
+top_level
+  body:
+
+===
+Function with default parameter value
+===
+
+func greet(name: String = "world") {
+  print(name)
+}
+
+---
+
+source_file
+  statement:
+    function_declaration
+      body:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "name"
+      name: simple_identifier "greet"
+      parameter:
+        function_parameter
+          default_value:
+            line_string_literal
+              text: line_str_text "world"
+          parameter:
+            parameter
+              name: simple_identifier "name"
+              type:
+                type
+                  name:
+                    user_type
+                      part:
+                        simple_user_type
+                          name: type_identifier "String"
+
+---
+
+top_level
+  body:
+
+===
+Variadic function
+===
+
+func sum(_ values: Int...) -> Int {
+  return values.reduce(0, +)
+}
+
+---
+
+source_file
+  statement:
+    function_declaration
+      body:
+        block
+          statement:
+            control_transfer_statement
+              kind: return
+              result:
+                call_expression
+                  function:
+                    navigation_expression
+                      suffix:
+                        navigation_suffix
+                          suffix: simple_identifier "reduce"
+                      target: simple_identifier "values"
+                  suffix:
+                    call_suffix
+                      arguments:
+                        value_arguments
+                          argument:
+                            value_argument
+                              value: integer_literal "0"
+                            value_argument
+                              value:
+                                referenceable_operator
+                                  operator: +
+      name: simple_identifier "sum"
+      parameter:
+        function_parameter
+          parameter:
+            parameter
+              external_name: simple_identifier "_"
+              name: simple_identifier "values"
+              type:
+                type
+                  name:
+                    user_type
+                      part:
+                        simple_user_type
+                          name: type_identifier "Int"
+      return_type:
+        type
+          name:
+            user_type
+              part:
+                simple_user_type
+                  name: type_identifier "Int"
+
+---
+
+top_level
+  body:
+
+===
+Function call
+===
+
+foo(1, 2)
+
+---
+
+source_file
+  statement:
+    call_expression
+      function: simple_identifier "foo"
+      suffix:
+        call_suffix
+          arguments:
+            value_arguments
+              argument:
+                value_argument
+                  value: integer_literal "1"
+                value_argument
+                  value: integer_literal "2"
+
+---
+
+top_level
+  body:
+
+===
+Function call with labelled arguments
+===
+
+greet(person: "Bob")
+
+---
+
+source_file
+  statement:
+    call_expression
+      function: simple_identifier "greet"
+      suffix:
+        call_suffix
+          arguments:
+            value_arguments
+              argument:
+                value_argument
+                  name:
+                    value_argument_label
+                      name: simple_identifier "person"
+                  value:
+                    line_string_literal
+                      text: line_str_text "Bob"
+
+---
+
+top_level
+  body:
+
+===
+Method call
+===
+
+list.append(1)
+
+---
+
+source_file
+  statement:
+    call_expression
+      function:
+        navigation_expression
+          suffix:
+            navigation_suffix
+              suffix: simple_identifier "append"
+          target: simple_identifier "list"
+      suffix:
+        call_suffix
+          arguments:
+            value_arguments
+              argument:
+                value_argument
+                  value: integer_literal "1"
+
+---
+
+top_level
+  body:
+
+===
+Generic function
+===
+
+func identity<T>(_ x: T) -> T {
+  return x
+}
+
+---
+
+source_file
+  statement:
+    function_declaration
+      body:
+        block
+          statement:
+            control_transfer_statement
+              kind: return
+              result: simple_identifier "x"
+      name: simple_identifier "identity"
+      parameter:
+        function_parameter
+          parameter:
+            parameter
+              external_name: simple_identifier "_"
+              name: simple_identifier "x"
+              type:
+                type
+                  name:
+                    user_type
+                      part:
+                        simple_user_type
+                          name: type_identifier "T"
+      return_type:
+        type
+          name:
+            user_type
+              part:
+                simple_user_type
+                  name: type_identifier "T"
+      type_parameters:
+        type_parameters
+          parameter:
+            type_parameter
+              name: type_identifier "T"
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus/swift/literals.txt b/unified/extractor/tests/corpus/swift/literals.txt
new file mode 100644
index 000000000000..5044831a869b
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/literals.txt
@@ -0,0 +1,124 @@
+===
+Integer literal
+===
+
+42
+
+---
+
+source_file
+  statement: integer_literal "42"
+
+---
+
+top_level
+  body:
+
+===
+Negative integer literal
+===
+
+-7
+
+---
+
+source_file
+  statement:
+    prefix_expression
+      operation: -
+      target: integer_literal "7"
+
+---
+
+top_level
+  body:
+
+===
+Floating-point literal
+===
+
+3.14
+
+---
+
+source_file
+  statement: real_literal "3.14"
+
+---
+
+top_level
+  body:
+
+===
+Boolean literals
+===
+
+true
+false
+
+---
+
+source_file
+  statement:
+    boolean_literal
+    boolean_literal
+
+---
+
+top_level
+  body:
+
+===
+Nil literal
+===
+
+nil
+
+---
+
+source_file
+  statement: nil
+
+---
+
+top_level
+  body:
+
+===
+String literal
+===
+
+"hello"
+
+---
+
+source_file
+  statement:
+    line_string_literal
+      text: line_str_text "hello"
+
+---
+
+top_level
+  body:
+
+===
+String with interpolation
+===
+
+"hello \(name)"
+
+---
+
+source_file
+  statement:
+    line_string_literal
+      interpolation:
+        interpolated_expression
+          value: simple_identifier "name"
+      text: line_str_text "hello "
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus/swift/loops.txt b/unified/extractor/tests/corpus/swift/loops.txt
new file mode 100644
index 000000000000..8b9f3410d35d
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/loops.txt
@@ -0,0 +1,254 @@
+===
+For-in over array literal
+===
+
+for x in [1, 2, 3] {
+  print(x)
+}
+
+---
+
+source_file
+  statement:
+    for_statement
+      body:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "x"
+      collection:
+        array_literal
+          element:
+            integer_literal "1"
+            integer_literal "2"
+            integer_literal "3"
+      item:
+        pattern
+          bound_identifier: simple_identifier "x"
+
+---
+
+top_level
+  body:
+
+===
+For-in over range
+===
+
+for i in 0..<10 {
+  print(i)
+}
+
+---
+
+source_file
+  statement:
+    for_statement
+      body:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "i"
+      collection:
+        range_expression
+          end: integer_literal "10"
+          op: ..<
+          start: integer_literal "0"
+      item:
+        pattern
+          bound_identifier: simple_identifier "i"
+
+---
+
+top_level
+  body:
+
+===
+For-in with where clause
+===
+
+for x in xs where x > 0 {
+  print(x)
+}
+
+---
+
+source_file
+  statement:
+    for_statement
+      body:
+        block
+          statement:
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "x"
+      collection: simple_identifier "xs"
+      item:
+        pattern
+          bound_identifier: simple_identifier "x"
+      where:
+        where_clause
+          expr:
+            comparison_expression
+              lhs: simple_identifier "x"
+              op: >
+              rhs: integer_literal "0"
+          keyword: where_keyword "where"
+
+---
+
+top_level
+  body:
+
+===
+While loop
+===
+
+while x > 0 {
+  x -= 1
+}
+
+---
+
+source_file
+  statement:
+    while_statement
+      body:
+        block
+          statement:
+            assignment
+              operator: -=
+              result: integer_literal "1"
+              target:
+                directly_assignable_expression
+                  expr: simple_identifier "x"
+      condition:
+        if_condition
+          kind:
+            comparison_expression
+              lhs: simple_identifier "x"
+              op: >
+              rhs: integer_literal "0"
+
+---
+
+top_level
+  body:
+
+===
+Repeat-while loop
+===
+
+repeat {
+  x -= 1
+} while x > 0
+
+---
+
+source_file
+  statement:
+    repeat_while_statement
+      body:
+        block
+          statement:
+            assignment
+              operator: -=
+              result: integer_literal "1"
+              target:
+                directly_assignable_expression
+                  expr: simple_identifier "x"
+      condition:
+        if_condition
+          kind:
+            comparison_expression
+              lhs: simple_identifier "x"
+              op: >
+              rhs: integer_literal "0"
+
+---
+
+top_level
+  body:
+
+===
+Break and continue
+===
+
+for x in xs {
+  if x < 0 { continue }
+  if x > 100 { break }
+  print(x)
+}
+
+---
+
+source_file
+  statement:
+    for_statement
+      body:
+        block
+          statement:
+            if_statement
+              body:
+                block
+                  statement:
+                    control_transfer_statement
+                      kind: continue
+              condition:
+                if_condition
+                  kind:
+                    comparison_expression
+                      lhs: simple_identifier "x"
+                      op: <
+                      rhs: integer_literal "0"
+            if_statement
+              body:
+                block
+                  statement:
+                    control_transfer_statement
+                      kind: break
+              condition:
+                if_condition
+                  kind:
+                    comparison_expression
+                      lhs: simple_identifier "x"
+                      op: >
+                      rhs: integer_literal "100"
+            call_expression
+              function: simple_identifier "print"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: simple_identifier "x"
+      collection: simple_identifier "xs"
+      item:
+        pattern
+          bound_identifier: simple_identifier "x"
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus/swift/operators.txt b/unified/extractor/tests/corpus/swift/operators.txt
new file mode 100644
index 000000000000..f1a4a5fcdb26
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/operators.txt
@@ -0,0 +1,250 @@
+===
+Addition
+===
+
+a + b
+
+---
+
+source_file
+  statement:
+    additive_expression
+      lhs: simple_identifier "a"
+      op: +
+      rhs: simple_identifier "b"
+
+---
+
+top_level
+  body:
+
+===
+Subtraction
+===
+
+a - b
+
+---
+
+source_file
+  statement:
+    additive_expression
+      lhs: simple_identifier "a"
+      op: -
+      rhs: simple_identifier "b"
+
+---
+
+top_level
+  body:
+
+===
+Multiplication
+===
+
+a * b
+
+---
+
+source_file
+  statement:
+    multiplicative_expression
+      lhs: simple_identifier "a"
+      op: *
+      rhs: simple_identifier "b"
+
+---
+
+top_level
+  body:
+
+===
+Division
+===
+
+a / b
+
+---
+
+source_file
+  statement:
+    multiplicative_expression
+      lhs: simple_identifier "a"
+      op: /
+      rhs: simple_identifier "b"
+
+---
+
+top_level
+  body:
+
+===
+Operator precedence: addition and multiplication
+===
+
+a + b * c
+
+---
+
+source_file
+  statement:
+    additive_expression
+      lhs: simple_identifier "a"
+      op: +
+      rhs:
+        multiplicative_expression
+          lhs: simple_identifier "b"
+          op: *
+          rhs: simple_identifier "c"
+
+---
+
+top_level
+  body:
+
+===
+Parenthesised expression
+===
+
+(a + b) * c
+
+---
+
+source_file
+  statement:
+    multiplicative_expression
+      lhs:
+        tuple_expression
+          element:
+            tuple_expression_item
+              value:
+                additive_expression
+                  lhs: simple_identifier "a"
+                  op: +
+                  rhs: simple_identifier "b"
+      op: *
+      rhs: simple_identifier "c"
+
+---
+
+top_level
+  body:
+
+===
+Comparison
+===
+
+a < b
+
+---
+
+source_file
+  statement:
+    comparison_expression
+      lhs: simple_identifier "a"
+      op: <
+      rhs: simple_identifier "b"
+
+---
+
+top_level
+  body:
+
+===
+Equality
+===
+
+a == b
+
+---
+
+source_file
+  statement:
+    equality_expression
+      lhs: simple_identifier "a"
+      op: ==
+      rhs: simple_identifier "b"
+
+---
+
+top_level
+  body:
+
+===
+Logical and
+===
+
+a && b
+
+---
+
+source_file
+  statement:
+    conjunction_expression
+      lhs: simple_identifier "a"
+      op: &&
+      rhs: simple_identifier "b"
+
+---
+
+top_level
+  body:
+
+===
+Logical or
+===
+
+a || b
+
+---
+
+source_file
+  statement:
+    disjunction_expression
+      lhs: simple_identifier "a"
+      op: ||
+      rhs: simple_identifier "b"
+
+---
+
+top_level
+  body:
+
+===
+Logical not
+===
+
+!a
+
+---
+
+source_file
+  statement:
+    prefix_expression
+      operation: bang "!"
+      target: simple_identifier "a"
+
+---
+
+top_level
+  body:
+
+===
+Range operator
+===
+
+1...10
+
+---
+
+source_file
+  statement:
+    range_expression
+      end: integer_literal "10"
+      op: ...
+      start: integer_literal "1"
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors.txt b/unified/extractor/tests/corpus/swift/optionals-and-errors.txt
new file mode 100644
index 000000000000..572e9181a681
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors.txt
@@ -0,0 +1,290 @@
+===
+Optional type annotation
+===
+
+let x: Int? = nil
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "x"
+          type:
+            type_annotation
+              type:
+                type
+                  name:
+                    optional_type
+                      wrapped:
+                        user_type
+                          part:
+                            simple_user_type
+                              name: type_identifier "Int"
+          value: nil
+
+---
+
+top_level
+  body:
+
+===
+Optional chaining
+===
+
+let n = obj?.foo?.bar
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "n"
+          value:
+            navigation_expression
+              suffix:
+                navigation_suffix
+                  suffix: simple_identifier "bar"
+              target:
+                optional_chain_marker
+                  expr:
+                    navigation_expression
+                      suffix:
+                        navigation_suffix
+                          suffix: simple_identifier "foo"
+                      target:
+                        optional_chain_marker
+                          expr: simple_identifier "obj"
+
+---
+
+top_level
+  body:
+
+===
+Force unwrap
+===
+
+let n = opt!
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "n"
+          value:
+            postfix_expression
+              operation: bang "!"
+              target: simple_identifier "opt"
+
+---
+
+top_level
+  body:
+
+===
+Nil-coalescing
+===
+
+let n = opt ?? 0
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "n"
+          value:
+            nil_coalescing_expression
+              if_nil: integer_literal "0"
+              value: simple_identifier "opt"
+
+---
+
+top_level
+  body:
+
+===
+Throwing function
+===
+
+func read() throws -> String {
+  return ""
+}
+
+---
+
+source_file
+  statement:
+    function_declaration
+      body:
+        block
+          statement:
+            control_transfer_statement
+              kind: return
+              result:
+                line_string_literal
+      name: simple_identifier "read"
+      return_type:
+        type
+          name:
+            user_type
+              part:
+                simple_user_type
+                  name: type_identifier "String"
+      throws: throws "throws"
+
+---
+
+top_level
+  body:
+
+===
+Do-catch
+===
+
+do {
+  try foo()
+} catch {
+  print(error)
+}
+
+---
+
+source_file
+  statement:
+    do_statement
+      body:
+        block
+          statement:
+            try_expression
+              expr:
+                call_expression
+                  function: simple_identifier "foo"
+                  suffix:
+                    call_suffix
+                      arguments:
+                        value_arguments
+              operator:
+                try_operator
+      catch:
+        catch_block
+          body:
+            block
+              statement:
+                call_expression
+                  function: simple_identifier "print"
+                  suffix:
+                    call_suffix
+                      arguments:
+                        value_arguments
+                          argument:
+                            value_argument
+                              value: simple_identifier "error"
+          keyword: catch_keyword "catch"
+
+---
+
+top_level
+  body:
+
+===
+Try? expression
+===
+
+let result = try? foo()
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "result"
+          value:
+            try_expression
+              expr:
+                call_expression
+                  function: simple_identifier "foo"
+                  suffix:
+                    call_suffix
+                      arguments:
+                        value_arguments
+              operator:
+                try_operator
+
+---
+
+top_level
+  body:
+
+===
+Try! expression
+===
+
+let result = try! foo()
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "result"
+          value:
+            try_expression
+              expr:
+                call_expression
+                  function: simple_identifier "foo"
+                  suffix:
+                    call_suffix
+                      arguments:
+                        value_arguments
+              operator:
+                try_operator
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus/swift/types.txt b/unified/extractor/tests/corpus/swift/types.txt
new file mode 100644
index 000000000000..0bebaa1238f3
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types.txt
@@ -0,0 +1,641 @@
+===
+Empty class
+===
+
+class Foo {}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        class_body
+      declaration_kind: class
+      name: type_identifier "Foo"
+
+---
+
+top_level
+  body:
+
+===
+Class with stored properties
+===
+
+class Point {
+  var x: Int
+  var y: Int
+}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        class_body
+          member:
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: var
+              declarator:
+                property_binding
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "x"
+                  type:
+                    type_annotation
+                      type:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Int"
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: var
+              declarator:
+                property_binding
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "y"
+                  type:
+                    type_annotation
+                      type:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Int"
+      declaration_kind: class
+      name: type_identifier "Point"
+
+---
+
+top_level
+  body:
+
+===
+Class with initializer
+===
+
+class Point {
+  var x: Int
+  init(x: Int) {
+    self.x = x
+  }
+}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        class_body
+          member:
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: var
+              declarator:
+                property_binding
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "x"
+                  type:
+                    type_annotation
+                      type:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Int"
+            init_declaration
+              body:
+                block
+                  statement:
+                    assignment
+                      operator: =
+                      result: simple_identifier "x"
+                      target:
+                        directly_assignable_expression
+                          expr:
+                            navigation_expression
+                              suffix:
+                                navigation_suffix
+                                  suffix: simple_identifier "x"
+                              target:
+                                self_expression
+              parameter:
+                function_parameter
+                  parameter:
+                    parameter
+                      name: simple_identifier "x"
+                      type:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Int"
+      declaration_kind: class
+      name: type_identifier "Point"
+
+---
+
+top_level
+  body:
+
+===
+Class with method
+===
+
+class Counter {
+  var n = 0
+  func bump() {
+    n += 1
+  }
+}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        class_body
+          member:
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: var
+              declarator:
+                property_binding
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "n"
+                  value: integer_literal "0"
+            function_declaration
+              body:
+                block
+                  statement:
+                    assignment
+                      operator: +=
+                      result: integer_literal "1"
+                      target:
+                        directly_assignable_expression
+                          expr: simple_identifier "n"
+              name: simple_identifier "bump"
+      declaration_kind: class
+      name: type_identifier "Counter"
+
+---
+
+top_level
+  body:
+
+===
+Class inheritance
+===
+
+class Dog: Animal {}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        class_body
+      declaration_kind: class
+      inherits:
+        inheritance_specifier
+          inherits_from:
+            user_type
+              part:
+                simple_user_type
+                  name: type_identifier "Animal"
+      name: type_identifier "Dog"
+
+---
+
+top_level
+  body:
+
+===
+Struct
+===
+
+struct Point {
+  let x: Int
+  let y: Int
+}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        class_body
+          member:
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: let
+              declarator:
+                property_binding
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "x"
+                  type:
+                    type_annotation
+                      type:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Int"
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: let
+              declarator:
+                property_binding
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "y"
+                  type:
+                    type_annotation
+                      type:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Int"
+      declaration_kind: struct
+      name: type_identifier "Point"
+
+---
+
+top_level
+  body:
+
+===
+Enum with cases
+===
+
+enum Direction {
+  case north
+  case south
+  case east
+  case west
+}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        enum_class_body
+          member:
+            enum_entry
+              case:
+                enum_case_entry
+                  name: simple_identifier "north"
+            enum_entry
+              case:
+                enum_case_entry
+                  name: simple_identifier "south"
+            enum_entry
+              case:
+                enum_case_entry
+                  name: simple_identifier "east"
+            enum_entry
+              case:
+                enum_case_entry
+                  name: simple_identifier "west"
+      declaration_kind: enum
+      name: type_identifier "Direction"
+
+---
+
+top_level
+  body:
+
+===
+Enum with associated values
+===
+
+enum Shape {
+  case circle(radius: Double)
+  case square(side: Double)
+}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        enum_class_body
+          member:
+            enum_entry
+              case:
+                enum_case_entry
+                  data_contents:
+                    enum_type_parameters
+                      parameter:
+                        enum_type_parameter
+                          name: simple_identifier "radius"
+                          type:
+                            type
+                              name:
+                                user_type
+                                  part:
+                                    simple_user_type
+                                      name: type_identifier "Double"
+                  name: simple_identifier "circle"
+            enum_entry
+              case:
+                enum_case_entry
+                  data_contents:
+                    enum_type_parameters
+                      parameter:
+                        enum_type_parameter
+                          name: simple_identifier "side"
+                          type:
+                            type
+                              name:
+                                user_type
+                                  part:
+                                    simple_user_type
+                                      name: type_identifier "Double"
+                  name: simple_identifier "square"
+      declaration_kind: enum
+      name: type_identifier "Shape"
+
+---
+
+top_level
+  body:
+
+===
+Protocol declaration
+===
+
+protocol Drawable {
+  func draw()
+}
+
+---
+
+source_file
+  statement:
+    protocol_declaration
+      body:
+        protocol_body
+          member:
+            protocol_function_declaration
+              name: simple_identifier "draw"
+      name: type_identifier "Drawable"
+
+---
+
+top_level
+  body:
+
+===
+Extension
+===
+
+extension Int {
+  func squared() -> Int { return self * self }
+}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        class_body
+          member:
+            function_declaration
+              body:
+                block
+                  statement:
+                    control_transfer_statement
+                      kind: return
+                      result:
+                        multiplicative_expression
+                          lhs:
+                            self_expression
+                          op: *
+                          rhs:
+                            self_expression
+              name: simple_identifier "squared"
+              return_type:
+                type
+                  name:
+                    user_type
+                      part:
+                        simple_user_type
+                          name: type_identifier "Int"
+      declaration_kind: extension
+      name:
+        user_type
+          part:
+            simple_user_type
+              name: type_identifier "Int"
+
+---
+
+top_level
+  body:
+
+===
+Computed property
+===
+
+class Rect {
+  var w: Double
+  var h: Double
+  var area: Double {
+    return w * h
+  }
+}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        class_body
+          member:
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: var
+              declarator:
+                property_binding
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "w"
+                  type:
+                    type_annotation
+                      type:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Double"
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: var
+              declarator:
+                property_binding
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "h"
+                  type:
+                    type_annotation
+                      type:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Double"
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: var
+              declarator:
+                property_binding
+                  computed_value:
+                    computed_property
+                      statement:
+                        control_transfer_statement
+                          kind: return
+                          result:
+                            multiplicative_expression
+                              lhs: simple_identifier "w"
+                              op: *
+                              rhs: simple_identifier "h"
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "area"
+                  type:
+                    type_annotation
+                      type:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Double"
+      declaration_kind: class
+      name: type_identifier "Rect"
+
+---
+
+top_level
+  body:
+
+===
+Property with getter and setter
+===
+
+class Box {
+  private var _v = 0
+  var v: Int {
+    get { return _v }
+    set { _v = newValue }
+  }
+}
+
+---
+
+source_file
+  statement:
+    class_declaration
+      body:
+        class_body
+          member:
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: var
+              declarator:
+                property_binding
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "_v"
+                  value: integer_literal "0"
+              modifiers:
+                modifiers
+                  modifier:
+                    visibility_modifier
+            property_declaration
+              binding:
+                value_binding_pattern
+                  mutability: var
+              declarator:
+                property_binding
+                  computed_value:
+                    computed_property
+                      accessor:
+                        computed_getter
+                          body:
+                            block
+                              statement:
+                                control_transfer_statement
+                                  kind: return
+                                  result: simple_identifier "_v"
+                          specifier:
+                            getter_specifier
+                        computed_setter
+                          body:
+                            block
+                              statement:
+                                assignment
+                                  operator: =
+                                  result: simple_identifier "newValue"
+                                  target:
+                                    directly_assignable_expression
+                                      expr: simple_identifier "_v"
+                          specifier:
+                            setter_specifier
+                  name:
+                    pattern
+                      bound_identifier: simple_identifier "v"
+                  type:
+                    type_annotation
+                      type:
+                        type
+                          name:
+                            user_type
+                              part:
+                                simple_user_type
+                                  name: type_identifier "Int"
+      declaration_kind: class
+      name: type_identifier "Box"
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus/swift/variables.txt b/unified/extractor/tests/corpus/swift/variables.txt
new file mode 100644
index 000000000000..1911ddd02b1e
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/variables.txt
@@ -0,0 +1,231 @@
+===
+Let binding
+===
+
+let x = 1
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "x"
+          value: integer_literal "1"
+
+---
+
+top_level
+  body:
+
+===
+Var binding
+===
+
+var x = 1
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: var
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "x"
+          value: integer_literal "1"
+
+---
+
+top_level
+  body:
+
+===
+Let with type annotation
+===
+
+let x: Int = 1
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "x"
+          type:
+            type_annotation
+              type:
+                type
+                  name:
+                    user_type
+                      part:
+                        simple_user_type
+                          name: type_identifier "Int"
+          value: integer_literal "1"
+
+---
+
+top_level
+  body:
+
+===
+Var without initialiser
+===
+
+var x: Int
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: var
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "x"
+          type:
+            type_annotation
+              type:
+                type
+                  name:
+                    user_type
+                      part:
+                        simple_user_type
+                          name: type_identifier "Int"
+
+---
+
+top_level
+  body:
+
+===
+Tuple destructuring binding
+===
+
+let (a, b) = pair
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              kind:
+                tuple_pattern
+                  item:
+                    tuple_pattern_item
+                      pattern:
+                        pattern
+                          kind: simple_identifier "a"
+                    tuple_pattern_item
+                      pattern:
+                        pattern
+                          kind: simple_identifier "b"
+          value: simple_identifier "pair"
+
+---
+
+top_level
+  body:
+
+===
+Multiple bindings on one line
+===
+
+let x = 1, y = 2
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "x"
+          value: integer_literal "1"
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "y"
+          value: integer_literal "2"
+
+---
+
+top_level
+  body:
+
+===
+Assignment
+===
+
+x = 1
+
+---
+
+source_file
+  statement:
+    assignment
+      operator: =
+      result: integer_literal "1"
+      target:
+        directly_assignable_expression
+          expr: simple_identifier "x"
+
+---
+
+top_level
+  body:
+
+===
+Compound assignment
+===
+
+x += 1
+
+---
+
+source_file
+  statement:
+    assignment
+      operator: +=
+      result: integer_literal "1"
+      target:
+        directly_assignable_expression
+          expr: simple_identifier "x"
+
+---
+
+top_level
+  body:
diff --git a/unified/extractor/tests/corpus_tests.rs b/unified/extractor/tests/corpus_tests.rs
new file mode 100644
index 000000000000..ac93dd586ec1
--- /dev/null
+++ b/unified/extractor/tests/corpus_tests.rs
@@ -0,0 +1,283 @@
+use std::fs;
+use std::path::Path;
+
+use codeql_extractor::extractor::simple;
+use yeast::{dump::dump_ast, dump::dump_ast_with_type_errors, Runner};
+
+#[path = "../src/languages/mod.rs"]
+mod languages;
+
+#[derive(Debug)]
+struct CorpusCase {
+    name: String,
+    input: String,
+    raw: String,
+    expected: String,
+}
+
+fn update_mode_enabled() -> bool {
+    std::env::var("UNIFIED_UPDATE_CORPUS")
+        .map(|v| matches!(v.to_ascii_lowercase().as_str(), "1" | "true" | "yes" | "on"))
+        .unwrap_or(false)
+}
+
+fn is_header_rule(line: &str) -> bool {
+    let trimmed = line.trim();
+    trimmed.len() >= 3 && trimmed.chars().all(|c| c == '=')
+}
+
+fn parse_corpus(content: &str) -> Vec<CorpusCase> {
+    let lines: Vec<&str> = content.lines().collect();
+    let mut i = 0;
+    let mut cases = Vec::new();
+
+    while i < lines.len() {
+        while i < lines.len() && lines[i].trim().is_empty() {
+            i += 1;
+        }
+        if i >= lines.len() {
+            break;
+        }
+
+        assert!(
+            is_header_rule(lines[i]),
+            "Expected header delimiter at line {}",
+            i + 1
+        );
+        i += 1;
+
+        assert!(i < lines.len(), "Missing test name at line {}", i + 1);
+        let name = lines[i].trim().to_string();
+        i += 1;
+
+        assert!(
+            i < lines.len() && is_header_rule(lines[i]),
+            "Missing closing header delimiter for case {name}"
+        );
+        i += 1;
+
+        let input_start = i;
+        while i < lines.len() && lines[i].trim() != "---" {
+            i += 1;
+        }
+        assert!(i < lines.len(), "Missing --- separator for case {name}");
+        let input = lines[input_start..i].join("\n").trim_end().to_string();
+        i += 1;
+
+        // Raw tree-sitter parse section. New-format files have a second
+        // `---` separator between the raw tree and the mapped AST. Legacy
+        // files (with only one separator) have no raw section — in that
+        // case `raw` stays empty and update mode will populate it.
+        let raw_start = i;
+        let mut next_sep = i;
+        while next_sep < lines.len() && lines[next_sep].trim() != "---" {
+            if is_header_rule(lines[next_sep])
+                && next_sep + 2 < lines.len()
+                && !lines[next_sep + 1].trim().is_empty()
+                && is_header_rule(lines[next_sep + 2])
+            {
+                break;
+            }
+            next_sep += 1;
+        }
+        let raw = if next_sep < lines.len() && lines[next_sep].trim() == "---" {
+            let raw_text = lines[raw_start..next_sep].join("\n").trim().to_string();
+            i = next_sep + 1;
+            raw_text
+        } else {
+            String::new()
+        };
+
+        let expected_start = i;
+        while i < lines.len() {
+            if is_header_rule(lines[i])
+                && i + 2 < lines.len()
+                && !lines[i + 1].trim().is_empty()
+                && is_header_rule(lines[i + 2])
+            {
+                break;
+            }
+            i += 1;
+        }
+        let expected = lines[expected_start..i].join("\n").trim().to_string();
+
+        cases.push(CorpusCase {
+            name,
+            input,
+            raw,
+            expected,
+        });
+    }
+
+    cases
+}
+
+fn render_corpus(cases: &[CorpusCase]) -> String {
+    let mut out = String::new();
+
+    for (idx, case) in cases.iter().enumerate() {
+        if idx > 0 {
+            // Blank line between cases.
+            out.push('\n');
+        }
+        out.push_str("===\n");
+        out.push_str(case.name.trim());
+        out.push_str("\n===\n\n");
+        out.push_str(case.input.trim());
+        out.push_str("\n\n---\n\n");
+        out.push_str(case.raw.trim());
+        out.push_str("\n\n---\n\n");
+        out.push_str(case.expected.trim());
+        // Single trailing newline per case; the inter-case blank line is
+        // added by the prefix above, and the file ends with exactly one `\n`.
+        out.push('\n');
+    }
+
+    out
+}
+
+fn run_desugaring(
+    lang: &simple::LanguageSpec,
+    input: &str,
+) -> Result<yeast::Ast, String> {
+    let runner = match lang.desugar.as_ref() {
+        Some(config) => Runner::from_config(lang.ts_language.clone(), config)
+            .map_err(|e| format!("Failed to create yeast runner: {e}"))?,
+        None => Runner::new(lang.ts_language.clone(), &[]),
+    };
+
+    runner
+        .run(input)
+        .map_err(|e| format!("Failed to parse input: {e}"))
+}
+
+/// Produce the raw tree-sitter parse tree dump for `input`, with no
+/// desugaring rules applied. Uses a `Runner` with an empty phase list and
+/// the input grammar's own schema.
+fn dump_raw_parse(
+    lang: &simple::LanguageSpec,
+    input: &str,
+) -> Result<String, String> {
+    let runner = Runner::new(lang.ts_language.clone(), &[]);
+    let ast = runner
+        .run(input)
+        .map_err(|e| format!("Failed to parse input: {e}"))?;
+    Ok(dump_ast(&ast, ast.get_root(), input))
+}
+
+#[test]
+fn test_corpus() {
+    let update_mode = update_mode_enabled();
+    let all_languages = languages::all_language_specs();
+    let corpus_dir = Path::new("tests/corpus");
+
+    for lang in all_languages {
+        let output_schema = yeast::node_types_yaml::schema_from_yaml_with_language(
+            languages::OUTPUT_AST_SCHEMA,
+            &lang.ts_language,
+        )
+        .expect("Failed to parse OUTPUT_AST_SCHEMA YAML");
+
+        let lang_corpus_dir = corpus_dir.join(&lang.prefix);
+        if !lang_corpus_dir.exists() {
+            continue;
+        }
+
+        let mut corpus_files: Vec<_> = fs::read_dir(&lang_corpus_dir)
+            .unwrap_or_else(|e| {
+                panic!(
+                    "Failed to read corpus directory {}: {e}",
+                    lang_corpus_dir.display()
+                )
+            })
+            .map(|entry| entry.expect("Failed to read corpus entry").path())
+            .filter(|path| path.extension().is_some_and(|ext| ext == "txt"))
+            .collect();
+        corpus_files.sort();
+
+        for corpus_path in corpus_files {
+            let content = fs::read_to_string(&corpus_path)
+                .unwrap_or_else(|e| panic!("Failed to read {}: {e}", corpus_path.display()));
+            let mut cases = parse_corpus(&content);
+            let mut failures = Vec::new();
+            assert!(
+                !cases.is_empty(),
+                "No corpus cases found in {}",
+                corpus_path.display()
+            );
+
+            for case in &mut cases {
+                match dump_raw_parse(&lang, &case.input) {
+                    Err(e) => {
+                        failures.push(format!(
+                            "Raw parse failed for {} in {}: {}",
+                            case.name,
+                            corpus_path.display(),
+                            e
+                        ));
+                    }
+                    Ok(actual_raw) => {
+                        if update_mode {
+                            case.raw = actual_raw.trim().to_string();
+                        } else if case.raw.trim() != actual_raw.trim() {
+                            failures.push(format!(
+                                "Raw parse mismatch in {}: \"{}\"\nEXPECTED:\n\n{}\n\nACTUAL:\n\n{}",
+                                corpus_path.display(),
+                                case.name,
+                                case.raw.trim(),
+                                actual_raw.trim()
+                            ));
+                        }
+                    }
+                }
+
+                match run_desugaring(&lang, &case.input) {
+                    Err(e) => {
+                        failures.push(format!(
+                            "Desugaring failed for {} in {}: {}",
+                            case.name,
+                            corpus_path.display(),
+                            e
+                        ));
+                    }
+                    Ok(actual) => {
+                        let actual_dump = dump_ast_with_type_errors(
+                            &actual,
+                            actual.get_root(),
+                            &case.input,
+                            &output_schema,
+                        );
+                        if update_mode {
+                            case.expected = actual_dump.trim().to_string();
+                        } else if case.expected.trim() != actual_dump.trim() {
+                            failures.push(format!(
+                                "Test failed in {}: \"{}\"\nEXPECTED:\n\n{}\n\nACTUAL:\n\n{}",
+                                corpus_path.display(),
+                                case.name,
+                                case.expected.trim(),
+                                actual_dump.trim()
+                            ));
+                        }
+                    }
+                }
+            }
+
+            assert!(
+                failures.is_empty(),
+                "{}",
+                failures.join("\n\n") + "\n\n"
+            );
+
+            if update_mode {
+                let updated = render_corpus(&cases);
+                let write_result = fs::write(&corpus_path, updated);
+                assert!(
+                    write_result.is_ok(),
+                    "Failed to update corpus file {}: {}",
+                    corpus_path.display(),
+                    write_result.err().map_or_else(String::new, |e| e.to_string())
+                );
+            }
+        }
+    }
+}
diff --git a/unified/extractor/tree-sitter-swift/grammar.js b/unified/extractor/tree-sitter-swift/grammar.js
index 5dbfd7fdbbf2..1e63a7eaabb8 100644
--- a/unified/extractor/tree-sitter-swift/grammar.js
+++ b/unified/extractor/tree-sitter-swift/grammar.js
@@ -97,7 +97,7 @@ module.exports = grammar({
     [$.attribute],
     [$._attribute_argument],
     // Is `foo { ... }` a constructor invocation or function invocation?
-    [$._simple_user_type, $.expression],
+    [$.simple_user_type, $.expression],
     // To support nested types A.B not being interpreted as `(navigation_expression ... (type_identifier)) (navigation_suffix)`
     [$.user_type],
     // How to tell the difference between Foo.bar(with:and:), and Foo.bar(with: smth, and: other)? You need GLR
@@ -105,8 +105,8 @@ module.exports = grammar({
     // { (foo, bar) ...
     [$.expression, $.lambda_parameter],
     [$._primary_expression, $.lambda_parameter],
-    // (start: start, end: end)
-    [$._tuple_type_item_identifier, $.tuple_expression],
+    // (foo) where foo could be a binding pattern or a tuple expression item.
+    [$._binding_pattern_with_expr, $.tuple_expression_item],
     // After a `{` in a function or switch context, it's ambigous whether we're starting a set of local statements or
     // applying some modifiers to a capture or pattern.
     [$.modifiers],
@@ -116,7 +116,7 @@ module.exports = grammar({
     [$.referenceable_operator, $._prefix_unary_operator],
     // `{ [self, b, c] ...` could be a capture list or an array literal depending on what else happens.
     [$.capture_list_item, $.expression],
-    [$.capture_list_item, $.expression, $._simple_user_type],
+    [$.capture_list_item, $.expression, $.simple_user_type],
     [$._primary_expression, $.capture_list_item],
     // a ? b : c () could be calling c(), or it could be calling a function that's produced by the result of
     // `(a ? b : c)`. We have a small hack to force it to be the former of these by intentionally introducing a
@@ -146,7 +146,7 @@ module.exports = grammar({
     [$._bodyless_function_declaration, $.property_modifier],
     [$.init_declaration, $.property_modifier],
     // Patterns, man
-    [$._navigable_type_expression, $._case_pattern],
+    [$._navigable_type_expression, $.case_pattern],
     [$._no_expr_pattern_already_bound, $._binding_pattern_no_expr],
 
     // On encountering a closure starting with `{ @Foo ...`, we don't yet know if that attribute applies to the closure
@@ -194,7 +194,7 @@ module.exports = grammar({
     // `/*`, and decrement it whenever we see `*/`. A standard grammar would only be able to exit the comment at the
     // first `*/` (like C does). Similarly, when you start a string with `##"`, you're required to include the same
     // number of `#` symbols to end it.
-    $.multiline_comment,
+    $._multiline_comment,
     $.raw_str_part,
     $.raw_str_continuing_indicator,
     $.raw_str_end_part,
@@ -255,11 +255,11 @@ module.exports = grammar({
     ////////////////////////////////
     source_file: ($) =>
       seq(
-        optional($.shebang_line),
+        optional(field("shebang", $.shebang_line)),
         optional(
           seq(
-            $._top_level_statement,
-            repeat(seq($._semi, $._top_level_statement)),
+            field("statement", $._top_level_statement),
+            repeat(seq($._semi, field("statement", $._top_level_statement))),
             optional($._semi)
           )
         )
@@ -270,6 +270,11 @@ module.exports = grammar({
     // Lexical Structure - https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html
     ////////////////////////////////
     comment: ($) => token(prec(PRECS.comment, seq("//", /.*/))),
+    // Named wrapper for the unnamed `_multiline_comment` external token, so
+    // that multi-line comments still appear in the AST (e.g. as extras between
+    // top-level statements) without being extracted as class body members when
+    // used only to separate those members.
+    multiline_comment: ($) => $._multiline_comment,
     // Identifiers
     simple_identifier: ($) =>
       choice(
@@ -291,7 +296,7 @@ module.exports = grammar({
         "package",
         $._parameter_ownership_modifier
       ),
-    identifier: ($) => sep1($.simple_identifier, $._dot),
+    identifier: ($) => sep1(field("part", $.simple_identifier), $._dot),
     // Literals
     _basic_literal: ($) =>
       choice(
@@ -355,13 +360,13 @@ module.exports = grammar({
           seq(
             field("text", $.raw_str_part),
             field("interpolation", $.raw_str_interpolation),
-            optional($.raw_str_continuing_indicator)
+            field("continuing", optional($.raw_str_continuing_indicator))
           )
         ),
         field("text", $.raw_str_end_part)
       ),
     raw_str_interpolation: ($) =>
-      seq($.raw_str_interpolation_start, $._interpolation_contents, ")"),
+      seq(field("start", $.raw_str_interpolation_start), $._interpolation_contents, ")"),
     raw_str_interpolation_start: ($) => /\\#*\(/,
     _multi_line_string_content: ($) =>
       choice($.multi_line_str_text, $.str_escaped_char, '"'),
@@ -410,7 +415,7 @@ module.exports = grammar({
     _possibly_implicitly_unwrapped_type: ($) =>
       choice($.type, $.implicitly_unwrapped_type),
     implicitly_unwrapped_type: ($) =>
-      seq($.type, token.immediate("!")),
+      seq(field("name", $.type), token.immediate("!")),
     type: ($) =>
       prec.right(
         PRECS.ty,
@@ -436,13 +441,13 @@ module.exports = grammar({
         )
       ),
     // The grammar just calls this whole thing a `type-identifier` but that's a bit confusing.
-    user_type: ($) => sep1($._simple_user_type, $._dot),
-    _simple_user_type: ($) =>
+    user_type: ($) => sep1(field("part", $.simple_user_type), $._dot),
+    simple_user_type: ($) =>
       prec.right(
         PRECS.ty,
         seq(
-          alias($.simple_identifier, $.type_identifier),
-          optional($.type_arguments)
+          field("name", alias($.simple_identifier, $.type_identifier)),
+          field("arguments", optional($.type_arguments))
         )
       ),
     tuple_type: ($) =>
@@ -452,14 +457,14 @@ module.exports = grammar({
           optional(sep1Opt(field("element", $.tuple_type_item), ",")),
           ")"
         ),
-        alias($._parenthesized_type, $.tuple_type_item)
+        field("element", alias($.parenthesized_type, $.tuple_type_item))
       ),
     tuple_type_item: ($) =>
       prec(
         PRECS.expr,
         seq(
           optional($._tuple_type_item_identifier),
-          optional($.parameter_modifiers),
+          field("modifiers", optional($.parameter_modifiers)),
           field("type", $.type)
         )
       ),
@@ -467,7 +472,7 @@ module.exports = grammar({
       prec(
         PRECS.expr,
         seq(
-          optional($.wildcard_pattern),
+          optional(field("external_name", $.wildcard_pattern)),
           field("name", $.simple_identifier),
           ":"
         )
@@ -475,8 +480,8 @@ module.exports = grammar({
     function_type: ($) =>
       seq(
         field("params", choice($.tuple_type, $.unannotated_type)),
-        optional($._async_keyword),
-        optional(choice($.throws_clause, $.throws)),
+        field("async", optional($._async_keyword)),
+        field("throws", optional(choice($.throws_clause, $.throws))),
         $._arrow_operator,
         field("return_type", $.type)
       ),
@@ -493,18 +498,18 @@ module.exports = grammar({
           repeat1(alias($._immediate_quest, "?"))
         )
       ),
-    metatype: ($) => seq($.unannotated_type, ".", choice("Type", "Protocol")),
+    metatype: ($) => seq(field("name", $.unannotated_type), ".", choice("Type", "Protocol")),
     _quest: ($) => "?",
     _immediate_quest: ($) => token.immediate("?"),
-    opaque_type: ($) => prec.right(seq("some", $.unannotated_type)),
-    existential_type: ($) => prec.right(seq("any", $.unannotated_type)),
-    type_parameter_pack: ($) => prec.left(seq("each", $.unannotated_type)),
-    type_pack_expansion: ($) => prec.left(seq("repeat", $.unannotated_type)),
+    opaque_type: ($) => prec.right(seq("some", field("name", $.unannotated_type))),
+    existential_type: ($) => prec.right(seq("any", field("name", $.unannotated_type))),
+    type_parameter_pack: ($) => prec.left(seq("each", field("name", $.unannotated_type))),
+    type_pack_expansion: ($) => prec.left(seq("repeat", field("name", $.unannotated_type))),
     protocol_composition_type: ($) =>
       prec.left(
         seq(
-          $.unannotated_type,
-          repeat1(seq("&", prec.right($.unannotated_type)))
+          field("type", $.unannotated_type),
+          repeat1(seq("&", prec.right(field("type", $.unannotated_type))))
         )
       ),
     suppressed_constraint: ($) =>
@@ -535,7 +540,7 @@ module.exports = grammar({
         )
       ),
     optional_chain_marker: ($) =>
-      seq($.expression, alias($._immediate_quest, "?")),
+      seq(field("expr", $.expression), alias($._immediate_quest, "?")),
     // Unary expressions
     _unary_expression: ($) =>
       choice(
@@ -568,13 +573,13 @@ module.exports = grammar({
             "constructed_type",
             choice($.array_type, $.dictionary_type, $.user_type)
           ),
-          $.constructor_suffix
+          field("suffix", $.constructor_suffix)
         )
       ),
-    _parenthesized_type: ($) =>
+    parenthesized_type: ($) =>
       seq(
         "(",
-        choice($.opaque_type, $.existential_type, $.dictionary_type),
+        field("type", choice($.opaque_type, $.existential_type, $.dictionary_type)),
         ")"
       ),
     navigation_expression: ($) =>
@@ -586,7 +591,7 @@ module.exports = grammar({
             choice(
               $._navigable_type_expression,
               $.expression,
-              $._parenthesized_type
+              $.parenthesized_type
             )
           ),
           field("suffix", $.navigation_suffix)
@@ -626,7 +631,7 @@ module.exports = grammar({
     as_expression: ($) =>
       prec.left(
         PRECS.as,
-        seq(field("expr", $.expression), $.as_operator, field("type", $.type))
+        seq(field("expr", $.expression), field("operator", $.as_operator), field("type", $.type))
       ),
     selector_expression: ($) =>
       seq(
@@ -634,7 +639,7 @@ module.exports = grammar({
         "selector",
         "(",
         optional(choice("getter:", "setter:")),
-        $.expression,
+        field("expr", $.expression),
         ")"
       ),
     // Binary expressions
@@ -760,49 +765,49 @@ module.exports = grammar({
       prec(
         PRECS.call_suffix,
         choice(
-          $.value_arguments,
+          field("arguments", $.value_arguments),
           prec.dynamic(-1, $._fn_call_lambda_arguments), // Prefer to treat `foo() { }` as one call not two
-          seq($.value_arguments, $._fn_call_lambda_arguments)
+          seq(field("arguments", $.value_arguments), $._fn_call_lambda_arguments)
         )
       ),
     constructor_suffix: ($) =>
       prec(
         PRECS.call_suffix,
         choice(
-          alias($._constructor_value_arguments, $.value_arguments),
+          field("arguments", alias($._constructor_value_arguments, $.value_arguments)),
           prec.dynamic(-1, $._fn_call_lambda_arguments), // As above
           seq(
-            alias($._constructor_value_arguments, $.value_arguments),
+            field("arguments", alias($._constructor_value_arguments, $.value_arguments)),
             $._fn_call_lambda_arguments
           )
         )
       ),
     _constructor_value_arguments: ($) =>
-      seq("(", optional(sep1Opt($.value_argument, ",")), ")"),
+      seq("(", optional(sep1Opt(field("argument", $.value_argument), ",")), ")"),
     _fn_call_lambda_arguments: ($) =>
-      sep1($.lambda_literal, seq(field("name", $.simple_identifier), ":")),
-    type_arguments: ($) => prec.left(seq("<", sep1Opt($.type, ","), ">")),
+      sep1(field("lambda", $.lambda_literal), seq(field("name", $.simple_identifier), ":")),
+    type_arguments: ($) => prec.left(seq("<", sep1Opt(field("argument", $.type), ","), ">")),
     value_arguments: ($) =>
       seq(
         choice(
-          seq("(", optional(sep1Opt($.value_argument, ",")), ")"),
-          seq("[", optional(sep1Opt($.value_argument, ",")), "]")
+          seq("(", optional(sep1Opt(field("argument", $.value_argument), ",")), ")"),
+          seq("[", optional(sep1Opt(field("argument", $.value_argument), ",")), "]")
         )
       ),
     value_argument_label: ($) =>
       prec.left(
-        choice(
+        field("name", choice(
           $.simple_identifier,
           // We don't rely on $._contextual_simple_identifier here because
           // these don't usually fall into that category.
           alias("if", $.simple_identifier),
           alias("switch", $.simple_identifier)
-        )
+        ))
       ),
     value_argument: ($) =>
       prec.left(
         seq(
-          optional($.type_modifiers),
+          field("type_modifiers", optional($.type_modifiers)),
           choice(
             repeat1(
               seq(field("reference_specifier", $.value_argument_label), ":")
@@ -818,7 +823,7 @@ module.exports = grammar({
       prec.right(
         PRECS["try"],
         seq(
-          $.try_operator,
+          field("operator", $.try_operator),
           field(
             "expr",
             choice(
@@ -877,15 +882,15 @@ module.exports = grammar({
       ),
     expr_hack_at_ternary_binary_call: ($) =>
       seq(
-        $.expression,
-        alias($.expr_hack_at_ternary_binary_call_suffix, $.call_suffix)
+        field("function", $.expression),
+        field("suffix", alias($.expr_hack_at_ternary_binary_call_suffix, $.call_suffix))
       ),
     expr_hack_at_ternary_binary_call_suffix: ($) =>
-      prec(PRECS.call_suffix, $.value_arguments),
+      prec(PRECS.call_suffix, field("arguments", $.value_arguments)),
     call_expression: ($) =>
       prec(
         PRECS.call,
-        prec.dynamic(DYNAMIC_PRECS.call, seq($.expression, $.call_suffix))
+        prec.dynamic(DYNAMIC_PRECS.call, seq(field("function", $.expression), field("suffix", $.call_suffix)))
       ),
     macro_invocation: ($) =>
       prec(
@@ -894,9 +899,9 @@ module.exports = grammar({
           DYNAMIC_PRECS.call,
           seq(
             $._hash_symbol,
-            $.simple_identifier,
-            optional($.type_parameters),
-            $.call_suffix
+            field("name", $.simple_identifier),
+            field("type_parameters", optional($.type_parameters)),
+            field("suffix", $.call_suffix)
           )
         )
       ),
@@ -926,26 +931,25 @@ module.exports = grammar({
         PRECS.tuple,
         seq(
           "(",
-          sep1Opt(
-            seq(
-              optional(seq(field("name", $.simple_identifier), ":")),
-              field("value", $.expression)
-            ),
-            ","
-          ),
+          sep1Opt(field("element", $.tuple_expression_item), ","),
           ")"
         )
       ),
+    tuple_expression_item: ($) =>
+      seq(
+        optional(seq(field("name", $.simple_identifier), ":")),
+        field("value", $.expression)
+      ),
     array_literal: ($) =>
       seq("[", optional(sep1Opt(field("element", $.expression), ",")), "]"),
     dictionary_literal: ($) =>
       seq(
         "[",
-        choice(":", sep1Opt($._dictionary_literal_item, ",")),
+        choice(":", sep1Opt(field("element", $.dictionary_literal_item), ",")),
         optional(","),
         "]"
       ),
-    _dictionary_literal_item: ($) =>
+    dictionary_literal_item: ($) =>
       seq(field("key", $.expression), ":", field("value", $.expression)),
     special_literal: ($) =>
       seq(
@@ -963,36 +967,38 @@ module.exports = grammar({
     playground_literal: ($) =>
       seq(
         $._hash_symbol,
-        choice("colorLiteral", "fileLiteral", "imageLiteral"),
+        field("kind", choice("colorLiteral", "fileLiteral", "imageLiteral")),
         "(",
-        sep1Opt(seq($.simple_identifier, ":", $.expression), ","),
+        sep1Opt(field("argument", $.playground_literal_argument), ","),
         ")"
       ),
+    playground_literal_argument: ($) =>
+      seq(field("name", $.simple_identifier), ":", field("value", $.expression)),
     lambda_literal: ($) =>
       prec.left(
         PRECS.lambda,
         seq(
           choice("{", "^{"),
           optional($._lambda_type_declaration),
-          optional($.statements),
+          optional($._statements),
           "}"
         )
       ),
     _lambda_type_declaration: ($) =>
       seq(
-        repeat($.attribute),
+        repeat(field("attribute", $.attribute)),
         prec(PRECS.expr, optional(field("captures", $.capture_list))),
         optional(field("type", $.lambda_function_type)),
         "in"
       ),
-    capture_list: ($) => seq("[", sep1Opt($.capture_list_item, ","), "]"),
+    capture_list: ($) => seq("[", sep1Opt(field("item", $.capture_list_item), ","), "]"),
     capture_list_item: ($) =>
       choice(
         field("name", $.self_expression),
         prec(
           PRECS.expr,
           seq(
-            optional($.ownership_modifier),
+            field("ownership", optional($.ownership_modifier)),
             field("name", $.simple_identifier),
             optional(seq($._equal_sign, field("value", $.expression)))
           )
@@ -1003,11 +1009,11 @@ module.exports = grammar({
         PRECS.expr,
         seq(
           choice(
-            $.lambda_function_type_parameters,
-            seq("(", optional($.lambda_function_type_parameters), ")")
+            field("params", $.lambda_function_type_parameters),
+            seq("(", field("params", optional($.lambda_function_type_parameters)), ")")
           ),
-          optional($._async_keyword),
-          optional(choice($.throws_clause, $.throws)),
+          field("async", optional($._async_keyword)),
+          field("throws", optional(choice($.throws_clause, $.throws))),
           optional(
             seq(
               $._arrow_operator,
@@ -1016,11 +1022,11 @@ module.exports = grammar({
           )
         )
       ),
-    lambda_function_type_parameters: ($) => sep1Opt($.lambda_parameter, ","),
+    lambda_function_type_parameters: ($) => sep1Opt(field("parameter", $.lambda_parameter), ","),
     lambda_parameter: ($) =>
       seq(
         choice(
-          $.self_expression,
+          field("name", $.self_expression),
           prec(PRECS.expr, field("name", $.simple_identifier)),
           prec(
             PRECS.expr,
@@ -1028,7 +1034,7 @@ module.exports = grammar({
               optional(field("external_name", $.simple_identifier)),
               field("name", $.simple_identifier),
               ":",
-              optional($.parameter_modifiers),
+              field("modifiers", optional($.parameter_modifiers)),
               field("type", $._possibly_implicitly_unwrapped_type)
             )
           )
@@ -1036,24 +1042,24 @@ module.exports = grammar({
       ),
     self_expression: ($) => "self",
     super_expression: ($) => seq("super"),
-    _else_options: ($) => choice($._block, $.if_statement),
+    _else_options: ($) => choice(field("else_branch", $.block), field("else_branch", $.if_statement)),
     if_statement: ($) =>
       prec.right(
         PRECS["if"],
         seq(
           "if",
           sep1(field("condition", $.if_condition), ","),
-          $._block,
-          optional(seq($["else"], $._else_options))
+          field("body", $.block),
+          optional(seq(alias($["else"], "else"), $._else_options))
         )
       ),
     if_condition: ($) =>
-      choice($.if_let_binding, $.expression, $.availability_condition),
+      field("kind", choice($.if_let_binding, $.expression, $.availability_condition)),
     if_let_binding: ($) =>
       seq(
         $._direct_or_indirect_binding,
-        optional(seq($._equal_sign, $.expression)),
-        optional($.where_clause)
+        optional(seq($._equal_sign, field("value", $.expression))),
+        field("where", optional($.where_clause))
       ),
     guard_statement: ($) =>
       prec.right(
@@ -1061,8 +1067,8 @@ module.exports = grammar({
         seq(
           "guard",
           sep1(field("condition", $.if_condition), ","),
-          $["else"],
-          $._block
+          alias($["else"], "else"),
+          field("body", $.block)
         )
       ),
     switch_statement: ($) =>
@@ -1072,65 +1078,63 @@ module.exports = grammar({
           "switch",
           field("expr", $.expression),
           "{",
-          repeat($.switch_entry),
+          repeat(field("entry", $.switch_entry)),
           "}"
         )
       ),
     switch_entry: ($) =>
       seq(
-        optional($.modifiers),
+        field("modifiers", optional($.modifiers)),
         choice(
           seq(
             "case",
-            seq(
-              $.switch_pattern,
-              optional(seq($.where_keyword, $.expression))
-            ),
-            repeat(seq(",", $.switch_pattern))
+            field("pattern", $.switch_pattern),
+            field("where", optional($.where_clause)),
+            repeat(seq(",", field("pattern", $.switch_pattern)))
           ),
-          $.default_keyword
+          field("default", $.default_keyword)
         ),
         ":",
-        $.statements,
+        $._statements,
         optional("fallthrough")
       ),
-    switch_pattern: ($) => alias($._binding_pattern_with_expr, $.pattern),
+    switch_pattern: ($) => field("pattern", alias($._binding_pattern_with_expr, $.pattern)),
     do_statement: ($) =>
-      prec.right(PRECS["do"], seq("do", $._block, repeat($.catch_block))),
+      prec.right(PRECS["do"], seq("do", field("body", $.block), repeat(field("catch", $.catch_block)))),
     catch_block: ($) =>
       seq(
-        $.catch_keyword,
+        field("keyword", $.catch_keyword),
         field("error", optional(alias($._binding_pattern_no_expr, $.pattern))),
-        optional($.where_clause),
-        $._block
+        field("where", optional($.where_clause)),
+        field("body", $.block)
       ),
-    where_clause: ($) => prec.left(seq($.where_keyword, $.expression)),
+    where_clause: ($) => prec.left(seq(field("keyword", $.where_keyword), field("expr", $.expression))),
     key_path_expression: ($) =>
       prec.right(
         PRECS.keypath,
         seq(
           "\\",
-          optional(
-            choice($._simple_user_type, $.array_type, $.dictionary_type)
-          ),
-          repeat(seq(".", $._key_path_component))
+          field("type", optional(
+            choice($.simple_user_type, $.array_type, $.dictionary_type)
+          )),
+          repeat(seq(".", field("component", $.key_path_component)))
         )
       ),
     key_path_string_expression: ($) =>
-      prec.left(seq($._hash_symbol, "keyPath", "(", $.expression, ")")),
-    _key_path_component: ($) =>
+      prec.left(seq($._hash_symbol, "keyPath", "(", field("expr", $.expression), ")")),
+    key_path_component: ($) =>
       prec.left(
         choice(
-          seq($.simple_identifier, repeat($._key_path_postfixes)),
-          repeat1($._key_path_postfixes)
+          seq(field("name", $.simple_identifier), repeat(field("postfix", $.key_path_postfix))),
+          repeat1(field("postfix", $.key_path_postfix))
         )
       ),
-    _key_path_postfixes: ($) =>
+    key_path_postfix: ($) =>
       choice(
         "?",
-        $.bang,
+        field("force_unwrap", $.bang),
         "self",
-        seq("[", optional(sep1($.value_argument, ",")), "]")
+        seq("[", optional(sep1(field("argument", $.value_argument), ",")), "]")
       ),
     try_operator: ($) =>
       prec.right(
@@ -1173,17 +1177,17 @@ module.exports = grammar({
       ),
     _bitwise_binary_operator: ($) => choice("&", "|", "^", "<<", ">>"),
     _postfix_unary_operator: ($) => choice("++", "--", $.bang),
-    directly_assignable_expression: ($) => $.expression,
+    directly_assignable_expression: ($) => field("expr", $.expression),
 
     ////////////////////////////////
     // Statements - https://docs.swift.org/swift-book/ReferenceManual/Statements.html
     ////////////////////////////////
-    statements: ($) =>
+    _statements: ($) =>
       prec.left(
         // Left precedence is required in switch statements
         seq(
-          $._local_statement,
-          repeat(seq($._semi, $._local_statement)),
+          field("statement", $._local_statement),
+          repeat(seq($._semi, field("statement", $._local_statement))),
           optional($._semi)
         )
       ),
@@ -1201,7 +1205,7 @@ module.exports = grammar({
         $._labeled_statement,
         $._throw_statement
       ),
-    _block: ($) => prec(PRECS.block, seq("{", optional($.statements), "}")),
+    block: ($) => prec(PRECS.block, seq("{", optional($._statements), "}")),
     _labeled_statement: ($) =>
       seq(
         optional($.statement_label),
@@ -1221,14 +1225,14 @@ module.exports = grammar({
         PRECS.loop,
         seq(
           "for",
-          optional($.try_operator),
+          field("try", optional($.try_operator)),
           optional($._await_operator),
           field("item", alias($._binding_pattern_no_expr, $.pattern)),
-          optional($.type_annotation),
+          field("type", optional($.type_annotation)),
           "in",
           field("collection", $._for_statement_collection),
-          optional($.where_clause),
-          $._block
+          field("where", optional($.where_clause)),
+          field("body", $.block)
         )
       ),
     _for_statement_collection: ($) =>
@@ -1237,7 +1241,7 @@ module.exports = grammar({
       //
       // To fix that, we simply undo the special casing by defining our own `await_expression`.
       choice($.expression, alias($.for_statement_await, $.await_expression)),
-    for_statement_await: ($) => seq($._await_operator, $.expression),
+    for_statement_await: ($) => seq($._await_operator, field("expr", $.expression)),
 
     while_statement: ($) =>
       prec(
@@ -1245,9 +1249,7 @@ module.exports = grammar({
         seq(
           "while",
           sep1(field("condition", $.if_condition), ","),
-          "{",
-          optional($.statements),
-          "}"
+          field("body", $.block)
         )
       ),
     repeat_while_statement: ($) =>
@@ -1255,9 +1257,7 @@ module.exports = grammar({
         PRECS.loop,
         seq(
           "repeat",
-          "{",
-          optional($.statements),
-          "}",
+          field("body", $.block),
           // Make sure we make it to the `while` before assuming this is a parameter pack.
           repeat($._implicit_semi),
           "while",
@@ -1266,11 +1266,14 @@ module.exports = grammar({
       ),
     control_transfer_statement: ($) =>
       choice(
-        prec.right(PRECS.control_transfer, $._throw_statement),
+        prec.right(
+          PRECS.control_transfer,
+          seq(field("kind", $.throw_keyword), field("result", $.expression))
+        ),
         prec.right(
           PRECS.control_transfer,
           seq(
-            $._optionally_valueful_control_keyword,
+            field("kind", $._optionally_valueful_control_keyword),
             field("result", optional($.expression))
           )
         )
@@ -1289,9 +1292,9 @@ module.exports = grammar({
         )
       ),
     value_parameter_pack: ($) =>
-      prec.left(PRECS.parameter_pack, seq("each", $.expression)),
+      prec.left(PRECS.parameter_pack, seq("each", field("expr", $.expression))),
     value_pack_expansion: ($) =>
-      prec.left(PRECS.parameter_pack, seq("repeat", $.expression)),
+      prec.left(PRECS.parameter_pack, seq("repeat", field("expr", $.expression))),
     availability_condition: ($) =>
       seq(
         $._hash_symbol,
@@ -1301,7 +1304,7 @@ module.exports = grammar({
         ")"
       ),
     _availability_argument: ($) =>
-      choice(seq($.identifier, sep1($.integer_literal, ".")), "*"),
+      choice(seq(field("platform", $.identifier), sep1(field("version", $.integer_literal), ".")), "*"),
     ////////////////////////////////
     // Declarations - https://docs.swift.org/swift-book/ReferenceManual/Declarations.html
     ////////////////////////////////
@@ -1343,30 +1346,30 @@ module.exports = grammar({
       ),
     _local_property_declaration: ($) =>
       seq(
-        optional($._locally_permitted_modifiers),
+        field("modifiers", optional($._locally_permitted_modifiers)),
         $._modifierless_property_declaration
       ),
     _local_typealias_declaration: ($) =>
       seq(
-        optional($._locally_permitted_modifiers),
+        field("modifiers", optional($._locally_permitted_modifiers)),
         $._modifierless_typealias_declaration
       ),
     _local_function_declaration: ($) =>
       seq(
-        optional($._locally_permitted_modifiers),
+        field("modifiers", optional($._locally_permitted_modifiers)),
         $._modifierless_function_declaration
       ),
     _local_class_declaration: ($) =>
       seq(
-        optional($._locally_permitted_modifiers),
+        field("modifiers", optional($._locally_permitted_modifiers)),
         $._modifierless_class_declaration
       ),
     import_declaration: ($) =>
       seq(
-        optional($.modifiers),
+        field("modifiers", optional($.modifiers)),
         "import",
         optional($._import_kind),
-        $.identifier
+        field("name", $.identifier)
       ),
     _import_kind: ($) =>
       choice(
@@ -1382,35 +1385,35 @@ module.exports = grammar({
     protocol_property_declaration: ($) =>
       prec.right(
         seq(
-          optional($.modifiers),
+          field("modifiers", optional($.modifiers)),
           field("name", alias($._binding_kind_and_pattern, $.pattern)),
-          optional($.type_annotation),
-          optional($.type_constraints),
-          $.protocol_property_requirements
+          field("type", optional($.type_annotation)),
+          field("type_constraints", optional($.type_constraints)),
+          field("requirements", $.protocol_property_requirements)
         )
       ),
     protocol_property_requirements: ($) =>
-      seq("{", repeat(choice($.getter_specifier, $.setter_specifier)), "}"),
+      seq("{", repeat(field("accessor", choice($.getter_specifier, $.setter_specifier))), "}"),
     property_declaration: ($) =>
-      seq(optional($.modifiers), $._modifierless_property_declaration),
+      seq(field("modifiers", optional($.modifiers)), $._modifierless_property_declaration),
     _modifierless_property_declaration: ($) =>
       prec.right(
         seq(
           $._possibly_async_binding_pattern_kind,
-          sep1($._single_modifierless_property_declaration, ",")
+          sep1(field("declarator", $.property_binding), ",")
         )
       ),
-    _single_modifierless_property_declaration: ($) =>
+    property_binding: ($) =>
       prec.left(
         seq(
           field("name", alias($._no_expr_pattern_already_bound, $.pattern)),
-          optional($.type_annotation),
-          optional($.type_constraints),
+          field("type", optional($.type_annotation)),
+          field("type_constraints", optional($.type_constraints)),
           optional(
             choice(
               $._expression_with_willset_didset,
               $._expression_without_willset_didset,
-              $.willset_didset_block,
+              field("observers", $.willset_didset_block),
               field("computed_value", $.computed_property)
             )
           )
@@ -1422,54 +1425,54 @@ module.exports = grammar({
         seq(
           $._equal_sign,
           field("value", $.expression),
-          $.willset_didset_block
+          field("observers", $.willset_didset_block)
         )
       ),
     _expression_without_willset_didset: ($) =>
       seq($._equal_sign, field("value", $.expression)),
     willset_didset_block: ($) =>
       choice(
-        seq("{", $.willset_clause, optional($.didset_clause), "}"),
-        seq("{", $.didset_clause, optional($.willset_clause), "}")
+        seq("{", field("willset", $.willset_clause), field("didset", optional($.didset_clause)), "}"),
+        seq("{", field("didset", $.didset_clause), field("willset", optional($.willset_clause)), "}")
       ),
     willset_clause: ($) =>
       seq(
-        optional($.modifiers),
+        field("modifiers", optional($.modifiers)),
         "willSet",
-        optional(seq("(", $.simple_identifier, ")")),
-        $._block
+        optional(seq("(", field("parameter", $.simple_identifier), ")")),
+        field("body", $.block)
       ),
     didset_clause: ($) =>
       seq(
-        optional($.modifiers),
+        field("modifiers", optional($.modifiers)),
         "didSet",
-        optional(seq("(", $.simple_identifier, ")")),
-        $._block
+        optional(seq("(", field("parameter", $.simple_identifier), ")")),
+        field("body", $.block)
       ),
     typealias_declaration: ($) =>
-      seq(optional($.modifiers), $._modifierless_typealias_declaration),
+      seq(field("modifiers", optional($.modifiers)), $._modifierless_typealias_declaration),
     _modifierless_typealias_declaration: ($) =>
       seq(
         "typealias",
         field("name", alias($.simple_identifier, $.type_identifier)),
-        optional($.type_parameters),
+        field("type_parameters", optional($.type_parameters)),
         $._equal_sign,
         field("value", $.type)
       ),
     function_declaration: ($) =>
       prec.right(
-        seq($._bodyless_function_declaration, field("body", $.function_body))
+        seq($._bodyless_function_declaration, field("body", $.block))
       ),
     _modifierless_function_declaration: ($) =>
       prec.right(
         seq(
           $._modifierless_function_declaration_no_body,
-          field("body", $.function_body)
+          field("body", $.block)
         )
       ),
     _bodyless_function_declaration: ($) =>
       seq(
-        optional($.modifiers),
+        field("modifiers", optional($.modifiers)),
         optional("class"), // XXX: This should be possible in non-last position, but that creates parsing ambiguity
         $._modifierless_function_declaration_no_body
       ),
@@ -1477,34 +1480,33 @@ module.exports = grammar({
       prec.right(
         seq(
           $._non_constructor_function_decl,
-          optional($.type_parameters),
+          field("type_parameters", optional($.type_parameters)),
           $._function_value_parameters,
-          optional($._async_keyword),
-          optional(choice($.throws_clause, $.throws)),
+          field("async", optional($._async_keyword)),
+          field("throws", optional(choice($.throws_clause, $.throws))),
           optional(
             seq(
               $._arrow_operator,
               field("return_type", $._possibly_implicitly_unwrapped_type)
             )
           ),
-          optional($.type_constraints)
+          field("type_constraints", optional($.type_constraints))
         )
       ),
-    function_body: ($) => $._block,
     macro_declaration: ($) =>
       seq(
         $._macro_head,
-        $.simple_identifier,
-        optional($.type_parameters),
+        field("name", $.simple_identifier),
+        field("type_parameters", optional($.type_parameters)),
         $._macro_signature,
         optional(field("definition", $.macro_definition)),
-        optional($.type_constraints)
+        field("type_constraints", optional($.type_constraints))
       ),
-    _macro_head: ($) => seq(optional($.modifiers), "macro"),
+    _macro_head: ($) => seq(field("modifiers", optional($.modifiers)), "macro"),
     _macro_signature: ($) =>
       seq(
         $._function_value_parameters,
-        optional(seq($._arrow_operator, $.unannotated_type))
+        optional(seq($._arrow_operator, field("return_type", $.unannotated_type)))
       ),
     macro_definition: ($) =>
       seq(
@@ -1513,36 +1515,36 @@ module.exports = grammar({
       ),
 
     external_macro_definition: ($) =>
-      seq($._hash_symbol, "externalMacro", $.value_arguments),
+      seq($._hash_symbol, "externalMacro", field("arguments", $.value_arguments)),
 
     class_declaration: ($) =>
-      seq(optional($.modifiers), $._modifierless_class_declaration),
+      seq(field("modifiers", optional($.modifiers)), $._modifierless_class_declaration),
     _modifierless_class_declaration: ($) =>
       prec.right(
         choice(
           seq(
             field("declaration_kind", choice("class", "struct", "actor")),
             field("name", alias($.simple_identifier, $.type_identifier)),
-            optional($.type_parameters),
+            field("type_parameters", optional($.type_parameters)),
             optional(seq(":", $._inheritance_specifiers)),
-            optional($.type_constraints),
+            field("type_constraints", optional($.type_constraints)),
             field("body", $.class_body)
           ),
           seq(
             field("declaration_kind", "extension"),
             field("name", $.unannotated_type),
-            optional($.type_parameters),
+            field("type_parameters", optional($.type_parameters)),
             optional(seq(":", $._inheritance_specifiers)),
-            optional($.type_constraints),
+            field("type_constraints", optional($.type_constraints)),
             field("body", $.class_body)
           ),
           seq(
             optional("indirect"),
             field("declaration_kind", "enum"),
             field("name", alias($.simple_identifier, $.type_identifier)),
-            optional($.type_parameters),
+            field("type_parameters", optional($.type_parameters)),
             optional(seq(":", $._inheritance_specifiers)),
-            optional($.type_constraints),
+            field("type_constraints", optional($.type_constraints)),
             field("body", $.enum_class_body)
           )
         )
@@ -1550,6 +1552,8 @@ module.exports = grammar({
     class_body: ($) => seq("{", optional($._class_member_declarations), "}"),
     _inheritance_specifiers: ($) =>
       prec.left(sep1($._annotated_inheritance_specifier, choice(",", "&"))),
+    _annotated_inheritance_specifier: ($) =>
+      seq(repeat(field("attribute", $.attribute)), field("inherits", $.inheritance_specifier)),
     inheritance_specifier: ($) =>
       prec.left(
         field(
@@ -1557,20 +1561,18 @@ module.exports = grammar({
           choice($.user_type, $.function_type, $.suppressed_constraint)
         )
       ),
-    _annotated_inheritance_specifier: ($) =>
-      seq(repeat($.attribute), $.inheritance_specifier),
     type_parameters: ($) =>
       seq(
         "<",
-        sep1Opt($.type_parameter, ","),
-        optional($.type_constraints),
+        sep1Opt(field("parameter", $.type_parameter), ","),
+        field("constraints", optional($.type_constraints)),
         ">"
       ),
     type_parameter: ($) =>
       seq(
-        optional($.type_parameter_modifiers),
-        $._type_parameter_possibly_packed,
-        optional(seq(":", $.type))
+        field("modifiers", optional($.type_parameter_modifiers)),
+        field("name", $._type_parameter_possibly_packed),
+        optional(seq(":", field("type", $.type)))
       ),
     _type_parameter_possibly_packed: ($) =>
       choice(
@@ -1579,19 +1581,19 @@ module.exports = grammar({
       ),
 
     type_constraints: ($) =>
-      prec.right(seq($.where_keyword, sep1Opt($.type_constraint, ","))),
+      prec.right(seq(field("keyword", $.where_keyword), sep1Opt(field("constraint", $.type_constraint), ","))),
     type_constraint: ($) =>
-      choice($.inheritance_constraint, $.equality_constraint),
+      field("constraint", choice($.inheritance_constraint, $.equality_constraint)),
     inheritance_constraint: ($) =>
       seq(
-        repeat($.attribute),
+        repeat(field("attribute", $.attribute)),
         field("constrained_type", $._constrained_type),
         ":",
         field("inherits_from", $._possibly_implicitly_unwrapped_type)
       ),
     equality_constraint: ($) =>
       seq(
-        repeat($.attribute),
+        repeat(field("attribute", $.attribute)),
         field("constrained_type", $._constrained_type),
         choice($._equal_sign, $._eq_eq),
         field("must_equal", $.type)
@@ -1599,23 +1601,23 @@ module.exports = grammar({
     _constrained_type: ($) => choice($.identifier, $.nested_type_identifier),
     nested_type_identifier: ($) =>
       seq(
-        $.unannotated_type,
-        optional(seq(".", sep1($.simple_identifier, ".")))
+        field("base", $.unannotated_type),
+        optional(seq(".", sep1(field("member", $.simple_identifier), ".")))
       ),
-    _class_member_separator: ($) => choice($._semi, $.multiline_comment),
+    _class_member_separator: ($) => choice($._semi, $._multiline_comment),
     _class_member_declarations: ($) =>
       seq(
-        sep1($.type_level_declaration, $._class_member_separator),
+        sep1(field("member", $.type_level_declaration), $._class_member_separator),
         optional($._class_member_separator)
       ),
     _function_value_parameters: ($) =>
       repeat1(
-        seq("(", optional(sep1Opt($._function_value_parameter, ",")), ")")
+        seq("(", optional(sep1Opt(field("parameter", $.function_parameter), ",")), ")")
       ),
-    _function_value_parameter: ($) =>
+    function_parameter: ($) =>
       seq(
-        optional($.attribute),
-        $.parameter,
+        field("attribute", optional($.attribute)),
+        field("parameter", $.parameter),
         optional(seq($._equal_sign, field("default_value", $.expression)))
       ),
     parameter: ($) =>
@@ -1623,7 +1625,7 @@ module.exports = grammar({
         optional(field("external_name", $.simple_identifier)),
         field("name", $.simple_identifier),
         ":",
-        optional($.parameter_modifiers),
+        field("modifiers", optional($.parameter_modifiers)),
         field("type", $._possibly_implicitly_unwrapped_type),
         optional($._three_dot_operator)
       ),
@@ -1633,7 +1635,7 @@ module.exports = grammar({
         field("name", choice($.simple_identifier, $.referenceable_operator))
       ),
     referenceable_operator: ($) =>
-      choice(
+      field("operator", choice(
         $.custom_operator,
         $._comparison_operator,
         $._additive_operator,
@@ -1649,7 +1651,7 @@ module.exports = grammar({
         "<<",
         ">>",
         "&"
-      ),
+      )),
     // Hide the fact that certain symbols come from the custom scanner by aliasing them to their
     // string variants. This keeps us from having to see them in the syntax tree (which would be
     // noisy) but allows callers to refer to them as nodes by their text form like with any
@@ -1673,21 +1675,20 @@ module.exports = grammar({
     throws_clause: ($) =>
       seq($._throws_keyword, "(", field("type", $.unannotated_type), ")"),
     enum_class_body: ($) =>
-      seq("{", repeat(choice($.enum_entry, $.type_level_declaration)), "}"),
+      seq("{", repeat(field("member", choice($.enum_entry, $.type_level_declaration))), "}"),
     enum_entry: ($) =>
       seq(
-        optional($.modifiers),
+        field("modifiers", optional($.modifiers)),
         optional("indirect"),
         "case",
-        sep1(
-          seq(
-            field("name", $.simple_identifier),
-            optional($._enum_entry_suffix)
-          ),
-          ","
-        ),
+        sep1(field("case", $.enum_case_entry), ","),
         optional(";")
       ),
+    enum_case_entry: ($) =>
+      seq(
+        field("name", $.simple_identifier),
+        optional($._enum_entry_suffix)
+      ),
     _enum_entry_suffix: ($) =>
       choice(
         field("data_contents", $.enum_type_parameters),
@@ -1696,36 +1697,33 @@ module.exports = grammar({
     enum_type_parameters: ($) =>
       seq(
         "(",
+        optional(sep1(field("parameter", $.enum_type_parameter), ",")),
+        ")"
+      ),
+    enum_type_parameter: ($) =>
+      seq(
         optional(
-          sep1(
-            seq(
-              optional(
-                seq(optional($.wildcard_pattern), $.simple_identifier, ":")
-              ),
-              $.type,
-              optional(seq($._equal_sign, $.expression))
-            ),
-            ","
-          )
+          seq(optional(field("external_name", $.wildcard_pattern)), field("name", $.simple_identifier), ":")
         ),
-        ")"
+        field("type", $.type),
+        optional(seq($._equal_sign, field("default_value", $.expression)))
       ),
     protocol_declaration: ($) =>
       prec.right(
         seq(
-          optional($.modifiers),
-          field("declaration_kind", "protocol"),
+          field("modifiers", optional($.modifiers)),
+          "protocol",
           field("name", alias($.simple_identifier, $.type_identifier)),
-          optional($.type_parameters),
+          field("type_parameters", optional($.type_parameters)),
           optional(seq(":", $._inheritance_specifiers)),
-          optional($.type_constraints),
+          field("type_constraints", optional($.type_constraints)),
           field("body", $.protocol_body)
         )
       ),
     protocol_body: ($) =>
       seq("{", optional($._protocol_member_declarations), "}"),
     _protocol_member_declarations: ($) =>
-      seq(sep1($.protocol_member_declaration, $._semi), optional($._semi)),
+      seq(sep1(field("member", $.protocol_member_declaration), $._semi), optional($._semi)),
     protocol_member_declaration: ($) =>
       choice(
         $.protocol_function_declaration,
@@ -1739,33 +1737,33 @@ module.exports = grammar({
     protocol_function_declaration: ($) =>
       seq(
         $._bodyless_function_declaration,
-        optional(field("body", $.function_body))
+        optional(field("body", $.block))
       ),
     init_declaration: ($) =>
       prec.right(
         seq(
-          optional($.modifiers),
+          field("modifiers", optional($.modifiers)),
           optional("class"),
-          field("name", "init"),
-          optional(choice($._quest, $.bang)),
-          optional($.type_parameters),
+          "init",
+          optional(choice($._quest, field("bang", $.bang))),
+          field("type_parameters", optional($.type_parameters)),
           $._function_value_parameters,
-          optional($._async_keyword),
-          optional(choice($.throws_clause, $.throws)),
-          optional($.type_constraints),
-          optional(field("body", $.function_body))
+          field("async", optional($._async_keyword)),
+          field("throws", optional(choice($.throws_clause, $.throws))),
+          field("type_constraints", optional($.type_constraints)),
+          optional(field("body", $.block))
         )
       ),
     deinit_declaration: ($) =>
       prec.right(
-        seq(optional($.modifiers), "deinit", field("body", $.function_body))
+        seq(field("modifiers", optional($.modifiers)), "deinit", field("body", $.block))
       ),
     subscript_declaration: ($) =>
       prec.right(
         seq(
-          optional($.modifiers),
+          field("modifiers", optional($.modifiers)),
           "subscript",
-          optional($.type_parameters),
+          field("type_parameters", optional($.type_parameters)),
           $._function_value_parameters,
           optional(
             seq(
@@ -1773,71 +1771,71 @@ module.exports = grammar({
               field("return_type", $._possibly_implicitly_unwrapped_type)
             )
           ),
-          optional($.type_constraints),
-          $.computed_property
+          field("type_constraints", optional($.type_constraints)),
+          field("body", $.computed_property)
         )
       ),
     computed_property: ($) =>
       seq(
         "{",
         choice(
-          optional($.statements),
+          optional($._statements),
           repeat(
-            choice($.computed_getter, $.computed_setter, $.computed_modify)
+            field("accessor", choice($.computed_getter, $.computed_setter, $.computed_modify))
           )
         ),
         "}"
       ),
     computed_getter: ($) =>
-      seq(repeat($.attribute), $.getter_specifier, optional($._block)),
+      seq(repeat(field("attribute", $.attribute)), field("specifier", $.getter_specifier), optional(field("body", $.block))),
     computed_modify: ($) =>
-      seq(repeat($.attribute), $.modify_specifier, optional($._block)),
+      seq(repeat(field("attribute", $.attribute)), field("specifier", $.modify_specifier), optional(field("body", $.block))),
     computed_setter: ($) =>
       seq(
-        repeat($.attribute),
-        $.setter_specifier,
-        optional(seq("(", $.simple_identifier, ")")),
-        optional($._block)
+        repeat(field("attribute", $.attribute)),
+        field("specifier", $.setter_specifier),
+        optional(seq("(", field("parameter", $.simple_identifier), ")")),
+        optional(field("body", $.block))
       ),
     getter_specifier: ($) =>
-      seq(optional($.mutation_modifier), "get", optional($._getter_effects)),
-    setter_specifier: ($) => seq(optional($.mutation_modifier), "set"),
-    modify_specifier: ($) => seq(optional($.mutation_modifier), "_modify"),
+      seq(field("mutation", optional($.mutation_modifier)), "get", optional($._getter_effects)),
+    setter_specifier: ($) => seq(field("mutation", optional($.mutation_modifier)), "set"),
+    modify_specifier: ($) => seq(field("mutation", optional($.mutation_modifier)), "_modify"),
     _getter_effects: ($) =>
-      repeat1(choice($._async_keyword, $.throws_clause, $.throws)),
+      repeat1(field("effect", choice(alias($._async_keyword, $.async_keyword), $.throws_clause, $.throws))),
     operator_declaration: ($) =>
       seq(
-        choice("prefix", "infix", "postfix"),
+        field("kind", choice("prefix", "infix", "postfix")),
         "operator",
-        $.referenceable_operator,
-        optional(seq(":", $.simple_identifier)),
-        optional($.deprecated_operator_declaration_body)
+        field("name", $.referenceable_operator),
+        optional(seq(":", field("precedence_group", $.simple_identifier))),
+        field("body", optional($.deprecated_operator_declaration_body))
       ),
     // The Swift compiler no longer accepts these, but some very old code still uses it.
     deprecated_operator_declaration_body: ($) =>
-      seq("{", repeat(choice($.simple_identifier, $._basic_literal)), "}"),
+      seq("{", repeat(field("entry", choice($.simple_identifier, $._basic_literal))), "}"),
     precedence_group_declaration: ($) =>
       seq(
         "precedencegroup",
-        $.simple_identifier,
+        field("name", $.simple_identifier),
         "{",
-        optional($.precedence_group_attributes),
+        field("attributes", optional($.precedence_group_attributes)),
         "}"
       ),
-    precedence_group_attributes: ($) => repeat1($.precedence_group_attribute),
+    precedence_group_attributes: ($) => repeat1(field("attribute", $.precedence_group_attribute)),
     precedence_group_attribute: ($) =>
       seq(
-        $.simple_identifier,
+        field("name", $.simple_identifier),
         ":",
-        choice($.simple_identifier, $.boolean_literal)
+        field("value", choice($.simple_identifier, $.boolean_literal))
       ),
     associatedtype_declaration: ($) =>
       seq(
-        optional($.modifiers),
+        field("modifiers", optional($.modifiers)),
         "associatedtype",
         field("name", alias($.simple_identifier, $.type_identifier)),
         optional(seq(":", field("must_inherit", $.type))),
-        optional($.type_constraints),
+        field("type_constraints", optional($.type_constraints)),
         optional(seq($._equal_sign, field("default_value", $.type)))
       ),
     ////////////////////////////////
@@ -1846,20 +1844,20 @@ module.exports = grammar({
     attribute: ($) =>
       seq(
         "@",
-        $.user_type,
+        field("name", $.user_type),
         // attribute arguments are a mess of special cases, maybe this is good enough?
         optional(seq("(", sep1Opt($._attribute_argument, ","), ")"))
       ),
     _attribute_argument: ($) =>
       choice(
         // labeled function parameters, used in custom property wrappers
-        seq($.simple_identifier, ":", $.expression),
+        seq(field("argument_name", $.simple_identifier), ":", field("argument", $.expression)),
         // Unlabeled function parameters, simple identifiers, or `*`
-        $.expression,
+        field("argument", $.expression),
         // References to param names (used in `@objc(foo:bar:)`)
-        repeat1(seq($.simple_identifier, ":")),
+        repeat1(seq(field("param_ref", $.simple_identifier), ":")),
         // Version restrictions (iOS 3.4.5, Swift 5.0.0)
-        seq(repeat1($.simple_identifier), sep1($.integer_literal, "."))
+        seq(repeat1(field("platform", $.simple_identifier)), sep1(field("version", $.integer_literal), "."))
       ),
     ////////////////////////////////
     // Patterns - https://docs.swift.org/swift-book/ReferenceManual/Patterns.html
@@ -1867,83 +1865,84 @@ module.exports = grammar({
     _universally_allowed_pattern: ($) =>
       choice(
         $.wildcard_pattern,
-        $._tuple_pattern,
-        $._type_casting_pattern,
-        $._case_pattern
+        $.tuple_pattern,
+        $.type_casting_pattern,
+        $.case_pattern
       ),
     _bound_identifier: ($) => field("bound_identifier", $.simple_identifier),
 
     _binding_pattern_no_expr: ($) =>
       seq(
-        choice(
+        field("kind", choice(
           $._universally_allowed_pattern,
-          $._binding_pattern,
+          $.binding_pattern,
           $._bound_identifier
-        ),
+        )),
         optional($._quest)
       ),
     _no_expr_pattern_already_bound: ($) =>
       seq(
-        choice($._universally_allowed_pattern, $._bound_identifier),
+        field("kind", choice($._universally_allowed_pattern, $._bound_identifier)),
         optional($._quest)
       ),
     _binding_pattern_with_expr: ($) =>
       seq(
-        choice(
+        field("kind", choice(
           $._universally_allowed_pattern,
-          $._binding_pattern,
+          $.binding_pattern,
           $.expression
-        ),
+        )),
         optional($._quest)
       ),
     _non_binding_pattern_with_expr: ($) =>
       seq(
-        choice($._universally_allowed_pattern, $.expression),
+        field("kind", choice($._universally_allowed_pattern, $.expression)),
         optional($._quest)
       ),
     _direct_or_indirect_binding: ($) =>
       seq(
         choice(
-          $._binding_kind_and_pattern,
-          seq("case", $._binding_pattern_no_expr)
+          field("pattern", alias($._binding_kind_and_pattern, $.pattern)),
+          seq("case", field("pattern", alias($._binding_pattern_no_expr, $.pattern)))
         ),
-        optional($.type_annotation)
+        field("type", optional($.type_annotation))
       ),
     value_binding_pattern: ($) => field("mutability", choice("var", "let")),
     _possibly_async_binding_pattern_kind: ($) =>
-      seq(optional($._async_modifier), $.value_binding_pattern),
+      seq(optional($._async_modifier), field("binding", $.value_binding_pattern)),
     _binding_kind_and_pattern: ($) =>
       seq(
         $._possibly_async_binding_pattern_kind,
         $._no_expr_pattern_already_bound
       ),
     wildcard_pattern: ($) => "_",
-    _tuple_pattern_item: ($) =>
+    tuple_pattern_item: ($) =>
       choice(
         seq(
-          $.simple_identifier,
-          seq(":", alias($._binding_pattern_with_expr, $.pattern))
+          field("name", $.simple_identifier),
+          ":",
+          field("pattern", alias($._binding_pattern_with_expr, $.pattern))
         ),
-        alias($._binding_pattern_with_expr, $.pattern)
+        field("pattern", alias($._binding_pattern_with_expr, $.pattern))
       ),
-    _tuple_pattern: ($) => seq("(", sep1Opt($._tuple_pattern_item, ","), ")"),
-    _case_pattern: ($) =>
+    tuple_pattern: ($) => seq("(", sep1Opt(field("item", $.tuple_pattern_item), ","), ")"),
+    case_pattern: ($) =>
       seq(
         optional("case"),
-        optional($.user_type), // XXX this should just be _type but that creates ambiguity
+        optional(field("type", $.user_type)), // XXX this should just be _type but that creates ambiguity
         $._dot,
-        $.simple_identifier,
-        optional($._tuple_pattern)
+        field("name", $.simple_identifier),
+        optional(field("arguments", $.tuple_pattern))
       ),
-    _type_casting_pattern: ($) =>
+    type_casting_pattern: ($) =>
       choice(
-        seq("is", $.type),
-        seq(alias($._binding_pattern_no_expr, $.pattern), $._as, $.type)
+        seq("is", field("type", $.type)),
+        seq(field("pattern", alias($._binding_pattern_no_expr, $.pattern)), $._as, field("type", $.type))
       ),
-    _binding_pattern: ($) =>
+    binding_pattern: ($) =>
       seq(
-        seq(optional("case"), $.value_binding_pattern),
-        $._no_expr_pattern_already_bound
+        seq(optional("case"), field("binding", $.value_binding_pattern)),
+        field("pattern", alias($._no_expr_pattern_already_bound, $.pattern))
       ),
 
     // ==========
@@ -1952,12 +1951,12 @@ module.exports = grammar({
     modifiers: ($) =>
       repeat1(
         prec.left(
-          choice($._non_local_scope_modifier, $._locally_permitted_modifiers)
+          field("modifier", choice($._non_local_scope_modifier, $._locally_permitted_modifiers))
         )
       ),
     _locally_permitted_modifiers: ($) =>
       repeat1(choice($.attribute, $._locally_permitted_modifier)),
-    parameter_modifiers: ($) => repeat1($.parameter_modifier),
+    parameter_modifiers: ($) => repeat1(field("modifier", $.parameter_modifier)),
     _modifier: ($) =>
       choice($._non_local_scope_modifier, $._locally_permitted_modifier),
     _non_local_scope_modifier: ($) =>
@@ -1976,7 +1975,7 @@ module.exports = grammar({
         $.property_behavior_modifier
       ),
     property_behavior_modifier: ($) => "lazy",
-    type_modifiers: ($) => repeat1($.attribute),
+    type_modifiers: ($) => repeat1(field("attribute", $.attribute)),
     member_modifier: ($) =>
       choice("override", "convenience", "required", "nonisolated"),
     visibility_modifier: ($) =>
@@ -1991,7 +1990,7 @@ module.exports = grammar({
         ),
         optional(seq("(", "set", ")"))
       ),
-    type_parameter_modifiers: ($) => repeat1($.attribute),
+    type_parameter_modifiers: ($) => repeat1(field("attribute", $.attribute)),
     function_modifier: ($) => choice("infix", "postfix", "prefix"),
     mutation_modifier: ($) => choice("mutating", "nonmutating"),
     property_modifier: ($) =>
@@ -2024,46 +2023,46 @@ module.exports = grammar({
       prec.right(
         PRECS.comment,
         choice(
-          seq(alias($._directive_if, "#if"), $._compilation_condition),
-          seq(alias($._directive_elseif, "#elseif"), $._compilation_condition),
+          seq(alias($._directive_if, "#if"), field("condition", $.compilation_condition)),
+          seq(alias($._directive_elseif, "#elseif"), field("condition", $.compilation_condition)),
           seq(alias($._directive_else, "#else")),
           seq(alias($._directive_endif, "#endif"))
         )
       ),
-    _compilation_condition: ($) =>
+    compilation_condition: ($) =>
       prec.right(
         choice(
-          seq("os", "(", $.simple_identifier, ")"),
-          seq("arch", "(", $.simple_identifier, ")"),
+          seq("os", "(", field("name", $.simple_identifier), ")"),
+          seq("arch", "(", field("name", $.simple_identifier), ")"),
           seq(
             "swift",
             "(",
             $._comparison_operator,
-            sep1($.integer_literal, "."),
+            sep1(field("version", $.integer_literal), "."),
             ")"
           ),
           seq(
             "compiler",
             "(",
             $._comparison_operator,
-            sep1($.integer_literal, "."),
+            sep1(field("version", $.integer_literal), "."),
             ")"
           ),
-          seq("canImport", "(", sep1($.simple_identifier, "."), ")"),
-          seq("targetEnvironment", "(", $.simple_identifier, ")"),
-          $.boolean_literal,
-          $.simple_identifier,
-          seq("(", $._compilation_condition, ")"),
-          seq("!", $._compilation_condition),
+          seq("canImport", "(", sep1(field("name", $.simple_identifier), "."), ")"),
+          seq("targetEnvironment", "(", field("name", $.simple_identifier), ")"),
+          field("value", $.boolean_literal),
+          field("name", $.simple_identifier),
+          seq("(", field("inner", $.compilation_condition), ")"),
+          seq("!", field("operand", $.compilation_condition)),
           seq(
-            $._compilation_condition,
+            field("lhs", $.compilation_condition),
             $._conjunction_operator,
-            $._compilation_condition
+            field("rhs", $.compilation_condition)
           ),
           seq(
-            $._compilation_condition,
+            field("lhs", $.compilation_condition),
             $._disjunction_operator,
-            $._compilation_condition
+            field("rhs", $.compilation_condition)
           )
         )
       ),
diff --git a/unified/extractor/tree-sitter-swift/node-types.yml b/unified/extractor/tree-sitter-swift/node-types.yml
index c4bf650944b2..8e1a4209d74b 100644
--- a/unified/extractor/tree-sitter-swift/node-types.yml
+++ b/unified/extractor/tree-sitter-swift/node-types.yml
@@ -119,8 +119,8 @@ named:
   array_type:
     element: type
   as_expression:
-    $children: as_operator
     expr: expression
+    operator: as_operator
     type: type
   as_operator:
   assignment:
@@ -128,114 +128,166 @@ named:
     result: expression
     target: directly_assignable_expression
   associatedtype_declaration:
-    $children*: [modifiers, type_constraints]
     default_value?: type
+    modifiers?: modifiers
     must_inherit?: type
     name: type_identifier
+    type_constraints?: type_constraints
+  async_keyword:
   attribute:
-    $children+: [expression, user_type]
+    argument*: expression
+    argument_name*: simple_identifier
+    name: user_type
+    param_ref*: simple_identifier
+    platform*: simple_identifier
+    version*: integer_literal
   availability_condition:
-    $children*: [identifier, integer_literal]
+    platform*: identifier
+    version*: integer_literal
   await_expression:
-    $children?: expression
-    expr?: expression
+    expr: expression
   bang:
   bin_literal:
+  binding_pattern:
+    binding: value_binding_pattern
+    pattern: pattern
   bitwise_operation:
     lhs: expression
     op: ["&", "<<", ">>", "^", "|"]
     rhs: expression
+  block:
+    statement*: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
   boolean_literal:
   call_expression:
-    $children+: [call_suffix, expression]
+    function: expression
+    suffix: call_suffix
   call_suffix:
-    $children+: [lambda_literal, value_arguments]
+    arguments?: value_arguments
+    lambda*: lambda_literal
     name*: simple_identifier
   capture_list:
-    $children+: capture_list_item
+    item+: capture_list_item
   capture_list_item:
-    $children?: ownership_modifier
     name: [self_expression, simple_identifier]
+    ownership?: ownership_modifier
     value?: expression
+  case_pattern:
+    arguments?: tuple_pattern
+    name: simple_identifier
+    type?: user_type
   catch_block:
-    $children+: [catch_keyword, statements, where_clause]
+    body: block
     error?: pattern
+    keyword: catch_keyword
+    where?: where_clause
   catch_keyword:
   check_expression:
     op: "is"
     target: expression
     type: type
   class_body:
-    $children*: [multiline_comment, type_level_declaration]
+    member*: type_level_declaration
   class_declaration:
-    $children*: [attribute, inheritance_modifier, inheritance_specifier, modifiers, ownership_modifier, property_behavior_modifier, type_constraints, type_parameters]
+    attribute*: attribute
     body: [class_body, enum_class_body]
     declaration_kind: ["actor", "class", "enum", "extension", "struct"]
+    inherits*: inheritance_specifier
+    modifiers*: [attribute, inheritance_modifier, modifiers, ownership_modifier, property_behavior_modifier]
     name: [type_identifier, unannotated_type]
+    type_constraints?: type_constraints
+    type_parameters?: type_parameters
   comment:
   comparison_expression:
     lhs: expression
     op: ["<", "<=", ">", ">="]
     rhs: expression
+  compilation_condition:
+    inner?: compilation_condition
+    lhs?: compilation_condition
+    name*: simple_identifier
+    operand?: compilation_condition
+    rhs?: compilation_condition
+    value?: boolean_literal
+    version*: integer_literal
   computed_getter:
-    $children+: [attribute, getter_specifier, statements]
+    attribute*: attribute
+    body?: block
+    specifier: getter_specifier
   computed_modify:
-    $children+: [attribute, modify_specifier, statements]
+    attribute*: attribute
+    body?: block
+    specifier: modify_specifier
   computed_property:
-    $children*: [computed_getter, computed_modify, computed_setter, statements]
+    accessor*: [computed_getter, computed_modify, computed_setter]
+    statement*: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
   computed_setter:
-    $children+: [attribute, setter_specifier, simple_identifier, statements]
+    attribute*: attribute
+    body?: block
+    parameter?: simple_identifier
+    specifier: setter_specifier
   conjunction_expression:
     lhs: expression
     op: "&&"
     rhs: expression
   constructor_expression:
-    $children: constructor_suffix
     constructed_type: [array_type, dictionary_type, user_type]
+    suffix: constructor_suffix
   constructor_suffix:
-    $children+: [lambda_literal, value_arguments]
+    arguments?: value_arguments
+    lambda*: lambda_literal
     name*: simple_identifier
   control_transfer_statement:
-    $children*: [expression, throw_keyword]
+    kind: ["break", "continue", "return", throw_keyword, "yield"]
     result?: expression
   custom_operator:
   default_keyword:
   deinit_declaration:
-    $children?: modifiers
-    body: function_body
+    body: block
+    modifiers?: modifiers
   deprecated_operator_declaration_body:
-    $children*: [bin_literal, boolean_literal, hex_literal, integer_literal, line_string_literal, multi_line_string_literal, oct_literal, raw_string_literal, real_literal, regex_literal, simple_identifier]
+    entry*: [bin_literal, boolean_literal, hex_literal, integer_literal, line_string_literal, multi_line_string_literal, "nil", oct_literal, raw_string_literal, real_literal, regex_literal, simple_identifier]
   diagnostic:
   dictionary_literal:
-    key*: expression
-    value*: expression
+    element*: dictionary_literal_item
+  dictionary_literal_item:
+    key: expression
+    value: expression
   dictionary_type:
     key: type
     value: type
   didset_clause:
-    $children*: [modifiers, simple_identifier, statements]
+    body: block
+    modifiers?: modifiers
+    parameter?: simple_identifier
   directive:
-    $children*: [boolean_literal, integer_literal, simple_identifier]
+    condition?: compilation_condition
   directly_assignable_expression:
-    $children: expression
+    expr: expression
   disjunction_expression:
     lhs: expression
     op: "||"
     rhs: expression
   do_statement:
-    $children*: [catch_block, statements]
-  else:
+    body: block
+    catch*: catch_block
+  enum_case_entry:
+    data_contents?: enum_type_parameters
+    name: simple_identifier
+    raw_value?: expression
   enum_class_body:
-    $children*: [enum_entry, type_level_declaration]
+    member*: [enum_entry, type_level_declaration]
   enum_entry:
-    $children?: modifiers
-    data_contents*: enum_type_parameters
-    name+: simple_identifier
-    raw_value*: expression
+    case+: enum_case_entry
+    modifiers?: modifiers
+  enum_type_parameter:
+    default_value?: expression
+    external_name?: wildcard_pattern
+    name?: simple_identifier
+    type: type
   enum_type_parameters:
-    $children*: [expression, type, wildcard_pattern]
+    parameter*: enum_type_parameter
   equality_constraint:
-    $children*: attribute
+    attribute*: attribute
     constrained_type: [identifier, nested_type_identifier]
     must_equal: type
   equality_expression:
@@ -243,106 +295,141 @@ named:
     op: ["!=", "!==", "==", "==="]
     rhs: expression
   existential_type:
-    $children: unannotated_type
+    name: unannotated_type
   external_macro_definition:
-    $children: value_arguments
+    arguments: value_arguments
   for_statement:
-    $children*: [statements, try_operator, type_annotation, where_clause]
+    body: block
     collection: expression
     item: pattern
+    try?: try_operator
+    type?: type_annotation
+    where?: where_clause
   fully_open_range:
-  function_body:
-    $children?: statements
   function_declaration:
-    $children*: [attribute, inheritance_modifier, modifiers, ownership_modifier, parameter, property_behavior_modifier, throws, throws_clause, type_constraints, type_parameters]
-    body: function_body
-    default_value*: expression
+    async?: "async"
+    body: block
+    modifiers*: [attribute, inheritance_modifier, modifiers, ownership_modifier, property_behavior_modifier]
     name: [referenceable_operator, simple_identifier]
+    parameter*: function_parameter
     return_type?: [implicitly_unwrapped_type, type]
+    throws?: [throws, throws_clause]
+    type_constraints?: type_constraints
+    type_parameters?: type_parameters
   function_modifier:
+  function_parameter:
+    attribute?: attribute
+    default_value?: expression
+    parameter: parameter
   function_type:
-    $children?: [throws, throws_clause]
+    async?: "async"
     params: unannotated_type
     return_type: type
+    throws?: [throws, throws_clause]
   getter_specifier:
-    $children*: [mutation_modifier, throws, throws_clause]
+    effect*: [async_keyword, throws, throws_clause]
+    mutation?: mutation_modifier
   guard_statement:
-    $children+: [else, statements]
+    body: block
     condition+: if_condition
   hex_literal:
   identifier:
-    $children+: simple_identifier
+    part+: simple_identifier
   if_condition:
-    $children: [availability_condition, expression, if_let_binding]
+    kind: [availability_condition, expression, if_let_binding]
   if_let_binding:
-    $children*: [expression, pattern, type, type_annotation, user_type, value_binding_pattern, where_clause, wildcard_pattern]
-    bound_identifier?: simple_identifier
+    pattern: pattern
+    type?: type_annotation
+    value?: expression
+    where?: where_clause
   if_statement:
-    $children*: [else, if_statement, statements]
+    body: block
     condition+: if_condition
+    else_branch?: [block, if_statement]
   implicitly_unwrapped_type:
-    $children: type
+    name: type
   import_declaration:
-    $children+: [identifier, modifiers]
+    modifiers?: modifiers
+    name: identifier
   infix_expression:
     lhs: expression
     op: custom_operator
     rhs: expression
   inheritance_constraint:
-    $children*: attribute
+    attribute*: attribute
     constrained_type: [identifier, nested_type_identifier]
     inherits_from: [implicitly_unwrapped_type, type]
   inheritance_modifier:
   inheritance_specifier:
     inherits_from: [function_type, suppressed_constraint, user_type]
   init_declaration:
-    $children*: [attribute, bang, modifiers, parameter, throws, throws_clause, type_constraints, type_parameters]
-    body?: function_body
-    default_value*: expression
-    name: "init"
+    async?: "async"
+    bang?: bang
+    body?: block
+    modifiers?: modifiers
+    parameter*: function_parameter
+    throws?: [throws, throws_clause]
+    type_constraints?: type_constraints
+    type_parameters?: type_parameters
   integer_literal:
   interpolated_expression:
-    $children?: type_modifiers
     name?: value_argument_label
     reference_specifier*: value_argument_label
+    type_modifiers?: type_modifiers
     value?: expression
+  key_path_component:
+    name?: simple_identifier
+    postfix*: key_path_postfix
   key_path_expression:
-    $children*: [array_type, bang, dictionary_type, simple_identifier, type_arguments, type_identifier, value_argument]
+    component*: key_path_component
+    type?: [array_type, dictionary_type, simple_user_type]
+  key_path_postfix:
+    argument*: value_argument
+    force_unwrap?: bang
   key_path_string_expression:
-    $children: expression
+    expr: expression
   lambda_function_type:
-    $children*: [lambda_function_type_parameters, throws, throws_clause]
+    async?: "async"
+    params?: lambda_function_type_parameters
     return_type?: [implicitly_unwrapped_type, type]
+    throws?: [throws, throws_clause]
   lambda_function_type_parameters:
-    $children+: lambda_parameter
+    parameter+: lambda_parameter
   lambda_literal:
-    $children*: [attribute, statements]
+    attribute*: attribute
     captures?: capture_list
+    statement*: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
     type?: lambda_function_type
   lambda_parameter:
-    $children?: [parameter_modifiers, self_expression]
     external_name?: simple_identifier
-    name?: simple_identifier
+    modifiers?: parameter_modifiers
+    name: [self_expression, simple_identifier]
     type?: [implicitly_unwrapped_type, type]
   line_str_text:
   line_string_literal:
     interpolation*: interpolated_expression
     text*: [line_str_text, str_escaped_char]
   macro_declaration:
-    $children+: [attribute, modifiers, parameter, simple_identifier, type_constraints, type_parameters, unannotated_type]
-    default_value*: expression
     definition?: macro_definition
+    modifiers?: modifiers
+    name: simple_identifier
+    parameter*: function_parameter
+    return_type?: unannotated_type
+    type_constraints?: type_constraints
+    type_parameters?: type_parameters
   macro_definition:
     body: [expression, external_macro_definition]
   macro_invocation:
-    $children+: [call_suffix, simple_identifier, type_parameters]
+    name: simple_identifier
+    suffix: call_suffix
+    type_parameters?: type_parameters
   member_modifier:
   metatype:
-    $children: unannotated_type
+    name: unannotated_type
   modifiers:
-    $children+: [attribute, function_modifier, inheritance_modifier, member_modifier, mutation_modifier, ownership_modifier, parameter_modifier, property_behavior_modifier, property_modifier, visibility_modifier]
+    modifier+: [attribute, function_modifier, inheritance_modifier, member_modifier, mutation_modifier, ownership_modifier, parameter_modifier, property_behavior_modifier, property_modifier, visibility_modifier]
   modify_specifier:
-    $children?: mutation_modifier
+    mutation?: mutation_modifier
   multi_line_str_text:
   multi_line_string_literal:
     interpolation*: interpolated_expression
@@ -355,80 +442,109 @@ named:
   mutation_modifier:
   navigation_expression:
     suffix: navigation_suffix
-    target+: ["(", ")", array_type, dictionary_type, existential_type, expression, opaque_type, user_type]
+    target: [array_type, dictionary_type, expression, parenthesized_type, user_type]
   navigation_suffix:
     suffix: [integer_literal, simple_identifier]
   nested_type_identifier:
-    $children+: [simple_identifier, unannotated_type]
+    base: unannotated_type
+    member*: simple_identifier
   nil_coalescing_expression:
     if_nil: expression
     value: expression
   oct_literal:
   opaque_type:
-    $children: unannotated_type
+    name: unannotated_type
   open_end_range_expression:
     start: expression
   open_start_range_expression:
     end: expression
   operator_declaration:
-    $children+: [deprecated_operator_declaration_body, referenceable_operator, simple_identifier]
+    body?: deprecated_operator_declaration_body
+    kind: ["infix", "postfix", "prefix"]
+    name: referenceable_operator
+    precedence_group?: simple_identifier
   optional_chain_marker:
-    $children: expression
+    expr: expression
   optional_type:
     wrapped: [array_type, dictionary_type, tuple_type, user_type]
   ownership_modifier:
   parameter:
-    $children?: parameter_modifiers
     external_name?: simple_identifier
+    modifiers?: parameter_modifiers
     name: simple_identifier
     type: [implicitly_unwrapped_type, type]
   parameter_modifier:
   parameter_modifiers:
-    $children+: parameter_modifier
+    modifier+: parameter_modifier
+  parenthesized_type:
+    type: [dictionary_type, existential_type, opaque_type]
   pattern:
-    $children*: [expression, pattern, type, user_type, value_binding_pattern, wildcard_pattern]
+    binding?: value_binding_pattern
     bound_identifier?: simple_identifier
+    kind: [binding_pattern, case_pattern, expression, tuple_pattern, type_casting_pattern, wildcard_pattern]
   playground_literal:
-    $children+: expression
+    argument+: playground_literal_argument
+    kind: ["colorLiteral", "fileLiteral", "imageLiteral"]
+  playground_literal_argument:
+    name: simple_identifier
+    value: expression
   postfix_expression:
     operation: ["++", "--", bang]
     target: expression
   precedence_group_attribute:
-    $children+: [boolean_literal, simple_identifier]
+    name: simple_identifier
+    value: [boolean_literal, simple_identifier]
   precedence_group_attributes:
-    $children+: precedence_group_attribute
+    attribute+: precedence_group_attribute
   precedence_group_declaration:
-    $children+: [precedence_group_attributes, simple_identifier]
+    attributes?: precedence_group_attributes
+    name: simple_identifier
   prefix_expression:
     operation: ["&", "+", "++", "-", "--", ".", bang, custom_operator, "~"]
     target: expression
   property_behavior_modifier:
+  property_binding:
+    computed_value?: computed_property
+    name: pattern
+    observers?: willset_didset_block
+    type?: type_annotation
+    type_constraints?: type_constraints
+    value?: expression
   property_declaration:
-    $children*: [attribute, inheritance_modifier, modifiers, ownership_modifier, property_behavior_modifier, type_annotation, type_constraints, value_binding_pattern, willset_didset_block]
-    computed_value*: computed_property
-    name+: pattern
-    value*: expression
+    binding: value_binding_pattern
+    declarator+: property_binding
+    modifiers*: [attribute, inheritance_modifier, modifiers, ownership_modifier, property_behavior_modifier]
   property_modifier:
   protocol_body:
-    $children*: protocol_member_declaration
+    member*: protocol_member_declaration
   protocol_composition_type:
-    $children+: unannotated_type
+    type+: unannotated_type
   protocol_declaration:
-    $children*: [attribute, inheritance_specifier, modifiers, type_constraints, type_parameters]
+    attribute*: attribute
     body: protocol_body
-    declaration_kind: "protocol"
+    inherits*: inheritance_specifier
+    modifiers?: modifiers
     name: type_identifier
+    type_constraints?: type_constraints
+    type_parameters?: type_parameters
   protocol_function_declaration:
-    $children*: [attribute, modifiers, parameter, throws, throws_clause, type_constraints, type_parameters]
-    body?: function_body
-    default_value*: expression
+    async?: "async"
+    body?: block
+    modifiers?: modifiers
     name: [referenceable_operator, simple_identifier]
+    parameter*: function_parameter
     return_type?: [implicitly_unwrapped_type, type]
+    throws?: [throws, throws_clause]
+    type_constraints?: type_constraints
+    type_parameters?: type_parameters
   protocol_property_declaration:
-    $children+: [modifiers, protocol_property_requirements, type_annotation, type_constraints]
+    modifiers?: modifiers
     name: pattern
+    requirements: protocol_property_requirements
+    type?: type_annotation
+    type_constraints?: type_constraints
   protocol_property_requirements:
-    $children*: [getter_specifier, setter_specifier]
+    accessor*: [getter_specifier, setter_specifier]
   range_expression:
     end: expression
     op: ["...", "..<"]
@@ -436,48 +552,57 @@ named:
   raw_str_continuing_indicator:
   raw_str_end_part:
   raw_str_interpolation:
-    $children: raw_str_interpolation_start
     interpolation+: interpolated_expression
+    start: raw_str_interpolation_start
   raw_str_interpolation_start:
   raw_str_part:
   raw_string_literal:
-    $children*: raw_str_continuing_indicator
+    continuing*: raw_str_continuing_indicator
     interpolation*: raw_str_interpolation
     text+: [raw_str_end_part, raw_str_part]
   real_literal:
   referenceable_operator:
-    $children?: [bang, custom_operator]
+    operator: ["!=", "!==", "%", "%=", "&", "*", "*=", "+", "++", "+=", "-", "--", "-=", "/", "/=", "<", "<<", "<=", "=", "==", "===", ">", ">=", ">>", "^", bang, custom_operator, "|", "~"]
   regex_literal:
   repeat_while_statement:
-    $children?: statements
+    body: block
     condition+: if_condition
   selector_expression:
-    $children: expression
+    expr: expression
   self_expression:
   setter_specifier:
-    $children?: mutation_modifier
+    mutation?: mutation_modifier
   shebang_line:
   simple_identifier:
+  simple_user_type:
+    arguments?: type_arguments
+    name: type_identifier
   source_file:
-    $children*: [do_statement, expression, for_statement, global_declaration, guard_statement, repeat_while_statement, shebang_line, statement_label, throw_keyword, while_statement]
+    shebang?: shebang_line
+    statement*: [do_statement, expression, for_statement, global_declaration, guard_statement, repeat_while_statement, statement_label, throw_keyword, while_statement]
   special_literal:
   statement_label:
-  statements:
-    $children+: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
   str_escaped_char:
   subscript_declaration:
-    $children+: [attribute, computed_property, modifiers, parameter, type_constraints, type_parameters]
-    default_value*: expression
+    body: computed_property
+    modifiers?: modifiers
+    parameter*: function_parameter
     return_type?: [implicitly_unwrapped_type, type]
+    type_constraints?: type_constraints
+    type_parameters?: type_parameters
   super_expression:
   suppressed_constraint:
     suppressed: type_identifier
   switch_entry:
-    $children+: [default_keyword, expression, modifiers, statements, switch_pattern, where_keyword]
+    default?: default_keyword
+    modifiers?: modifiers
+    pattern*: switch_pattern
+    statement+: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
+    where?: where_clause
   switch_pattern:
-    $children: pattern
+    pattern: pattern
   switch_statement:
-    $children*: switch_entry
+    entry*: switch_entry
     expr: expression
   ternary_expression:
     condition: expression
@@ -488,76 +613,95 @@ named:
   throws_clause:
     type: unannotated_type
   try_expression:
-    $children: try_operator
     expr: expression
+    operator: try_operator
   try_operator:
   tuple_expression:
-    name*: simple_identifier
-    value+: expression
+    element+: tuple_expression_item
+  tuple_expression_item:
+    name?: simple_identifier
+    value: expression
+  tuple_pattern:
+    item+: tuple_pattern_item
+  tuple_pattern_item:
+    name?: simple_identifier
+    pattern: pattern
   tuple_type:
-    $children?: tuple_type_item
     element*: tuple_type_item
   tuple_type_item:
-    $children*: [dictionary_type, existential_type, opaque_type, parameter_modifiers, wildcard_pattern]
+    external_name?: wildcard_pattern
+    modifiers?: parameter_modifiers
     name?: simple_identifier
-    type?: type
+    type: [dictionary_type, existential_type, opaque_type, type]
   type:
     modifiers?: type_modifiers
     name: unannotated_type
   type_annotation:
     type: [implicitly_unwrapped_type, type]
   type_arguments:
-    $children+: type
+    argument+: type
+  type_casting_pattern:
+    pattern?: pattern
+    type: type
   type_constraint:
-    $children: [equality_constraint, inheritance_constraint]
+    constraint: [equality_constraint, inheritance_constraint]
   type_constraints:
-    $children+: [type_constraint, where_keyword]
+    constraint+: type_constraint
+    keyword: where_keyword
   type_identifier:
   type_modifiers:
-    $children+: attribute
+    attribute+: attribute
   type_pack_expansion:
-    $children: unannotated_type
+    name: unannotated_type
   type_parameter:
-    $children+: [type, type_identifier, type_parameter_modifiers, type_parameter_pack]
+    modifiers?: type_parameter_modifiers
+    name: [type_identifier, type_parameter_pack]
+    type?: type
   type_parameter_modifiers:
-    $children+: attribute
+    attribute+: attribute
   type_parameter_pack:
-    $children: unannotated_type
+    name: unannotated_type
   type_parameters:
-    $children+: [type_constraints, type_parameter]
+    constraints?: type_constraints
+    parameter+: type_parameter
   typealias_declaration:
-    $children*: [attribute, inheritance_modifier, modifiers, ownership_modifier, property_behavior_modifier, type_parameters]
+    modifiers*: [attribute, inheritance_modifier, modifiers, ownership_modifier, property_behavior_modifier]
     name: type_identifier
+    type_parameters?: type_parameters
     value: type
   user_type:
-    $children+: [type_arguments, type_identifier]
+    part+: simple_user_type
   value_argument:
-    $children?: type_modifiers
     name?: value_argument_label
     reference_specifier*: value_argument_label
+    type_modifiers?: type_modifiers
     value?: expression
   value_argument_label:
-    $children: simple_identifier
+    name: simple_identifier
   value_arguments:
-    $children*: value_argument
+    argument*: value_argument
   value_binding_pattern:
     mutability: ["let", "var"]
   value_pack_expansion:
-    $children: expression
+    expr: expression
   value_parameter_pack:
-    $children: expression
+    expr: expression
   visibility_modifier:
   where_clause:
-    $children+: [expression, where_keyword]
+    expr: expression
+    keyword: where_keyword
   where_keyword:
   while_statement:
-    $children?: statements
+    body: block
     condition+: if_condition
   wildcard_pattern:
   willset_clause:
-    $children*: [modifiers, simple_identifier, statements]
+    body: block
+    modifiers?: modifiers
+    parameter?: simple_identifier
   willset_didset_block:
-    $children+: [didset_clause, willset_clause]
+    didset?: didset_clause
+    willset?: willset_clause
 
 unnamed:
   - "?"
@@ -645,6 +789,7 @@ unnamed:
   - "dsohandle"
   - "dynamic"
   - "each"
+  - "else"
   - "enum"
   - "extension"
   - "externalMacro"
diff --git a/unified/ql/lib/codeql/unified/Ast.qll b/unified/ql/lib/codeql/unified/Ast.qll
index 5b9491fdb9fe..d9060c26f0f2 100644
--- a/unified/ql/lib/codeql/unified/Ast.qll
+++ b/unified/ql/lib/codeql/unified/Ast.qll
@@ -1,5 +1,5 @@
 /**
- * CodeQL library for Swift
+ * CodeQL library for Unified
  * Automatically generated from the tree-sitter grammar; do not edit
  */
 
@@ -24,20 +24,20 @@ private predicate discardLocation(@location_default loc) {
 }
 
 overlay[local]
-module Swift {
+module Unified {
   /** The base class for all AST nodes */
-  class AstNode extends @swift_ast_node {
+  class AstNode extends @unified_ast_node {
     /** Gets a string representation of this element. */
     string toString() { result = this.getAPrimaryQlClass() }
 
     /** Gets the location of this element. */
-    final L::Location getLocation() { swift_ast_node_location(this, result) }
+    final L::Location getLocation() { unified_ast_node_location(this, result) }
 
     /** Gets the parent of this element. */
-    final AstNode getParent() { swift_ast_node_parent(this, result, _) }
+    final AstNode getParent() { unified_ast_node_parent(this, result, _) }
 
     /** Gets the index of this node among the children of its parent. */
-    final int getParentIndex() { swift_ast_node_parent(this, _, result) }
+    final int getParentIndex() { unified_ast_node_parent(this, _, result) }
 
     /** Gets a field or child node of this node. */
     AstNode getAFieldOrChild() { none() }
@@ -50,9 +50,9 @@ module Swift {
   }
 
   /** A token. */
-  class Token extends @swift_token, AstNode {
+  class Token extends @unified_token, AstNode {
     /** Gets the value of this token. */
-    final string getValue() { swift_tokeninfo(this, _, result) }
+    final string getValue() { unified_tokeninfo(this, _, result) }
 
     /** Gets a string representation of this element. */
     final override string toString() { result = this.getValue() }
@@ -61,2766 +61,386 @@ module Swift {
     override string getAPrimaryQlClass() { result = "Token" }
   }
 
-  /** A reserved word. */
-  class ReservedWord extends @swift_reserved_word, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ReservedWord" }
-  }
-
   /** Gets the file containing the given `node`. */
-  private @file getNodeFile(@swift_ast_node node) {
-    exists(@location_default loc | swift_ast_node_location(node, loc) |
+  private @file getNodeFile(@unified_ast_node node) {
+    exists(@location_default loc | unified_ast_node_location(node, loc) |
       locations_default(loc, result, _, _, _, _)
     )
   }
 
   /** Holds if `node` is in the `file` and is part of the overlay base database. */
-  private predicate discardableAstNode(@file file, @swift_ast_node node) {
+  private predicate discardableAstNode(@file file, @unified_ast_node node) {
     not isOverlay() and file = getNodeFile(node)
   }
 
   /** Holds if `node` should be discarded, because it is part of the overlay base and is in a file that was also extracted as part of the overlay database. */
   overlay[discard_entity]
-  private predicate discardAstNode(@swift_ast_node node) {
+  private predicate discardAstNode(@unified_ast_node node) {
     exists(@file file, string path | files(file, path) |
       discardableAstNode(file, node) and overlayChangedFiles(path)
     )
   }
 
-  /** A class representing `additive_expression` nodes. */
-  class AdditiveExpression extends @swift_additive_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "AdditiveExpression" }
-
-    /** Gets the node corresponding to the field `lhs`. */
-    final Expression getLhs() { swift_additive_expression_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `op`. */
-    final string getOp() {
-      exists(int value | swift_additive_expression_def(this, _, value, _) |
-        result = "+" and value = 0
-        or
-        result = "-" and value = 1
-      )
-    }
-
-    /** Gets the node corresponding to the field `rhs`. */
-    final Expression getRhs() { swift_additive_expression_def(this, _, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_additive_expression_def(this, result, _, _) or
-      swift_additive_expression_def(this, _, _, result)
-    }
-  }
-
-  /** A class representing `array_literal` nodes. */
-  class ArrayLiteral extends @swift_array_literal, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ArrayLiteral" }
-
-    /** Gets the node corresponding to the field `element`. */
-    final Expression getElement(int i) { swift_array_literal_element(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_array_literal_element(this, _, result) }
-  }
-
-  /** A class representing `array_type` nodes. */
-  class ArrayType extends @swift_array_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ArrayType" }
-
-    /** Gets the node corresponding to the field `element`. */
-    final Type getElement() { swift_array_type_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_array_type_def(this, result) }
-  }
-
-  /** A class representing `as_expression` nodes. */
-  class AsExpression extends @swift_as_expression, AstNode {
+  /** A class representing `apply_pattern` nodes. */
+  class ApplyPattern extends @unified_apply_pattern, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "AsExpression" }
-
-    /** Gets the node corresponding to the field `expr`. */
-    final Expression getExpr() { swift_as_expression_def(this, result, _, _) }
+    final override string getAPrimaryQlClass() { result = "ApplyPattern" }
 
-    /** Gets the node corresponding to the field `type`. */
-    final Type getType() { swift_as_expression_def(this, _, result, _) }
+    /** Gets the node corresponding to the field `argument`. */
+    final Pattern getArgument(int i) { unified_apply_pattern_argument(this, i, result) }
 
-    /** Gets the child of this node. */
-    final AsOperator getChild() { swift_as_expression_def(this, _, _, result) }
+    /** Gets the node corresponding to the field `constructor`. */
+    final Expr getConstructor() { unified_apply_pattern_def(this, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_as_expression_def(this, result, _, _) or
-      swift_as_expression_def(this, _, result, _) or
-      swift_as_expression_def(this, _, _, result)
+      unified_apply_pattern_argument(this, _, result) or unified_apply_pattern_def(this, result)
     }
   }
 
-  /** A class representing `as_operator` tokens. */
-  class AsOperator extends @swift_token_as_operator, Token {
+  /** A class representing `binary_expr` nodes. */
+  class BinaryExpr extends @unified_binary_expr, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "AsOperator" }
-  }
+    final override string getAPrimaryQlClass() { result = "BinaryExpr" }
 
-  /** A class representing `assignment` nodes. */
-  class Assignment extends @swift_assignment, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Assignment" }
+    /** Gets the node corresponding to the field `left`. */
+    final Expr getLeft() { unified_binary_expr_def(this, result, _, _) }
 
     /** Gets the node corresponding to the field `operator`. */
-    final string getOperator() {
-      exists(int value | swift_assignment_def(this, value, _, _) |
-        result = "%=" and value = 0
-        or
-        result = "*=" and value = 1
-        or
-        result = "+=" and value = 2
-        or
-        result = "-=" and value = 3
-        or
-        result = "/=" and value = 4
-        or
-        result = "=" and value = 5
-      )
-    }
-
-    /** Gets the node corresponding to the field `result`. */
-    final Expression getResult() { swift_assignment_def(this, _, result, _) }
+    final Operator getOperator() { unified_binary_expr_def(this, _, result, _) }
 
-    /** Gets the node corresponding to the field `target`. */
-    final DirectlyAssignableExpression getTarget() { swift_assignment_def(this, _, _, result) }
+    /** Gets the node corresponding to the field `right`. */
+    final Expr getRight() { unified_binary_expr_def(this, _, _, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_assignment_def(this, _, result, _) or swift_assignment_def(this, _, _, result)
+      unified_binary_expr_def(this, result, _, _) or
+      unified_binary_expr_def(this, _, result, _) or
+      unified_binary_expr_def(this, _, _, result)
     }
   }
 
-  /** A class representing `associatedtype_declaration` nodes. */
-  class AssociatedtypeDeclaration extends @swift_associatedtype_declaration, AstNode {
+  /** A class representing `block_stmt` nodes. */
+  class BlockStmt extends @unified_block_stmt, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "AssociatedtypeDeclaration" }
-
-    /** Gets the node corresponding to the field `default_value`. */
-    final Type getDefaultValue() { swift_associatedtype_declaration_default_value(this, result) }
-
-    /** Gets the node corresponding to the field `must_inherit`. */
-    final Type getMustInherit() { swift_associatedtype_declaration_must_inherit(this, result) }
-
-    /** Gets the node corresponding to the field `name`. */
-    final TypeIdentifier getName() { swift_associatedtype_declaration_def(this, result) }
+    final override string getAPrimaryQlClass() { result = "BlockStmt" }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_associatedtype_declaration_child(this, i, result) }
+    /** Gets the node corresponding to the field `body`. */
+    final Stmt getBody(int i) { unified_block_stmt_body(this, i, result) }
 
     /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_associatedtype_declaration_default_value(this, result) or
-      swift_associatedtype_declaration_must_inherit(this, result) or
-      swift_associatedtype_declaration_def(this, result) or
-      swift_associatedtype_declaration_child(this, _, result)
-    }
+    final override AstNode getAFieldOrChild() { unified_block_stmt_body(this, _, result) }
   }
 
-  /** A class representing `attribute` nodes. */
-  class Attribute extends @swift_attribute, AstNode {
+  /** A class representing `call_expr` nodes. */
+  class CallExpr extends @unified_call_expr, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Attribute" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_attribute_child(this, i, result) }
+    final override string getAPrimaryQlClass() { result = "CallExpr" }
 
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_attribute_child(this, _, result) }
-  }
-
-  /** A class representing `availability_condition` nodes. */
-  class AvailabilityCondition extends @swift_availability_condition, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "AvailabilityCondition" }
+    /** Gets the node corresponding to the field `argument`. */
+    final Expr getArgument(int i) { unified_call_expr_argument(this, i, result) }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_availability_condition_child(this, i, result) }
+    /** Gets the node corresponding to the field `function`. */
+    final Expr getFunction() { unified_call_expr_def(this, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_availability_condition_child(this, _, result)
+      unified_call_expr_argument(this, _, result) or unified_call_expr_def(this, result)
     }
   }
 
-  /** A class representing `await_expression` nodes. */
-  class AwaitExpression extends @swift_await_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "AwaitExpression" }
-
-    /** Gets the node corresponding to the field `expr`. */
-    final Expression getExpr() { swift_await_expression_expr(this, result) }
-
-    /** Gets the child of this node. */
-    final Expression getChild() { swift_await_expression_child(this, result) }
+  class Condition extends @unified_condition, AstNode { }
 
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_await_expression_expr(this, result) or swift_await_expression_child(this, result)
-    }
-  }
-
-  /** A class representing `bang` tokens. */
-  class Bang extends @swift_token_bang, Token {
+  /** A class representing `empty_stmt` tokens. */
+  class EmptyStmt extends @unified_token_empty_stmt, Token {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Bang" }
+    final override string getAPrimaryQlClass() { result = "EmptyStmt" }
   }
 
-  /** A class representing `bin_literal` tokens. */
-  class BinLiteral extends @swift_token_bin_literal, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "BinLiteral" }
-  }
+  class Expr extends @unified_expr, AstNode { }
 
-  /** A class representing `bitwise_operation` nodes. */
-  class BitwiseOperation extends @swift_bitwise_operation, AstNode {
+  /** A class representing `expr_condition` nodes. */
+  class ExprCondition extends @unified_expr_condition, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "BitwiseOperation" }
-
-    /** Gets the node corresponding to the field `lhs`. */
-    final Expression getLhs() { swift_bitwise_operation_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `op`. */
-    final string getOp() {
-      exists(int value | swift_bitwise_operation_def(this, _, value, _) |
-        result = "&" and value = 0
-        or
-        result = "<<" and value = 1
-        or
-        result = ">>" and value = 2
-        or
-        result = "^" and value = 3
-        or
-        result = "|" and value = 4
-      )
-    }
+    final override string getAPrimaryQlClass() { result = "ExprCondition" }
 
-    /** Gets the node corresponding to the field `rhs`. */
-    final Expression getRhs() { swift_bitwise_operation_def(this, _, _, result) }
+    /** Gets the node corresponding to the field `expr`. */
+    final Expr getExpr() { unified_expr_condition_def(this, result) }
 
     /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_bitwise_operation_def(this, result, _, _) or
-      swift_bitwise_operation_def(this, _, _, result)
-    }
-  }
-
-  /** A class representing `boolean_literal` tokens. */
-  class BooleanLiteral extends @swift_token_boolean_literal, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "BooleanLiteral" }
+    final override AstNode getAFieldOrChild() { unified_expr_condition_def(this, result) }
   }
 
-  /** A class representing `call_expression` nodes. */
-  class CallExpression extends @swift_call_expression, AstNode {
+  /** A class representing `expr_stmt` nodes. */
+  class ExprStmt extends @unified_expr_stmt, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "CallExpression" }
+    final override string getAPrimaryQlClass() { result = "ExprStmt" }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_call_expression_child(this, i, result) }
+    /** Gets the node corresponding to the field `expr`. */
+    final Expr getExpr() { unified_expr_stmt_def(this, result) }
 
     /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_call_expression_child(this, _, result) }
+    final override AstNode getAFieldOrChild() { unified_expr_stmt_def(this, result) }
   }
 
-  /** A class representing `call_suffix` nodes. */
-  class CallSuffix extends @swift_call_suffix, AstNode {
+  /** A class representing `guard_if_stmt` nodes. */
+  class GuardIfStmt extends @unified_guard_if_stmt, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "CallSuffix" }
+    final override string getAPrimaryQlClass() { result = "GuardIfStmt" }
 
-    /** Gets the node corresponding to the field `name`. */
-    final SimpleIdentifier getName(int i) { swift_call_suffix_name(this, i, result) }
+    /** Gets the node corresponding to the field `condition`. */
+    final Condition getCondition() { unified_guard_if_stmt_def(this, result, _) }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_call_suffix_child(this, i, result) }
+    /** Gets the node corresponding to the field `else`. */
+    final Stmt getElse() { unified_guard_if_stmt_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_call_suffix_name(this, _, result) or swift_call_suffix_child(this, _, result)
+      unified_guard_if_stmt_def(this, result, _) or unified_guard_if_stmt_def(this, _, result)
     }
   }
 
-  /** A class representing `capture_list` nodes. */
-  class CaptureList extends @swift_capture_list, AstNode {
+  /** A class representing `identifier` tokens. */
+  class Identifier extends @unified_token_identifier, Token {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "CaptureList" }
-
-    /** Gets the `i`th child of this node. */
-    final CaptureListItem getChild(int i) { swift_capture_list_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_capture_list_child(this, _, result) }
+    final override string getAPrimaryQlClass() { result = "Identifier" }
   }
 
-  /** A class representing `capture_list_item` nodes. */
-  class CaptureListItem extends @swift_capture_list_item, AstNode {
+  /** A class representing `if_stmt` nodes. */
+  class IfStmt extends @unified_if_stmt, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "CaptureListItem" }
-
-    /** Gets the node corresponding to the field `name`. */
-    final AstNode getName() { swift_capture_list_item_def(this, result) }
-
-    /** Gets the node corresponding to the field `value`. */
-    final Expression getValue() { swift_capture_list_item_value(this, result) }
-
-    /** Gets the child of this node. */
-    final OwnershipModifier getChild() { swift_capture_list_item_child(this, result) }
+    final override string getAPrimaryQlClass() { result = "IfStmt" }
 
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_capture_list_item_def(this, result) or
-      swift_capture_list_item_value(this, result) or
-      swift_capture_list_item_child(this, result)
-    }
-  }
-
-  /** A class representing `catch_block` nodes. */
-  class CatchBlock extends @swift_catch_block, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "CatchBlock" }
+    /** Gets the node corresponding to the field `condition`. */
+    final Condition getCondition() { unified_if_stmt_def(this, result) }
 
-    /** Gets the node corresponding to the field `error`. */
-    final Pattern getError() { swift_catch_block_error(this, result) }
+    /** Gets the node corresponding to the field `else`. */
+    final Stmt getElse() { unified_if_stmt_else(this, result) }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_catch_block_child(this, i, result) }
+    /** Gets the node corresponding to the field `then`. */
+    final Stmt getThen() { unified_if_stmt_then(this, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_catch_block_error(this, result) or swift_catch_block_child(this, _, result)
+      unified_if_stmt_def(this, result) or
+      unified_if_stmt_else(this, result) or
+      unified_if_stmt_then(this, result)
     }
   }
 
-  /** A class representing `catch_keyword` tokens. */
-  class CatchKeyword extends @swift_token_catch_keyword, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "CatchKeyword" }
-  }
-
-  /** A class representing `check_expression` nodes. */
-  class CheckExpression extends @swift_check_expression, AstNode {
+  /** A class representing `ignore_pattern` tokens. */
+  class IgnorePattern extends @unified_token_ignore_pattern, Token {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "CheckExpression" }
-
-    /** Gets the node corresponding to the field `op`. */
-    final string getOp() {
-      exists(int value | swift_check_expression_def(this, value, _, _) |
-        (result = "is" and value = 0)
-      )
-    }
-
-    /** Gets the node corresponding to the field `target`. */
-    final Expression getTarget() { swift_check_expression_def(this, _, result, _) }
-
-    /** Gets the node corresponding to the field `type`. */
-    final Type getType() { swift_check_expression_def(this, _, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_check_expression_def(this, _, result, _) or
-      swift_check_expression_def(this, _, _, result)
-    }
+    final override string getAPrimaryQlClass() { result = "IgnorePattern" }
   }
 
-  /** A class representing `class_body` nodes. */
-  class ClassBody extends @swift_class_body, AstNode {
+  /** A class representing `int_literal` tokens. */
+  class IntLiteral extends @unified_token_int_literal, Token {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ClassBody" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_class_body_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_class_body_child(this, _, result) }
+    final override string getAPrimaryQlClass() { result = "IntLiteral" }
   }
 
-  /** A class representing `class_declaration` nodes. */
-  class ClassDeclaration extends @swift_class_declaration, AstNode {
+  /** A class representing `lambda_expr` nodes. */
+  class LambdaExpr extends @unified_lambda_expr, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ClassDeclaration" }
+    final override string getAPrimaryQlClass() { result = "LambdaExpr" }
 
     /** Gets the node corresponding to the field `body`. */
-    final AstNode getBody() { swift_class_declaration_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `declaration_kind`. */
-    final string getDeclarationKind() {
-      exists(int value | swift_class_declaration_def(this, _, value, _) |
-        result = "actor" and value = 0
-        or
-        result = "class" and value = 1
-        or
-        result = "enum" and value = 2
-        or
-        result = "extension" and value = 3
-        or
-        result = "struct" and value = 4
-      )
-    }
-
-    /** Gets the node corresponding to the field `name`. */
-    final AstNode getName() { swift_class_declaration_def(this, _, _, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_class_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_class_declaration_def(this, result, _, _) or
-      swift_class_declaration_def(this, _, _, result) or
-      swift_class_declaration_child(this, _, result)
-    }
-  }
-
-  /** A class representing `comment` tokens. */
-  class Comment extends @swift_token_comment, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Comment" }
-  }
-
-  /** A class representing `comparison_expression` nodes. */
-  class ComparisonExpression extends @swift_comparison_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ComparisonExpression" }
-
-    /** Gets the node corresponding to the field `lhs`. */
-    final Expression getLhs() { swift_comparison_expression_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `op`. */
-    final string getOp() {
-      exists(int value | swift_comparison_expression_def(this, _, value, _) |
-        result = "<" and value = 0
-        or
-        result = "<=" and value = 1
-        or
-        result = ">" and value = 2
-        or
-        result = ">=" and value = 3
-      )
-    }
-
-    /** Gets the node corresponding to the field `rhs`. */
-    final Expression getRhs() { swift_comparison_expression_def(this, _, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_comparison_expression_def(this, result, _, _) or
-      swift_comparison_expression_def(this, _, _, result)
-    }
-  }
-
-  /** A class representing `computed_getter` nodes. */
-  class ComputedGetter extends @swift_computed_getter, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ComputedGetter" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_computed_getter_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_computed_getter_child(this, _, result) }
-  }
-
-  /** A class representing `computed_modify` nodes. */
-  class ComputedModify extends @swift_computed_modify, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ComputedModify" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_computed_modify_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_computed_modify_child(this, _, result) }
-  }
-
-  /** A class representing `computed_property` nodes. */
-  class ComputedProperty extends @swift_computed_property, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ComputedProperty" }
+    final AstNode getBody() { unified_lambda_expr_def(this, result) }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_computed_property_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_computed_property_child(this, _, result) }
-  }
-
-  /** A class representing `computed_setter` nodes. */
-  class ComputedSetter extends @swift_computed_setter, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ComputedSetter" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_computed_setter_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_computed_setter_child(this, _, result) }
-  }
-
-  /** A class representing `conjunction_expression` nodes. */
-  class ConjunctionExpression extends @swift_conjunction_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ConjunctionExpression" }
-
-    /** Gets the node corresponding to the field `lhs`. */
-    final Expression getLhs() { swift_conjunction_expression_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `op`. */
-    final string getOp() {
-      exists(int value | swift_conjunction_expression_def(this, _, value, _) |
-        (result = "&&" and value = 0)
-      )
-    }
-
-    /** Gets the node corresponding to the field `rhs`. */
-    final Expression getRhs() { swift_conjunction_expression_def(this, _, _, result) }
+    /** Gets the node corresponding to the field `parameter`. */
+    final Parameter getParameter(int i) { unified_lambda_expr_parameter(this, i, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_conjunction_expression_def(this, result, _, _) or
-      swift_conjunction_expression_def(this, _, _, result)
+      unified_lambda_expr_def(this, result) or unified_lambda_expr_parameter(this, _, result)
     }
   }
 
-  /** A class representing `constructor_expression` nodes. */
-  class ConstructorExpression extends @swift_constructor_expression, AstNode {
+  /** A class representing `let_pattern_condition` nodes. */
+  class LetPatternCondition extends @unified_let_pattern_condition, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ConstructorExpression" }
+    final override string getAPrimaryQlClass() { result = "LetPatternCondition" }
 
-    /** Gets the node corresponding to the field `constructed_type`. */
-    final AstNode getConstructedType() { swift_constructor_expression_def(this, result, _) }
+    /** Gets the node corresponding to the field `pattern`. */
+    final Pattern getPattern() { unified_let_pattern_condition_def(this, result, _) }
 
-    /** Gets the child of this node. */
-    final ConstructorSuffix getChild() { swift_constructor_expression_def(this, _, result) }
+    /** Gets the node corresponding to the field `value`. */
+    final Expr getValue() { unified_let_pattern_condition_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_constructor_expression_def(this, result, _) or
-      swift_constructor_expression_def(this, _, result)
+      unified_let_pattern_condition_def(this, result, _) or
+      unified_let_pattern_condition_def(this, _, result)
     }
   }
 
-  /** A class representing `constructor_suffix` nodes. */
-  class ConstructorSuffix extends @swift_constructor_suffix, AstNode {
+  /** A class representing `member_access_expr` nodes. */
+  class MemberAccessExpr extends @unified_member_access_expr, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ConstructorSuffix" }
+    final override string getAPrimaryQlClass() { result = "MemberAccessExpr" }
 
-    /** Gets the node corresponding to the field `name`. */
-    final SimpleIdentifier getName(int i) { swift_constructor_suffix_name(this, i, result) }
+    /** Gets the node corresponding to the field `member`. */
+    final Identifier getMember() { unified_member_access_expr_def(this, result, _) }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_constructor_suffix_child(this, i, result) }
+    /** Gets the node corresponding to the field `target`. */
+    final Expr getTarget() { unified_member_access_expr_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_constructor_suffix_name(this, _, result) or
-      swift_constructor_suffix_child(this, _, result)
+      unified_member_access_expr_def(this, result, _) or
+      unified_member_access_expr_def(this, _, result)
     }
   }
 
-  /** A class representing `control_transfer_statement` nodes. */
-  class ControlTransferStatement extends @swift_control_transfer_statement, AstNode {
+  /** A class representing `name_expr` nodes. */
+  class NameExpr extends @unified_name_expr, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ControlTransferStatement" }
-
-    /** Gets the node corresponding to the field `result`. */
-    final Expression getResult() { swift_control_transfer_statement_result(this, result) }
+    final override string getAPrimaryQlClass() { result = "NameExpr" }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_control_transfer_statement_child(this, i, result) }
+    /** Gets the node corresponding to the field `identifier`. */
+    final Identifier getIdentifier() { unified_name_expr_def(this, result) }
 
     /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_control_transfer_statement_result(this, result) or
-      swift_control_transfer_statement_child(this, _, result)
-    }
-  }
-
-  /** A class representing `custom_operator` tokens. */
-  class CustomOperator extends @swift_token_custom_operator, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "CustomOperator" }
-  }
-
-  /** A class representing `default_keyword` tokens. */
-  class DefaultKeyword extends @swift_token_default_keyword, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DefaultKeyword" }
+    final override AstNode getAFieldOrChild() { unified_name_expr_def(this, result) }
   }
 
-  /** A class representing `deinit_declaration` nodes. */
-  class DeinitDeclaration extends @swift_deinit_declaration, AstNode {
+  /** A class representing `operator` tokens. */
+  class Operator extends @unified_token_operator, Token {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DeinitDeclaration" }
-
-    /** Gets the node corresponding to the field `body`. */
-    final FunctionBody getBody() { swift_deinit_declaration_def(this, result) }
-
-    /** Gets the child of this node. */
-    final Modifiers getChild() { swift_deinit_declaration_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_deinit_declaration_def(this, result) or swift_deinit_declaration_child(this, result)
-    }
+    final override string getAPrimaryQlClass() { result = "Operator" }
   }
 
-  /** A class representing `deprecated_operator_declaration_body` nodes. */
-  class DeprecatedOperatorDeclarationBody extends @swift_deprecated_operator_declaration_body,
-    AstNode
-  {
+  /** A class representing `parameter` nodes. */
+  class Parameter extends @unified_parameter, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DeprecatedOperatorDeclarationBody" }
+    final override string getAPrimaryQlClass() { result = "Parameter" }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) {
-      swift_deprecated_operator_declaration_body_child(this, i, result)
-    }
+    /** Gets the node corresponding to the field `pattern`. */
+    final Pattern getPattern() { unified_parameter_def(this, result) }
 
     /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_deprecated_operator_declaration_body_child(this, _, result)
-    }
+    final override AstNode getAFieldOrChild() { unified_parameter_def(this, result) }
   }
 
-  /** A class representing `diagnostic` tokens. */
-  class Diagnostic extends @swift_token_diagnostic, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Diagnostic" }
-  }
+  class Pattern extends @unified_pattern, AstNode { }
 
-  /** A class representing `dictionary_literal` nodes. */
-  class DictionaryLiteral extends @swift_dictionary_literal, AstNode {
+  /** A class representing `sequence_condition` nodes. */
+  class SequenceCondition extends @unified_sequence_condition, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DictionaryLiteral" }
+    final override string getAPrimaryQlClass() { result = "SequenceCondition" }
 
-    /** Gets the node corresponding to the field `key`. */
-    final Expression getKey(int i) { swift_dictionary_literal_key(this, i, result) }
+    /** Gets the node corresponding to the field `condition`. */
+    final Condition getCondition() { unified_sequence_condition_def(this, result) }
 
-    /** Gets the node corresponding to the field `value`. */
-    final Expression getValue(int i) { swift_dictionary_literal_value(this, i, result) }
+    /** Gets the node corresponding to the field `stmt`. */
+    final Stmt getStmt(int i) { unified_sequence_condition_stmt(this, i, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_dictionary_literal_key(this, _, result) or
-      swift_dictionary_literal_value(this, _, result)
+      unified_sequence_condition_def(this, result) or
+      unified_sequence_condition_stmt(this, _, result)
     }
   }
 
-  /** A class representing `dictionary_type` nodes. */
-  class DictionaryType extends @swift_dictionary_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DictionaryType" }
-
-    /** Gets the node corresponding to the field `key`. */
-    final Type getKey() { swift_dictionary_type_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `value`. */
-    final Type getValue() { swift_dictionary_type_def(this, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_dictionary_type_def(this, result, _) or swift_dictionary_type_def(this, _, result)
-    }
-  }
+  class Stmt extends @unified_stmt, AstNode { }
 
-  /** A class representing `didset_clause` nodes. */
-  class DidsetClause extends @swift_didset_clause, AstNode {
+  /** A class representing `string_literal` tokens. */
+  class StringLiteral extends @unified_token_string_literal, Token {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DidsetClause" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_didset_clause_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_didset_clause_child(this, _, result) }
+    final override string getAPrimaryQlClass() { result = "StringLiteral" }
   }
 
-  /** A class representing `directive` nodes. */
-  class Directive extends @swift_directive, AstNode {
+  /** A class representing `top_level` nodes. */
+  class TopLevel extends @unified_top_level, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Directive" }
+    final override string getAPrimaryQlClass() { result = "TopLevel" }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_directive_child(this, i, result) }
+    /** Gets the node corresponding to the field `body`. */
+    final AstNode getBody(int i) { unified_top_level_body(this, i, result) }
 
     /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_directive_child(this, _, result) }
+    final override AstNode getAFieldOrChild() { unified_top_level_body(this, _, result) }
   }
 
-  /** A class representing `directly_assignable_expression` nodes. */
-  class DirectlyAssignableExpression extends @swift_directly_assignable_expression, AstNode {
+  /** A class representing `tuple_pattern` nodes. */
+  class TuplePattern extends @unified_tuple_pattern, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DirectlyAssignableExpression" }
+    final override string getAPrimaryQlClass() { result = "TuplePattern" }
 
-    /** Gets the child of this node. */
-    final Expression getChild() { swift_directly_assignable_expression_def(this, result) }
+    /** Gets the node corresponding to the field `element`. */
+    final Pattern getElement(int i) { unified_tuple_pattern_element(this, i, result) }
 
     /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_directly_assignable_expression_def(this, result)
-    }
+    final override AstNode getAFieldOrChild() { unified_tuple_pattern_element(this, _, result) }
   }
 
-  /** A class representing `disjunction_expression` nodes. */
-  class DisjunctionExpression extends @swift_disjunction_expression, AstNode {
+  /** A class representing `unary_expr` nodes. */
+  class UnaryExpr extends @unified_unary_expr, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DisjunctionExpression" }
+    final override string getAPrimaryQlClass() { result = "UnaryExpr" }
 
-    /** Gets the node corresponding to the field `lhs`. */
-    final Expression getLhs() { swift_disjunction_expression_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `op`. */
-    final string getOp() {
-      exists(int value | swift_disjunction_expression_def(this, _, value, _) |
-        (result = "||" and value = 0)
-      )
-    }
+    /** Gets the node corresponding to the field `operand`. */
+    final Expr getOperand() { unified_unary_expr_def(this, result, _) }
 
-    /** Gets the node corresponding to the field `rhs`. */
-    final Expression getRhs() { swift_disjunction_expression_def(this, _, _, result) }
+    /** Gets the node corresponding to the field `operator`. */
+    final Operator getOperator() { unified_unary_expr_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_disjunction_expression_def(this, result, _, _) or
-      swift_disjunction_expression_def(this, _, _, result)
+      unified_unary_expr_def(this, result, _) or unified_unary_expr_def(this, _, result)
     }
   }
 
-  /** A class representing `do_statement` nodes. */
-  class DoStatement extends @swift_do_statement, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DoStatement" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_do_statement_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_do_statement_child(this, _, result) }
-  }
-
-  /** A class representing `else` tokens. */
-  class Else extends @swift_token_else, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Else" }
-  }
-
-  /** A class representing `enum_class_body` nodes. */
-  class EnumClassBody extends @swift_enum_class_body, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "EnumClassBody" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_enum_class_body_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_enum_class_body_child(this, _, result) }
-  }
-
-  /** A class representing `enum_entry` nodes. */
-  class EnumEntry extends @swift_enum_entry, AstNode {
+  /** A class representing `unsupported_node` tokens. */
+  class UnsupportedNode extends @unified_token_unsupported_node, Token {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "EnumEntry" }
-
-    /** Gets the node corresponding to the field `data_contents`. */
-    final EnumTypeParameters getDataContents(int i) {
-      swift_enum_entry_data_contents(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `name`. */
-    final SimpleIdentifier getName(int i) { swift_enum_entry_name(this, i, result) }
-
-    /** Gets the node corresponding to the field `raw_value`. */
-    final Expression getRawValue(int i) { swift_enum_entry_raw_value(this, i, result) }
-
-    /** Gets the child of this node. */
-    final Modifiers getChild() { swift_enum_entry_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_enum_entry_data_contents(this, _, result) or
-      swift_enum_entry_name(this, _, result) or
-      swift_enum_entry_raw_value(this, _, result) or
-      swift_enum_entry_child(this, result)
-    }
+    final override string getAPrimaryQlClass() { result = "UnsupportedNode" }
   }
 
-  /** A class representing `enum_type_parameters` nodes. */
-  class EnumTypeParameters extends @swift_enum_type_parameters, AstNode {
+  /** A class representing `var_pattern` nodes. */
+  class VarPattern extends @unified_var_pattern, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "EnumTypeParameters" }
+    final override string getAPrimaryQlClass() { result = "VarPattern" }
 
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_enum_type_parameters_child(this, i, result) }
+    /** Gets the node corresponding to the field `identifier`. */
+    final Identifier getIdentifier() { unified_var_pattern_def(this, result) }
 
     /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_enum_type_parameters_child(this, _, result) }
+    final override AstNode getAFieldOrChild() { unified_var_pattern_def(this, result) }
   }
 
-  /** A class representing `equality_constraint` nodes. */
-  class EqualityConstraint extends @swift_equality_constraint, AstNode {
+  /** A class representing `variable_declaration_stmt` nodes. */
+  class VariableDeclarationStmt extends @unified_variable_declaration_stmt, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "EqualityConstraint" }
-
-    /** Gets the node corresponding to the field `constrained_type`. */
-    final AstNode getConstrainedType() { swift_equality_constraint_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `must_equal`. */
-    final Type getMustEqual() { swift_equality_constraint_def(this, _, result) }
-
-    /** Gets the `i`th child of this node. */
-    final Attribute getChild(int i) { swift_equality_constraint_child(this, i, result) }
+    final override string getAPrimaryQlClass() { result = "VariableDeclarationStmt" }
 
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_equality_constraint_def(this, result, _) or
-      swift_equality_constraint_def(this, _, result) or
-      swift_equality_constraint_child(this, _, result)
-    }
-  }
-
-  /** A class representing `equality_expression` nodes. */
-  class EqualityExpression extends @swift_equality_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "EqualityExpression" }
-
-    /** Gets the node corresponding to the field `lhs`. */
-    final Expression getLhs() { swift_equality_expression_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `op`. */
-    final string getOp() {
-      exists(int value | swift_equality_expression_def(this, _, value, _) |
-        result = "!=" and value = 0
-        or
-        result = "!==" and value = 1
-        or
-        result = "==" and value = 2
-        or
-        result = "===" and value = 3
-      )
+    /** Gets the node corresponding to the field `variable_declarator`. */
+    final VariableDeclarator getVariableDeclarator(int i) {
+      unified_variable_declaration_stmt_variable_declarator(this, i, result)
     }
 
-    /** Gets the node corresponding to the field `rhs`. */
-    final Expression getRhs() { swift_equality_expression_def(this, _, _, result) }
-
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_equality_expression_def(this, result, _, _) or
-      swift_equality_expression_def(this, _, _, result)
+      unified_variable_declaration_stmt_variable_declarator(this, _, result)
     }
   }
 
-  /** A class representing `existential_type` nodes. */
-  class ExistentialType extends @swift_existential_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ExistentialType" }
-
-    /** Gets the child of this node. */
-    final UnannotatedType getChild() { swift_existential_type_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_existential_type_def(this, result) }
-  }
-
-  class Expression extends @swift_expression, AstNode { }
-
-  /** A class representing `external_macro_definition` nodes. */
-  class ExternalMacroDefinition extends @swift_external_macro_definition, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ExternalMacroDefinition" }
-
-    /** Gets the child of this node. */
-    final ValueArguments getChild() { swift_external_macro_definition_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_external_macro_definition_def(this, result) }
-  }
-
-  /** A class representing `for_statement` nodes. */
-  class ForStatement extends @swift_for_statement, AstNode {
+  /** A class representing `variable_declarator` nodes. */
+  class VariableDeclarator extends @unified_variable_declarator, AstNode {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ForStatement" }
+    final override string getAPrimaryQlClass() { result = "VariableDeclarator" }
 
-    /** Gets the node corresponding to the field `collection`. */
-    final Expression getCollection() { swift_for_statement_def(this, result, _) }
+    /** Gets the node corresponding to the field `pattern`. */
+    final Pattern getPattern() { unified_variable_declarator_def(this, result) }
 
-    /** Gets the node corresponding to the field `item`. */
-    final Pattern getItem() { swift_for_statement_def(this, _, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_for_statement_child(this, i, result) }
+    /** Gets the node corresponding to the field `value`. */
+    final Expr getValue() { unified_variable_declarator_value(this, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      swift_for_statement_def(this, result, _) or
-      swift_for_statement_def(this, _, result) or
-      swift_for_statement_child(this, _, result)
-    }
-  }
-
-  /** A class representing `fully_open_range` tokens. */
-  class FullyOpenRange extends @swift_token_fully_open_range, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "FullyOpenRange" }
-  }
-
-  /** A class representing `function_body` nodes. */
-  class FunctionBody extends @swift_function_body, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "FunctionBody" }
-
-    /** Gets the child of this node. */
-    final Statements getChild() { swift_function_body_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_function_body_child(this, result) }
-  }
-
-  /** A class representing `function_declaration` nodes. */
-  class FunctionDeclaration extends @swift_function_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "FunctionDeclaration" }
-
-    /** Gets the node corresponding to the field `body`. */
-    final FunctionBody getBody() { swift_function_declaration_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `default_value`. */
-    final Expression getDefaultValue(int i) {
-      swift_function_declaration_default_value(this, i, result)
+      unified_variable_declarator_def(this, result) or
+      unified_variable_declarator_value(this, result)
     }
-
-    /** Gets the node corresponding to the field `name`. */
-    final AstNode getName() { swift_function_declaration_def(this, _, result) }
-
-    /** Gets the node corresponding to the field `return_type`. */
-    final AstNode getReturnType() { swift_function_declaration_return_type(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_function_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_function_declaration_def(this, result, _) or
-      swift_function_declaration_default_value(this, _, result) or
-      swift_function_declaration_def(this, _, result) or
-      swift_function_declaration_return_type(this, result) or
-      swift_function_declaration_child(this, _, result)
-    }
-  }
-
-  /** A class representing `function_modifier` tokens. */
-  class FunctionModifier extends @swift_token_function_modifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "FunctionModifier" }
-  }
-
-  /** A class representing `function_type` nodes. */
-  class FunctionType extends @swift_function_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "FunctionType" }
-
-    /** Gets the node corresponding to the field `params`. */
-    final UnannotatedType getParams() { swift_function_type_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `return_type`. */
-    final Type getReturnType() { swift_function_type_def(this, _, result) }
-
-    /** Gets the child of this node. */
-    final AstNode getChild() { swift_function_type_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_function_type_def(this, result, _) or
-      swift_function_type_def(this, _, result) or
-      swift_function_type_child(this, result)
-    }
-  }
-
-  /** A class representing `getter_specifier` nodes. */
-  class GetterSpecifier extends @swift_getter_specifier, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "GetterSpecifier" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_getter_specifier_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_getter_specifier_child(this, _, result) }
-  }
-
-  class GlobalDeclaration extends @swift_global_declaration, AstNode { }
-
-  /** A class representing `guard_statement` nodes. */
-  class GuardStatement extends @swift_guard_statement, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "GuardStatement" }
-
-    /** Gets the node corresponding to the field `condition`. */
-    final IfCondition getCondition(int i) { swift_guard_statement_condition(this, i, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_guard_statement_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_guard_statement_condition(this, _, result) or
-      swift_guard_statement_child(this, _, result)
-    }
-  }
-
-  /** A class representing `hex_literal` tokens. */
-  class HexLiteral extends @swift_token_hex_literal, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "HexLiteral" }
-  }
-
-  /** A class representing `identifier` nodes. */
-  class Identifier extends @swift_identifier, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Identifier" }
-
-    /** Gets the `i`th child of this node. */
-    final SimpleIdentifier getChild(int i) { swift_identifier_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_identifier_child(this, _, result) }
-  }
-
-  /** A class representing `if_condition` nodes. */
-  class IfCondition extends @swift_if_condition, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "IfCondition" }
-
-    /** Gets the child of this node. */
-    final AstNode getChild() { swift_if_condition_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_if_condition_def(this, result) }
-  }
-
-  /** A class representing `if_let_binding` nodes. */
-  class IfLetBinding extends @swift_if_let_binding, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "IfLetBinding" }
-
-    /** Gets the node corresponding to the field `bound_identifier`. */
-    final SimpleIdentifier getBoundIdentifier() {
-      swift_if_let_binding_bound_identifier(this, result)
-    }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_if_let_binding_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_if_let_binding_bound_identifier(this, result) or
-      swift_if_let_binding_child(this, _, result)
-    }
-  }
-
-  /** A class representing `if_statement` nodes. */
-  class IfStatement extends @swift_if_statement, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "IfStatement" }
-
-    /** Gets the node corresponding to the field `condition`. */
-    final IfCondition getCondition(int i) { swift_if_statement_condition(this, i, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_if_statement_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_if_statement_condition(this, _, result) or swift_if_statement_child(this, _, result)
-    }
-  }
-
-  /** A class representing `implicitly_unwrapped_type` nodes. */
-  class ImplicitlyUnwrappedType extends @swift_implicitly_unwrapped_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ImplicitlyUnwrappedType" }
-
-    /** Gets the child of this node. */
-    final Type getChild() { swift_implicitly_unwrapped_type_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_implicitly_unwrapped_type_def(this, result) }
-  }
-
-  /** A class representing `import_declaration` nodes. */
-  class ImportDeclaration extends @swift_import_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ImportDeclaration" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_import_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_import_declaration_child(this, _, result) }
-  }
-
-  /** A class representing `infix_expression` nodes. */
-  class InfixExpression extends @swift_infix_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "InfixExpression" }
-
-    /** Gets the node corresponding to the field `lhs`. */
-    final Expression getLhs() { swift_infix_expression_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `op`. */
-    final CustomOperator getOp() { swift_infix_expression_def(this, _, result, _) }
-
-    /** Gets the node corresponding to the field `rhs`. */
-    final Expression getRhs() { swift_infix_expression_def(this, _, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_infix_expression_def(this, result, _, _) or
-      swift_infix_expression_def(this, _, result, _) or
-      swift_infix_expression_def(this, _, _, result)
-    }
-  }
-
-  /** A class representing `inheritance_constraint` nodes. */
-  class InheritanceConstraint extends @swift_inheritance_constraint, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "InheritanceConstraint" }
-
-    /** Gets the node corresponding to the field `constrained_type`. */
-    final AstNode getConstrainedType() { swift_inheritance_constraint_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `inherits_from`. */
-    final AstNode getInheritsFrom() { swift_inheritance_constraint_def(this, _, result) }
-
-    /** Gets the `i`th child of this node. */
-    final Attribute getChild(int i) { swift_inheritance_constraint_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_inheritance_constraint_def(this, result, _) or
-      swift_inheritance_constraint_def(this, _, result) or
-      swift_inheritance_constraint_child(this, _, result)
-    }
-  }
-
-  /** A class representing `inheritance_modifier` tokens. */
-  class InheritanceModifier extends @swift_token_inheritance_modifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "InheritanceModifier" }
-  }
-
-  /** A class representing `inheritance_specifier` nodes. */
-  class InheritanceSpecifier extends @swift_inheritance_specifier, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "InheritanceSpecifier" }
-
-    /** Gets the node corresponding to the field `inherits_from`. */
-    final AstNode getInheritsFrom() { swift_inheritance_specifier_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_inheritance_specifier_def(this, result) }
-  }
-
-  /** A class representing `init_declaration` nodes. */
-  class InitDeclaration extends @swift_init_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "InitDeclaration" }
-
-    /** Gets the node corresponding to the field `body`. */
-    final FunctionBody getBody() { swift_init_declaration_body(this, result) }
-
-    /** Gets the node corresponding to the field `default_value`. */
-    final Expression getDefaultValue(int i) {
-      swift_init_declaration_default_value(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `name`. */
-    final string getName() {
-      exists(int value | swift_init_declaration_def(this, value) | (result = "init" and value = 0))
-    }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_init_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_init_declaration_body(this, result) or
-      swift_init_declaration_default_value(this, _, result) or
-      swift_init_declaration_child(this, _, result)
-    }
-  }
-
-  /** A class representing `integer_literal` tokens. */
-  class IntegerLiteral extends @swift_token_integer_literal, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "IntegerLiteral" }
-  }
-
-  /** A class representing `interpolated_expression` nodes. */
-  class InterpolatedExpression extends @swift_interpolated_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "InterpolatedExpression" }
-
-    /** Gets the node corresponding to the field `name`. */
-    final ValueArgumentLabel getName() { swift_interpolated_expression_name(this, result) }
-
-    /** Gets the node corresponding to the field `reference_specifier`. */
-    final ValueArgumentLabel getReferenceSpecifier(int i) {
-      swift_interpolated_expression_reference_specifier(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `value`. */
-    final Expression getValue() { swift_interpolated_expression_value(this, result) }
-
-    /** Gets the child of this node. */
-    final TypeModifiers getChild() { swift_interpolated_expression_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_interpolated_expression_name(this, result) or
-      swift_interpolated_expression_reference_specifier(this, _, result) or
-      swift_interpolated_expression_value(this, result) or
-      swift_interpolated_expression_child(this, result)
-    }
-  }
-
-  /** A class representing `key_path_expression` nodes. */
-  class KeyPathExpression extends @swift_key_path_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "KeyPathExpression" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_key_path_expression_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_key_path_expression_child(this, _, result) }
-  }
-
-  /** A class representing `key_path_string_expression` nodes. */
-  class KeyPathStringExpression extends @swift_key_path_string_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "KeyPathStringExpression" }
-
-    /** Gets the child of this node. */
-    final Expression getChild() { swift_key_path_string_expression_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_key_path_string_expression_def(this, result) }
-  }
-
-  /** A class representing `lambda_function_type` nodes. */
-  class LambdaFunctionType extends @swift_lambda_function_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "LambdaFunctionType" }
-
-    /** Gets the node corresponding to the field `return_type`. */
-    final AstNode getReturnType() { swift_lambda_function_type_return_type(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_lambda_function_type_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_lambda_function_type_return_type(this, result) or
-      swift_lambda_function_type_child(this, _, result)
-    }
-  }
-
-  /** A class representing `lambda_function_type_parameters` nodes. */
-  class LambdaFunctionTypeParameters extends @swift_lambda_function_type_parameters, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "LambdaFunctionTypeParameters" }
-
-    /** Gets the `i`th child of this node. */
-    final LambdaParameter getChild(int i) {
-      swift_lambda_function_type_parameters_child(this, i, result)
-    }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_lambda_function_type_parameters_child(this, _, result)
-    }
-  }
-
-  /** A class representing `lambda_literal` nodes. */
-  class LambdaLiteral extends @swift_lambda_literal, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "LambdaLiteral" }
-
-    /** Gets the node corresponding to the field `captures`. */
-    final CaptureList getCaptures() { swift_lambda_literal_captures(this, result) }
-
-    /** Gets the node corresponding to the field `type`. */
-    final LambdaFunctionType getType() { swift_lambda_literal_type(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_lambda_literal_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_lambda_literal_captures(this, result) or
-      swift_lambda_literal_type(this, result) or
-      swift_lambda_literal_child(this, _, result)
-    }
-  }
-
-  /** A class representing `lambda_parameter` nodes. */
-  class LambdaParameter extends @swift_lambda_parameter, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "LambdaParameter" }
-
-    /** Gets the node corresponding to the field `external_name`. */
-    final SimpleIdentifier getExternalName() { swift_lambda_parameter_external_name(this, result) }
-
-    /** Gets the node corresponding to the field `name`. */
-    final SimpleIdentifier getName() { swift_lambda_parameter_name(this, result) }
-
-    /** Gets the node corresponding to the field `type`. */
-    final AstNode getType() { swift_lambda_parameter_type(this, result) }
-
-    /** Gets the child of this node. */
-    final AstNode getChild() { swift_lambda_parameter_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_lambda_parameter_external_name(this, result) or
-      swift_lambda_parameter_name(this, result) or
-      swift_lambda_parameter_type(this, result) or
-      swift_lambda_parameter_child(this, result)
-    }
-  }
-
-  /** A class representing `line_str_text` tokens. */
-  class LineStrText extends @swift_token_line_str_text, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "LineStrText" }
-  }
-
-  /** A class representing `line_string_literal` nodes. */
-  class LineStringLiteral extends @swift_line_string_literal, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "LineStringLiteral" }
-
-    /** Gets the node corresponding to the field `interpolation`. */
-    final InterpolatedExpression getInterpolation(int i) {
-      swift_line_string_literal_interpolation(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `text`. */
-    final AstNode getText(int i) { swift_line_string_literal_text(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_line_string_literal_interpolation(this, _, result) or
-      swift_line_string_literal_text(this, _, result)
-    }
-  }
-
-  class LocalDeclaration extends @swift_local_declaration, AstNode { }
-
-  /** A class representing `macro_declaration` nodes. */
-  class MacroDeclaration extends @swift_macro_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "MacroDeclaration" }
-
-    /** Gets the node corresponding to the field `default_value`. */
-    final Expression getDefaultValue(int i) {
-      swift_macro_declaration_default_value(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `definition`. */
-    final MacroDefinition getDefinition() { swift_macro_declaration_definition(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_macro_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_macro_declaration_default_value(this, _, result) or
-      swift_macro_declaration_definition(this, result) or
-      swift_macro_declaration_child(this, _, result)
-    }
-  }
-
-  /** A class representing `macro_definition` nodes. */
-  class MacroDefinition extends @swift_macro_definition, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "MacroDefinition" }
-
-    /** Gets the node corresponding to the field `body`. */
-    final AstNode getBody() { swift_macro_definition_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_macro_definition_def(this, result) }
-  }
-
-  /** A class representing `macro_invocation` nodes. */
-  class MacroInvocation extends @swift_macro_invocation, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "MacroInvocation" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_macro_invocation_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_macro_invocation_child(this, _, result) }
-  }
-
-  /** A class representing `member_modifier` tokens. */
-  class MemberModifier extends @swift_token_member_modifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "MemberModifier" }
-  }
-
-  /** A class representing `metatype` nodes. */
-  class Metatype extends @swift_metatype, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Metatype" }
-
-    /** Gets the child of this node. */
-    final UnannotatedType getChild() { swift_metatype_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_metatype_def(this, result) }
-  }
-
-  /** A class representing `modifiers` nodes. */
-  class Modifiers extends @swift_modifiers, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Modifiers" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_modifiers_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_modifiers_child(this, _, result) }
-  }
-
-  /** A class representing `modify_specifier` nodes. */
-  class ModifySpecifier extends @swift_modify_specifier, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ModifySpecifier" }
-
-    /** Gets the child of this node. */
-    final MutationModifier getChild() { swift_modify_specifier_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_modify_specifier_child(this, result) }
-  }
-
-  /** A class representing `multi_line_str_text` tokens. */
-  class MultiLineStrText extends @swift_token_multi_line_str_text, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "MultiLineStrText" }
-  }
-
-  /** A class representing `multi_line_string_literal` nodes. */
-  class MultiLineStringLiteral extends @swift_multi_line_string_literal, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "MultiLineStringLiteral" }
-
-    /** Gets the node corresponding to the field `interpolation`. */
-    final InterpolatedExpression getInterpolation(int i) {
-      swift_multi_line_string_literal_interpolation(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `text`. */
-    final AstNode getText(int i) { swift_multi_line_string_literal_text(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_multi_line_string_literal_interpolation(this, _, result) or
-      swift_multi_line_string_literal_text(this, _, result)
-    }
-  }
-
-  /** A class representing `multiline_comment` tokens. */
-  class MultilineComment extends @swift_token_multiline_comment, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "MultilineComment" }
-  }
-
-  /** A class representing `multiplicative_expression` nodes. */
-  class MultiplicativeExpression extends @swift_multiplicative_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "MultiplicativeExpression" }
-
-    /** Gets the node corresponding to the field `lhs`. */
-    final Expression getLhs() { swift_multiplicative_expression_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `op`. */
-    final string getOp() {
-      exists(int value | swift_multiplicative_expression_def(this, _, value, _) |
-        result = "%" and value = 0
-        or
-        result = "*" and value = 1
-        or
-        result = "/" and value = 2
-      )
-    }
-
-    /** Gets the node corresponding to the field `rhs`. */
-    final Expression getRhs() { swift_multiplicative_expression_def(this, _, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_multiplicative_expression_def(this, result, _, _) or
-      swift_multiplicative_expression_def(this, _, _, result)
-    }
-  }
-
-  /** A class representing `mutation_modifier` tokens. */
-  class MutationModifier extends @swift_token_mutation_modifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "MutationModifier" }
-  }
-
-  /** A class representing `navigation_expression` nodes. */
-  class NavigationExpression extends @swift_navigation_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "NavigationExpression" }
-
-    /** Gets the node corresponding to the field `suffix`. */
-    final NavigationSuffix getSuffix() { swift_navigation_expression_def(this, result) }
-
-    /** Gets the node corresponding to the field `target`. */
-    final AstNode getTarget(int i) { swift_navigation_expression_target(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_navigation_expression_def(this, result) or
-      swift_navigation_expression_target(this, _, result)
-    }
-  }
-
-  /** A class representing `navigation_suffix` nodes. */
-  class NavigationSuffix extends @swift_navigation_suffix, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "NavigationSuffix" }
-
-    /** Gets the node corresponding to the field `suffix`. */
-    final AstNode getSuffix() { swift_navigation_suffix_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_navigation_suffix_def(this, result) }
-  }
-
-  /** A class representing `nested_type_identifier` nodes. */
-  class NestedTypeIdentifier extends @swift_nested_type_identifier, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "NestedTypeIdentifier" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_nested_type_identifier_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_nested_type_identifier_child(this, _, result)
-    }
-  }
-
-  /** A class representing `nil_coalescing_expression` nodes. */
-  class NilCoalescingExpression extends @swift_nil_coalescing_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "NilCoalescingExpression" }
-
-    /** Gets the node corresponding to the field `if_nil`. */
-    final Expression getIfNil() { swift_nil_coalescing_expression_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `value`. */
-    final Expression getValue() { swift_nil_coalescing_expression_def(this, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_nil_coalescing_expression_def(this, result, _) or
-      swift_nil_coalescing_expression_def(this, _, result)
-    }
-  }
-
-  /** A class representing `oct_literal` tokens. */
-  class OctLiteral extends @swift_token_oct_literal, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "OctLiteral" }
-  }
-
-  /** A class representing `opaque_type` nodes. */
-  class OpaqueType extends @swift_opaque_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "OpaqueType" }
-
-    /** Gets the child of this node. */
-    final UnannotatedType getChild() { swift_opaque_type_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_opaque_type_def(this, result) }
-  }
-
-  /** A class representing `open_end_range_expression` nodes. */
-  class OpenEndRangeExpression extends @swift_open_end_range_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "OpenEndRangeExpression" }
-
-    /** Gets the node corresponding to the field `start`. */
-    final Expression getStart() { swift_open_end_range_expression_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_open_end_range_expression_def(this, result) }
-  }
-
-  /** A class representing `open_start_range_expression` nodes. */
-  class OpenStartRangeExpression extends @swift_open_start_range_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "OpenStartRangeExpression" }
-
-    /** Gets the node corresponding to the field `end`. */
-    final Expression getEnd() { swift_open_start_range_expression_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_open_start_range_expression_def(this, result)
-    }
-  }
-
-  /** A class representing `operator_declaration` nodes. */
-  class OperatorDeclaration extends @swift_operator_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "OperatorDeclaration" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_operator_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_operator_declaration_child(this, _, result) }
-  }
-
-  /** A class representing `optional_chain_marker` nodes. */
-  class OptionalChainMarker extends @swift_optional_chain_marker, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "OptionalChainMarker" }
-
-    /** Gets the child of this node. */
-    final Expression getChild() { swift_optional_chain_marker_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_optional_chain_marker_def(this, result) }
-  }
-
-  /** A class representing `optional_type` nodes. */
-  class OptionalType extends @swift_optional_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "OptionalType" }
-
-    /** Gets the node corresponding to the field `wrapped`. */
-    final AstNode getWrapped() { swift_optional_type_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_optional_type_def(this, result) }
-  }
-
-  /** A class representing `ownership_modifier` tokens. */
-  class OwnershipModifier extends @swift_token_ownership_modifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "OwnershipModifier" }
-  }
-
-  /** A class representing `parameter` nodes. */
-  class Parameter extends @swift_parameter, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Parameter" }
-
-    /** Gets the node corresponding to the field `external_name`. */
-    final SimpleIdentifier getExternalName() { swift_parameter_external_name(this, result) }
-
-    /** Gets the node corresponding to the field `name`. */
-    final SimpleIdentifier getName() { swift_parameter_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `type`. */
-    final AstNode getType() { swift_parameter_def(this, _, result) }
-
-    /** Gets the child of this node. */
-    final ParameterModifiers getChild() { swift_parameter_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_parameter_external_name(this, result) or
-      swift_parameter_def(this, result, _) or
-      swift_parameter_def(this, _, result) or
-      swift_parameter_child(this, result)
-    }
-  }
-
-  /** A class representing `parameter_modifier` tokens. */
-  class ParameterModifier extends @swift_token_parameter_modifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ParameterModifier" }
-  }
-
-  /** A class representing `parameter_modifiers` nodes. */
-  class ParameterModifiers extends @swift_parameter_modifiers, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ParameterModifiers" }
-
-    /** Gets the `i`th child of this node. */
-    final ParameterModifier getChild(int i) { swift_parameter_modifiers_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_parameter_modifiers_child(this, _, result) }
-  }
-
-  /** A class representing `pattern` nodes. */
-  class Pattern extends @swift_pattern, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Pattern" }
-
-    /** Gets the node corresponding to the field `bound_identifier`. */
-    final SimpleIdentifier getBoundIdentifier() { swift_pattern_bound_identifier(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_pattern_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_pattern_bound_identifier(this, result) or swift_pattern_child(this, _, result)
-    }
-  }
-
-  /** A class representing `playground_literal` nodes. */
-  class PlaygroundLiteral extends @swift_playground_literal, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "PlaygroundLiteral" }
-
-    /** Gets the `i`th child of this node. */
-    final Expression getChild(int i) { swift_playground_literal_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_playground_literal_child(this, _, result) }
-  }
-
-  /** A class representing `postfix_expression` nodes. */
-  class PostfixExpression extends @swift_postfix_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "PostfixExpression" }
-
-    /** Gets the node corresponding to the field `operation`. */
-    final AstNode getOperation() { swift_postfix_expression_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `target`. */
-    final Expression getTarget() { swift_postfix_expression_def(this, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_postfix_expression_def(this, result, _) or swift_postfix_expression_def(this, _, result)
-    }
-  }
-
-  /** A class representing `precedence_group_attribute` nodes. */
-  class PrecedenceGroupAttribute extends @swift_precedence_group_attribute, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "PrecedenceGroupAttribute" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_precedence_group_attribute_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_precedence_group_attribute_child(this, _, result)
-    }
-  }
-
-  /** A class representing `precedence_group_attributes` nodes. */
-  class PrecedenceGroupAttributes extends @swift_precedence_group_attributes, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "PrecedenceGroupAttributes" }
-
-    /** Gets the `i`th child of this node. */
-    final PrecedenceGroupAttribute getChild(int i) {
-      swift_precedence_group_attributes_child(this, i, result)
-    }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_precedence_group_attributes_child(this, _, result)
-    }
-  }
-
-  /** A class representing `precedence_group_declaration` nodes. */
-  class PrecedenceGroupDeclaration extends @swift_precedence_group_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "PrecedenceGroupDeclaration" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_precedence_group_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_precedence_group_declaration_child(this, _, result)
-    }
-  }
-
-  /** A class representing `prefix_expression` nodes. */
-  class PrefixExpression extends @swift_prefix_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "PrefixExpression" }
-
-    /** Gets the node corresponding to the field `operation`. */
-    final AstNode getOperation() { swift_prefix_expression_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `target`. */
-    final Expression getTarget() { swift_prefix_expression_def(this, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_prefix_expression_def(this, result, _) or swift_prefix_expression_def(this, _, result)
-    }
-  }
-
-  /** A class representing `property_behavior_modifier` tokens. */
-  class PropertyBehaviorModifier extends @swift_token_property_behavior_modifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "PropertyBehaviorModifier" }
-  }
-
-  /** A class representing `property_declaration` nodes. */
-  class PropertyDeclaration extends @swift_property_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "PropertyDeclaration" }
-
-    /** Gets the node corresponding to the field `computed_value`. */
-    final ComputedProperty getComputedValue(int i) {
-      swift_property_declaration_computed_value(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `name`. */
-    final Pattern getName(int i) { swift_property_declaration_name(this, i, result) }
-
-    /** Gets the node corresponding to the field `value`. */
-    final Expression getValue(int i) { swift_property_declaration_value(this, i, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_property_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_property_declaration_computed_value(this, _, result) or
-      swift_property_declaration_name(this, _, result) or
-      swift_property_declaration_value(this, _, result) or
-      swift_property_declaration_child(this, _, result)
-    }
-  }
-
-  /** A class representing `property_modifier` tokens. */
-  class PropertyModifier extends @swift_token_property_modifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "PropertyModifier" }
-  }
-
-  /** A class representing `protocol_body` nodes. */
-  class ProtocolBody extends @swift_protocol_body, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ProtocolBody" }
-
-    /** Gets the `i`th child of this node. */
-    final ProtocolMemberDeclaration getChild(int i) { swift_protocol_body_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_protocol_body_child(this, _, result) }
-  }
-
-  /** A class representing `protocol_composition_type` nodes. */
-  class ProtocolCompositionType extends @swift_protocol_composition_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ProtocolCompositionType" }
-
-    /** Gets the `i`th child of this node. */
-    final UnannotatedType getChild(int i) { swift_protocol_composition_type_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_protocol_composition_type_child(this, _, result)
-    }
-  }
-
-  /** A class representing `protocol_declaration` nodes. */
-  class ProtocolDeclaration extends @swift_protocol_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ProtocolDeclaration" }
-
-    /** Gets the node corresponding to the field `body`. */
-    final ProtocolBody getBody() { swift_protocol_declaration_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `declaration_kind`. */
-    final string getDeclarationKind() {
-      exists(int value | swift_protocol_declaration_def(this, _, value, _) |
-        (result = "protocol" and value = 0)
-      )
-    }
-
-    /** Gets the node corresponding to the field `name`. */
-    final TypeIdentifier getName() { swift_protocol_declaration_def(this, _, _, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_protocol_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_protocol_declaration_def(this, result, _, _) or
-      swift_protocol_declaration_def(this, _, _, result) or
-      swift_protocol_declaration_child(this, _, result)
-    }
-  }
-
-  /** A class representing `protocol_function_declaration` nodes. */
-  class ProtocolFunctionDeclaration extends @swift_protocol_function_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ProtocolFunctionDeclaration" }
-
-    /** Gets the node corresponding to the field `body`. */
-    final FunctionBody getBody() { swift_protocol_function_declaration_body(this, result) }
-
-    /** Gets the node corresponding to the field `default_value`. */
-    final Expression getDefaultValue(int i) {
-      swift_protocol_function_declaration_default_value(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `name`. */
-    final AstNode getName() { swift_protocol_function_declaration_def(this, result) }
-
-    /** Gets the node corresponding to the field `return_type`. */
-    final AstNode getReturnType() { swift_protocol_function_declaration_return_type(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_protocol_function_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_protocol_function_declaration_body(this, result) or
-      swift_protocol_function_declaration_default_value(this, _, result) or
-      swift_protocol_function_declaration_def(this, result) or
-      swift_protocol_function_declaration_return_type(this, result) or
-      swift_protocol_function_declaration_child(this, _, result)
-    }
-  }
-
-  class ProtocolMemberDeclaration extends @swift_protocol_member_declaration, AstNode { }
-
-  /** A class representing `protocol_property_declaration` nodes. */
-  class ProtocolPropertyDeclaration extends @swift_protocol_property_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ProtocolPropertyDeclaration" }
-
-    /** Gets the node corresponding to the field `name`. */
-    final Pattern getName() { swift_protocol_property_declaration_def(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_protocol_property_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_protocol_property_declaration_def(this, result) or
-      swift_protocol_property_declaration_child(this, _, result)
-    }
-  }
-
-  /** A class representing `protocol_property_requirements` nodes. */
-  class ProtocolPropertyRequirements extends @swift_protocol_property_requirements, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ProtocolPropertyRequirements" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_protocol_property_requirements_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_protocol_property_requirements_child(this, _, result)
-    }
-  }
-
-  /** A class representing `range_expression` nodes. */
-  class RangeExpression extends @swift_range_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "RangeExpression" }
-
-    /** Gets the node corresponding to the field `end`. */
-    final Expression getEnd() { swift_range_expression_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `op`. */
-    final string getOp() {
-      exists(int value | swift_range_expression_def(this, _, value, _) |
-        result = "..." and value = 0
-        or
-        result = "..<" and value = 1
-      )
-    }
-
-    /** Gets the node corresponding to the field `start`. */
-    final Expression getStart() { swift_range_expression_def(this, _, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_range_expression_def(this, result, _, _) or
-      swift_range_expression_def(this, _, _, result)
-    }
-  }
-
-  /** A class representing `raw_str_continuing_indicator` tokens. */
-  class RawStrContinuingIndicator extends @swift_token_raw_str_continuing_indicator, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "RawStrContinuingIndicator" }
-  }
-
-  /** A class representing `raw_str_end_part` tokens. */
-  class RawStrEndPart extends @swift_token_raw_str_end_part, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "RawStrEndPart" }
-  }
-
-  /** A class representing `raw_str_interpolation` nodes. */
-  class RawStrInterpolation extends @swift_raw_str_interpolation, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "RawStrInterpolation" }
-
-    /** Gets the node corresponding to the field `interpolation`. */
-    final InterpolatedExpression getInterpolation(int i) {
-      swift_raw_str_interpolation_interpolation(this, i, result)
-    }
-
-    /** Gets the child of this node. */
-    final RawStrInterpolationStart getChild() { swift_raw_str_interpolation_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_raw_str_interpolation_interpolation(this, _, result) or
-      swift_raw_str_interpolation_def(this, result)
-    }
-  }
-
-  /** A class representing `raw_str_interpolation_start` tokens. */
-  class RawStrInterpolationStart extends @swift_token_raw_str_interpolation_start, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "RawStrInterpolationStart" }
-  }
-
-  /** A class representing `raw_str_part` tokens. */
-  class RawStrPart extends @swift_token_raw_str_part, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "RawStrPart" }
-  }
-
-  /** A class representing `raw_string_literal` nodes. */
-  class RawStringLiteral extends @swift_raw_string_literal, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "RawStringLiteral" }
-
-    /** Gets the node corresponding to the field `interpolation`. */
-    final RawStrInterpolation getInterpolation(int i) {
-      swift_raw_string_literal_interpolation(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `text`. */
-    final AstNode getText(int i) { swift_raw_string_literal_text(this, i, result) }
-
-    /** Gets the `i`th child of this node. */
-    final RawStrContinuingIndicator getChild(int i) {
-      swift_raw_string_literal_child(this, i, result)
-    }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_raw_string_literal_interpolation(this, _, result) or
-      swift_raw_string_literal_text(this, _, result) or
-      swift_raw_string_literal_child(this, _, result)
-    }
-  }
-
-  /** A class representing `real_literal` tokens. */
-  class RealLiteral extends @swift_token_real_literal, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "RealLiteral" }
-  }
-
-  /** A class representing `referenceable_operator` nodes. */
-  class ReferenceableOperator extends @swift_referenceable_operator, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ReferenceableOperator" }
-
-    /** Gets the child of this node. */
-    final AstNode getChild() { swift_referenceable_operator_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_referenceable_operator_child(this, result) }
-  }
-
-  /** A class representing `regex_literal` tokens. */
-  class RegexLiteral extends @swift_token_regex_literal, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "RegexLiteral" }
-  }
-
-  /** A class representing `repeat_while_statement` nodes. */
-  class RepeatWhileStatement extends @swift_repeat_while_statement, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "RepeatWhileStatement" }
-
-    /** Gets the node corresponding to the field `condition`. */
-    final IfCondition getCondition(int i) {
-      swift_repeat_while_statement_condition(this, i, result)
-    }
-
-    /** Gets the child of this node. */
-    final Statements getChild() { swift_repeat_while_statement_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_repeat_while_statement_condition(this, _, result) or
-      swift_repeat_while_statement_child(this, result)
-    }
-  }
-
-  /** A class representing `selector_expression` nodes. */
-  class SelectorExpression extends @swift_selector_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SelectorExpression" }
-
-    /** Gets the child of this node. */
-    final Expression getChild() { swift_selector_expression_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_selector_expression_def(this, result) }
-  }
-
-  /** A class representing `self_expression` tokens. */
-  class SelfExpression extends @swift_token_self_expression, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SelfExpression" }
-  }
-
-  /** A class representing `setter_specifier` nodes. */
-  class SetterSpecifier extends @swift_setter_specifier, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SetterSpecifier" }
-
-    /** Gets the child of this node. */
-    final MutationModifier getChild() { swift_setter_specifier_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_setter_specifier_child(this, result) }
-  }
-
-  /** A class representing `shebang_line` tokens. */
-  class ShebangLine extends @swift_token_shebang_line, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ShebangLine" }
-  }
-
-  /** A class representing `simple_identifier` tokens. */
-  class SimpleIdentifier extends @swift_token_simple_identifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SimpleIdentifier" }
-  }
-
-  /** A class representing `source_file` nodes. */
-  class SourceFile extends @swift_source_file, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SourceFile" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_source_file_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_source_file_child(this, _, result) }
-  }
-
-  /** A class representing `special_literal` tokens. */
-  class SpecialLiteral extends @swift_token_special_literal, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SpecialLiteral" }
-  }
-
-  /** A class representing `statement_label` tokens. */
-  class StatementLabel extends @swift_token_statement_label, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "StatementLabel" }
-  }
-
-  /** A class representing `statements` nodes. */
-  class Statements extends @swift_statements, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Statements" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_statements_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_statements_child(this, _, result) }
-  }
-
-  /** A class representing `str_escaped_char` tokens. */
-  class StrEscapedChar extends @swift_token_str_escaped_char, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "StrEscapedChar" }
-  }
-
-  /** A class representing `subscript_declaration` nodes. */
-  class SubscriptDeclaration extends @swift_subscript_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SubscriptDeclaration" }
-
-    /** Gets the node corresponding to the field `default_value`. */
-    final Expression getDefaultValue(int i) {
-      swift_subscript_declaration_default_value(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `return_type`. */
-    final AstNode getReturnType() { swift_subscript_declaration_return_type(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_subscript_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_subscript_declaration_default_value(this, _, result) or
-      swift_subscript_declaration_return_type(this, result) or
-      swift_subscript_declaration_child(this, _, result)
-    }
-  }
-
-  /** A class representing `super_expression` tokens. */
-  class SuperExpression extends @swift_token_super_expression, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SuperExpression" }
-  }
-
-  /** A class representing `suppressed_constraint` nodes. */
-  class SuppressedConstraint extends @swift_suppressed_constraint, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SuppressedConstraint" }
-
-    /** Gets the node corresponding to the field `suppressed`. */
-    final TypeIdentifier getSuppressed() { swift_suppressed_constraint_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_suppressed_constraint_def(this, result) }
-  }
-
-  /** A class representing `switch_entry` nodes. */
-  class SwitchEntry extends @swift_switch_entry, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SwitchEntry" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_switch_entry_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_switch_entry_child(this, _, result) }
-  }
-
-  /** A class representing `switch_pattern` nodes. */
-  class SwitchPattern extends @swift_switch_pattern, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SwitchPattern" }
-
-    /** Gets the child of this node. */
-    final Pattern getChild() { swift_switch_pattern_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_switch_pattern_def(this, result) }
-  }
-
-  /** A class representing `switch_statement` nodes. */
-  class SwitchStatement extends @swift_switch_statement, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "SwitchStatement" }
-
-    /** Gets the node corresponding to the field `expr`. */
-    final Expression getExpr() { swift_switch_statement_def(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final SwitchEntry getChild(int i) { swift_switch_statement_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_switch_statement_def(this, result) or swift_switch_statement_child(this, _, result)
-    }
-  }
-
-  /** A class representing `ternary_expression` nodes. */
-  class TernaryExpression extends @swift_ternary_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TernaryExpression" }
-
-    /** Gets the node corresponding to the field `condition`. */
-    final Expression getCondition() { swift_ternary_expression_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `if_false`. */
-    final Expression getIfFalse() { swift_ternary_expression_def(this, _, result, _) }
-
-    /** Gets the node corresponding to the field `if_true`. */
-    final Expression getIfTrue() { swift_ternary_expression_def(this, _, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_ternary_expression_def(this, result, _, _) or
-      swift_ternary_expression_def(this, _, result, _) or
-      swift_ternary_expression_def(this, _, _, result)
-    }
-  }
-
-  /** A class representing `throw_keyword` tokens. */
-  class ThrowKeyword extends @swift_token_throw_keyword, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ThrowKeyword" }
-  }
-
-  /** A class representing `throws` tokens. */
-  class Throws extends @swift_token_throws, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Throws" }
-  }
-
-  /** A class representing `throws_clause` nodes. */
-  class ThrowsClause extends @swift_throws_clause, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ThrowsClause" }
-
-    /** Gets the node corresponding to the field `type`. */
-    final UnannotatedType getType() { swift_throws_clause_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_throws_clause_def(this, result) }
-  }
-
-  /** A class representing `try_expression` nodes. */
-  class TryExpression extends @swift_try_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TryExpression" }
-
-    /** Gets the node corresponding to the field `expr`. */
-    final Expression getExpr() { swift_try_expression_def(this, result, _) }
-
-    /** Gets the child of this node. */
-    final TryOperator getChild() { swift_try_expression_def(this, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_try_expression_def(this, result, _) or swift_try_expression_def(this, _, result)
-    }
-  }
-
-  /** A class representing `try_operator` tokens. */
-  class TryOperator extends @swift_token_try_operator, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TryOperator" }
-  }
-
-  /** A class representing `tuple_expression` nodes. */
-  class TupleExpression extends @swift_tuple_expression, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TupleExpression" }
-
-    /** Gets the node corresponding to the field `name`. */
-    final SimpleIdentifier getName(int i) { swift_tuple_expression_name(this, i, result) }
-
-    /** Gets the node corresponding to the field `value`. */
-    final Expression getValue(int i) { swift_tuple_expression_value(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_tuple_expression_name(this, _, result) or swift_tuple_expression_value(this, _, result)
-    }
-  }
-
-  /** A class representing `tuple_type` nodes. */
-  class TupleType extends @swift_tuple_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TupleType" }
-
-    /** Gets the node corresponding to the field `element`. */
-    final TupleTypeItem getElement(int i) { swift_tuple_type_element(this, i, result) }
-
-    /** Gets the child of this node. */
-    final TupleTypeItem getChild() { swift_tuple_type_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_tuple_type_element(this, _, result) or swift_tuple_type_child(this, result)
-    }
-  }
-
-  /** A class representing `tuple_type_item` nodes. */
-  class TupleTypeItem extends @swift_tuple_type_item, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TupleTypeItem" }
-
-    /** Gets the node corresponding to the field `name`. */
-    final SimpleIdentifier getName() { swift_tuple_type_item_name(this, result) }
-
-    /** Gets the node corresponding to the field `type`. */
-    final Type getType() { swift_tuple_type_item_type(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_tuple_type_item_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_tuple_type_item_name(this, result) or
-      swift_tuple_type_item_type(this, result) or
-      swift_tuple_type_item_child(this, _, result)
-    }
-  }
-
-  /** A class representing `type` nodes. */
-  class Type extends @swift_type__, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Type" }
-
-    /** Gets the node corresponding to the field `modifiers`. */
-    final TypeModifiers getModifiers() { swift_type_modifiers(this, result) }
-
-    /** Gets the node corresponding to the field `name`. */
-    final UnannotatedType getName() { swift_type_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_type_modifiers(this, result) or swift_type_def(this, result)
-    }
-  }
-
-  /** A class representing `type_annotation` nodes. */
-  class TypeAnnotation extends @swift_type_annotation, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeAnnotation" }
-
-    /** Gets the node corresponding to the field `type`. */
-    final AstNode getType() { swift_type_annotation_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_type_annotation_def(this, result) }
-  }
-
-  /** A class representing `type_arguments` nodes. */
-  class TypeArguments extends @swift_type_arguments, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeArguments" }
-
-    /** Gets the `i`th child of this node. */
-    final Type getChild(int i) { swift_type_arguments_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_type_arguments_child(this, _, result) }
-  }
-
-  /** A class representing `type_constraint` nodes. */
-  class TypeConstraint extends @swift_type_constraint, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeConstraint" }
-
-    /** Gets the child of this node. */
-    final AstNode getChild() { swift_type_constraint_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_type_constraint_def(this, result) }
-  }
-
-  /** A class representing `type_constraints` nodes. */
-  class TypeConstraints extends @swift_type_constraints, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeConstraints" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_type_constraints_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_type_constraints_child(this, _, result) }
-  }
-
-  /** A class representing `type_identifier` tokens. */
-  class TypeIdentifier extends @swift_token_type_identifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeIdentifier" }
-  }
-
-  class TypeLevelDeclaration extends @swift_type_level_declaration, AstNode { }
-
-  /** A class representing `type_modifiers` nodes. */
-  class TypeModifiers extends @swift_type_modifiers, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeModifiers" }
-
-    /** Gets the `i`th child of this node. */
-    final Attribute getChild(int i) { swift_type_modifiers_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_type_modifiers_child(this, _, result) }
-  }
-
-  /** A class representing `type_pack_expansion` nodes. */
-  class TypePackExpansion extends @swift_type_pack_expansion, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypePackExpansion" }
-
-    /** Gets the child of this node. */
-    final UnannotatedType getChild() { swift_type_pack_expansion_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_type_pack_expansion_def(this, result) }
-  }
-
-  /** A class representing `type_parameter` nodes. */
-  class TypeParameter extends @swift_type_parameter, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeParameter" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_type_parameter_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_type_parameter_child(this, _, result) }
-  }
-
-  /** A class representing `type_parameter_modifiers` nodes. */
-  class TypeParameterModifiers extends @swift_type_parameter_modifiers, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeParameterModifiers" }
-
-    /** Gets the `i`th child of this node. */
-    final Attribute getChild(int i) { swift_type_parameter_modifiers_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_type_parameter_modifiers_child(this, _, result)
-    }
-  }
-
-  /** A class representing `type_parameter_pack` nodes. */
-  class TypeParameterPack extends @swift_type_parameter_pack, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeParameterPack" }
-
-    /** Gets the child of this node. */
-    final UnannotatedType getChild() { swift_type_parameter_pack_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_type_parameter_pack_def(this, result) }
-  }
-
-  /** A class representing `type_parameters` nodes. */
-  class TypeParameters extends @swift_type_parameters, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeParameters" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_type_parameters_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_type_parameters_child(this, _, result) }
-  }
-
-  /** A class representing `typealias_declaration` nodes. */
-  class TypealiasDeclaration extends @swift_typealias_declaration, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypealiasDeclaration" }
-
-    /** Gets the node corresponding to the field `name`. */
-    final TypeIdentifier getName() { swift_typealias_declaration_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `value`. */
-    final Type getValue() { swift_typealias_declaration_def(this, _, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_typealias_declaration_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_typealias_declaration_def(this, result, _) or
-      swift_typealias_declaration_def(this, _, result) or
-      swift_typealias_declaration_child(this, _, result)
-    }
-  }
-
-  class UnannotatedType extends @swift_unannotated_type, AstNode { }
-
-  /** A class representing `user_type` nodes. */
-  class UserType extends @swift_user_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "UserType" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_user_type_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_user_type_child(this, _, result) }
-  }
-
-  /** A class representing `value_argument` nodes. */
-  class ValueArgument extends @swift_value_argument, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ValueArgument" }
-
-    /** Gets the node corresponding to the field `name`. */
-    final ValueArgumentLabel getName() { swift_value_argument_name(this, result) }
-
-    /** Gets the node corresponding to the field `reference_specifier`. */
-    final ValueArgumentLabel getReferenceSpecifier(int i) {
-      swift_value_argument_reference_specifier(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `value`. */
-    final Expression getValue() { swift_value_argument_value(this, result) }
-
-    /** Gets the child of this node. */
-    final TypeModifiers getChild() { swift_value_argument_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_value_argument_name(this, result) or
-      swift_value_argument_reference_specifier(this, _, result) or
-      swift_value_argument_value(this, result) or
-      swift_value_argument_child(this, result)
-    }
-  }
-
-  /** A class representing `value_argument_label` nodes. */
-  class ValueArgumentLabel extends @swift_value_argument_label, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ValueArgumentLabel" }
-
-    /** Gets the child of this node. */
-    final SimpleIdentifier getChild() { swift_value_argument_label_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_value_argument_label_def(this, result) }
-  }
-
-  /** A class representing `value_arguments` nodes. */
-  class ValueArguments extends @swift_value_arguments, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ValueArguments" }
-
-    /** Gets the `i`th child of this node. */
-    final ValueArgument getChild(int i) { swift_value_arguments_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_value_arguments_child(this, _, result) }
-  }
-
-  /** A class representing `value_binding_pattern` nodes. */
-  class ValueBindingPattern extends @swift_value_binding_pattern, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ValueBindingPattern" }
-
-    /** Gets the node corresponding to the field `mutability`. */
-    final string getMutability() {
-      exists(int value | swift_value_binding_pattern_def(this, value) |
-        result = "let" and value = 0
-        or
-        result = "var" and value = 1
-      )
-    }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { none() }
-  }
-
-  /** A class representing `value_pack_expansion` nodes. */
-  class ValuePackExpansion extends @swift_value_pack_expansion, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ValuePackExpansion" }
-
-    /** Gets the child of this node. */
-    final Expression getChild() { swift_value_pack_expansion_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_value_pack_expansion_def(this, result) }
-  }
-
-  /** A class representing `value_parameter_pack` nodes. */
-  class ValueParameterPack extends @swift_value_parameter_pack, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ValueParameterPack" }
-
-    /** Gets the child of this node. */
-    final Expression getChild() { swift_value_parameter_pack_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_value_parameter_pack_def(this, result) }
-  }
-
-  /** A class representing `visibility_modifier` tokens. */
-  class VisibilityModifier extends @swift_token_visibility_modifier, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "VisibilityModifier" }
-  }
-
-  /** A class representing `where_clause` nodes. */
-  class WhereClause extends @swift_where_clause, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "WhereClause" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_where_clause_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_where_clause_child(this, _, result) }
-  }
-
-  /** A class representing `where_keyword` tokens. */
-  class WhereKeyword extends @swift_token_where_keyword, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "WhereKeyword" }
-  }
-
-  /** A class representing `while_statement` nodes. */
-  class WhileStatement extends @swift_while_statement, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "WhileStatement" }
-
-    /** Gets the node corresponding to the field `condition`. */
-    final IfCondition getCondition(int i) { swift_while_statement_condition(this, i, result) }
-
-    /** Gets the child of this node. */
-    final Statements getChild() { swift_while_statement_child(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      swift_while_statement_condition(this, _, result) or swift_while_statement_child(this, result)
-    }
-  }
-
-  /** A class representing `wildcard_pattern` tokens. */
-  class WildcardPattern extends @swift_token_wildcard_pattern, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "WildcardPattern" }
-  }
-
-  /** A class representing `willset_clause` nodes. */
-  class WillsetClause extends @swift_willset_clause, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "WillsetClause" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_willset_clause_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_willset_clause_child(this, _, result) }
-  }
-
-  /** A class representing `willset_didset_block` nodes. */
-  class WillsetDidsetBlock extends @swift_willset_didset_block, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "WillsetDidsetBlock" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { swift_willset_didset_block_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { swift_willset_didset_block_child(this, _, result) }
   }
 }
diff --git a/unified/ql/lib/unified.dbscheme b/unified/ql/lib/unified.dbscheme
index b50bc56eaa2a..28718d794236 100644
--- a/unified/ql/lib/unified.dbscheme
+++ b/unified/ql/lib/unified.dbscheme
@@ -1,4 +1,4 @@
-// CodeQL database schema for Swift
+// CodeQL database schema for Unified
 // Automatically generated from the tree-sitter grammar; do not edit
 // To regenerate, run unified/scripts/create-extractor-pack.sh
 
@@ -131,2003 +131,220 @@ overlayChangedFiles(
   string path: string ref
 );
 
-/*- Swift dbscheme -*/
-case @swift_additive_expression.op of
-  0 = @swift_additive_expression_plus
-| 1 = @swift_additive_expression_minus
-;
-
-
-swift_additive_expression_def(
-  unique int id: @swift_additive_expression,
-  int lhs: @swift_expression ref,
-  int op: int ref,
-  int rhs: @swift_expression ref
-);
-
-#keyset[swift_array_literal, index]
-swift_array_literal_element(
-  int swift_array_literal: @swift_array_literal ref,
-  int index: int ref,
-  unique int element: @swift_expression ref
-);
-
-swift_array_literal_def(
-  unique int id: @swift_array_literal
-);
-
-swift_array_type_def(
-  unique int id: @swift_array_type,
-  int element: @swift_type__ ref
-);
-
-swift_as_expression_def(
-  unique int id: @swift_as_expression,
-  int expr: @swift_expression ref,
-  int type__: @swift_type__ ref,
-  int child: @swift_token_as_operator ref
-);
-
-case @swift_assignment.operator of
-  0 = @swift_assignment_percentequal
-| 1 = @swift_assignment_starequal
-| 2 = @swift_assignment_plusequal
-| 3 = @swift_assignment_minusequal
-| 4 = @swift_assignment_slashequal
-| 5 = @swift_assignment_equal
-;
-
-
-swift_assignment_def(
-  unique int id: @swift_assignment,
-  int operator: int ref,
-  int result: @swift_expression ref,
-  int target: @swift_directly_assignable_expression ref
-);
-
-swift_associatedtype_declaration_default_value(
-  unique int swift_associatedtype_declaration: @swift_associatedtype_declaration ref,
-  unique int default_value: @swift_type__ ref
-);
-
-swift_associatedtype_declaration_must_inherit(
-  unique int swift_associatedtype_declaration: @swift_associatedtype_declaration ref,
-  unique int must_inherit: @swift_type__ ref
-);
-
-@swift_associatedtype_declaration_child_type = @swift_modifiers | @swift_type_constraints
-
-#keyset[swift_associatedtype_declaration, index]
-swift_associatedtype_declaration_child(
-  int swift_associatedtype_declaration: @swift_associatedtype_declaration ref,
-  int index: int ref,
-  unique int child: @swift_associatedtype_declaration_child_type ref
-);
-
-swift_associatedtype_declaration_def(
-  unique int id: @swift_associatedtype_declaration,
-  int name: @swift_token_type_identifier ref
-);
-
-@swift_attribute_child_type = @swift_expression | @swift_user_type
-
-#keyset[swift_attribute, index]
-swift_attribute_child(
-  int swift_attribute: @swift_attribute ref,
-  int index: int ref,
-  unique int child: @swift_attribute_child_type ref
-);
-
-swift_attribute_def(
-  unique int id: @swift_attribute
-);
-
-@swift_availability_condition_child_type = @swift_identifier | @swift_token_integer_literal
-
-#keyset[swift_availability_condition, index]
-swift_availability_condition_child(
-  int swift_availability_condition: @swift_availability_condition ref,
-  int index: int ref,
-  unique int child: @swift_availability_condition_child_type ref
-);
-
-swift_availability_condition_def(
-  unique int id: @swift_availability_condition
-);
-
-swift_await_expression_expr(
-  unique int swift_await_expression: @swift_await_expression ref,
-  unique int expr: @swift_expression ref
-);
-
-swift_await_expression_child(
-  unique int swift_await_expression: @swift_await_expression ref,
-  unique int child: @swift_expression ref
-);
-
-swift_await_expression_def(
-  unique int id: @swift_await_expression
-);
-
-case @swift_bitwise_operation.op of
-  0 = @swift_bitwise_operation_ampersand
-| 1 = @swift_bitwise_operation_langlelangle
-| 2 = @swift_bitwise_operation_ranglerangle
-| 3 = @swift_bitwise_operation_caret
-| 4 = @swift_bitwise_operation_pipe
-;
-
-
-swift_bitwise_operation_def(
-  unique int id: @swift_bitwise_operation,
-  int lhs: @swift_expression ref,
-  int op: int ref,
-  int rhs: @swift_expression ref
-);
-
-@swift_call_expression_child_type = @swift_call_suffix | @swift_expression
-
-#keyset[swift_call_expression, index]
-swift_call_expression_child(
-  int swift_call_expression: @swift_call_expression ref,
-  int index: int ref,
-  unique int child: @swift_call_expression_child_type ref
-);
-
-swift_call_expression_def(
-  unique int id: @swift_call_expression
-);
-
-#keyset[swift_call_suffix, index]
-swift_call_suffix_name(
-  int swift_call_suffix: @swift_call_suffix ref,
-  int index: int ref,
-  unique int name: @swift_token_simple_identifier ref
-);
-
-@swift_call_suffix_child_type = @swift_lambda_literal | @swift_value_arguments
-
-#keyset[swift_call_suffix, index]
-swift_call_suffix_child(
-  int swift_call_suffix: @swift_call_suffix ref,
-  int index: int ref,
-  unique int child: @swift_call_suffix_child_type ref
-);
-
-swift_call_suffix_def(
-  unique int id: @swift_call_suffix
-);
-
-#keyset[swift_capture_list, index]
-swift_capture_list_child(
-  int swift_capture_list: @swift_capture_list ref,
-  int index: int ref,
-  unique int child: @swift_capture_list_item ref
-);
-
-swift_capture_list_def(
-  unique int id: @swift_capture_list
-);
-
-@swift_capture_list_item_name_type = @swift_token_self_expression | @swift_token_simple_identifier
-
-swift_capture_list_item_value(
-  unique int swift_capture_list_item: @swift_capture_list_item ref,
-  unique int value: @swift_expression ref
-);
-
-swift_capture_list_item_child(
-  unique int swift_capture_list_item: @swift_capture_list_item ref,
-  unique int child: @swift_token_ownership_modifier ref
-);
-
-swift_capture_list_item_def(
-  unique int id: @swift_capture_list_item,
-  int name: @swift_capture_list_item_name_type ref
-);
-
-swift_catch_block_error(
-  unique int swift_catch_block: @swift_catch_block ref,
-  unique int error: @swift_pattern ref
-);
-
-@swift_catch_block_child_type = @swift_statements | @swift_token_catch_keyword | @swift_where_clause
-
-#keyset[swift_catch_block, index]
-swift_catch_block_child(
-  int swift_catch_block: @swift_catch_block ref,
-  int index: int ref,
-  unique int child: @swift_catch_block_child_type ref
-);
-
-swift_catch_block_def(
-  unique int id: @swift_catch_block
-);
-
-case @swift_check_expression.op of
-  0 = @swift_check_expression_is
-;
-
-
-swift_check_expression_def(
-  unique int id: @swift_check_expression,
-  int op: int ref,
-  int target: @swift_expression ref,
-  int type__: @swift_type__ ref
-);
-
-@swift_class_body_child_type = @swift_token_multiline_comment | @swift_type_level_declaration
-
-#keyset[swift_class_body, index]
-swift_class_body_child(
-  int swift_class_body: @swift_class_body ref,
-  int index: int ref,
-  unique int child: @swift_class_body_child_type ref
-);
-
-swift_class_body_def(
-  unique int id: @swift_class_body
-);
-
-@swift_class_declaration_body_type = @swift_class_body | @swift_enum_class_body
-
-case @swift_class_declaration.declaration_kind of
-  0 = @swift_class_declaration_actor
-| 1 = @swift_class_declaration_class
-| 2 = @swift_class_declaration_enum
-| 3 = @swift_class_declaration_extension
-| 4 = @swift_class_declaration_struct
-;
-
-
-@swift_class_declaration_name_type = @swift_token_type_identifier | @swift_unannotated_type
-
-@swift_class_declaration_child_type = @swift_attribute | @swift_inheritance_specifier | @swift_modifiers | @swift_token_inheritance_modifier | @swift_token_ownership_modifier | @swift_token_property_behavior_modifier | @swift_type_constraints | @swift_type_parameters
-
-#keyset[swift_class_declaration, index]
-swift_class_declaration_child(
-  int swift_class_declaration: @swift_class_declaration ref,
-  int index: int ref,
-  unique int child: @swift_class_declaration_child_type ref
-);
-
-swift_class_declaration_def(
-  unique int id: @swift_class_declaration,
-  int body: @swift_class_declaration_body_type ref,
-  int declaration_kind: int ref,
-  int name: @swift_class_declaration_name_type ref
-);
-
-case @swift_comparison_expression.op of
-  0 = @swift_comparison_expression_langle
-| 1 = @swift_comparison_expression_langleequal
-| 2 = @swift_comparison_expression_rangle
-| 3 = @swift_comparison_expression_rangleequal
-;
-
-
-swift_comparison_expression_def(
-  unique int id: @swift_comparison_expression,
-  int lhs: @swift_expression ref,
-  int op: int ref,
-  int rhs: @swift_expression ref
-);
-
-@swift_computed_getter_child_type = @swift_attribute | @swift_getter_specifier | @swift_statements
-
-#keyset[swift_computed_getter, index]
-swift_computed_getter_child(
-  int swift_computed_getter: @swift_computed_getter ref,
-  int index: int ref,
-  unique int child: @swift_computed_getter_child_type ref
-);
-
-swift_computed_getter_def(
-  unique int id: @swift_computed_getter
-);
-
-@swift_computed_modify_child_type = @swift_attribute | @swift_modify_specifier | @swift_statements
-
-#keyset[swift_computed_modify, index]
-swift_computed_modify_child(
-  int swift_computed_modify: @swift_computed_modify ref,
-  int index: int ref,
-  unique int child: @swift_computed_modify_child_type ref
-);
-
-swift_computed_modify_def(
-  unique int id: @swift_computed_modify
-);
-
-@swift_computed_property_child_type = @swift_computed_getter | @swift_computed_modify | @swift_computed_setter | @swift_statements
-
-#keyset[swift_computed_property, index]
-swift_computed_property_child(
-  int swift_computed_property: @swift_computed_property ref,
-  int index: int ref,
-  unique int child: @swift_computed_property_child_type ref
-);
-
-swift_computed_property_def(
-  unique int id: @swift_computed_property
-);
-
-@swift_computed_setter_child_type = @swift_attribute | @swift_setter_specifier | @swift_statements | @swift_token_simple_identifier
-
-#keyset[swift_computed_setter, index]
-swift_computed_setter_child(
-  int swift_computed_setter: @swift_computed_setter ref,
-  int index: int ref,
-  unique int child: @swift_computed_setter_child_type ref
-);
-
-swift_computed_setter_def(
-  unique int id: @swift_computed_setter
-);
-
-case @swift_conjunction_expression.op of
-  0 = @swift_conjunction_expression_ampersandampersand
-;
-
-
-swift_conjunction_expression_def(
-  unique int id: @swift_conjunction_expression,
-  int lhs: @swift_expression ref,
-  int op: int ref,
-  int rhs: @swift_expression ref
-);
-
-@swift_constructor_expression_constructed_type_type = @swift_array_type | @swift_dictionary_type | @swift_user_type
-
-swift_constructor_expression_def(
-  unique int id: @swift_constructor_expression,
-  int constructed_type: @swift_constructor_expression_constructed_type_type ref,
-  int child: @swift_constructor_suffix ref
-);
-
-#keyset[swift_constructor_suffix, index]
-swift_constructor_suffix_name(
-  int swift_constructor_suffix: @swift_constructor_suffix ref,
-  int index: int ref,
-  unique int name: @swift_token_simple_identifier ref
-);
-
-@swift_constructor_suffix_child_type = @swift_lambda_literal | @swift_value_arguments
-
-#keyset[swift_constructor_suffix, index]
-swift_constructor_suffix_child(
-  int swift_constructor_suffix: @swift_constructor_suffix ref,
-  int index: int ref,
-  unique int child: @swift_constructor_suffix_child_type ref
-);
-
-swift_constructor_suffix_def(
-  unique int id: @swift_constructor_suffix
-);
-
-swift_control_transfer_statement_result(
-  unique int swift_control_transfer_statement: @swift_control_transfer_statement ref,
-  unique int result: @swift_expression ref
-);
-
-@swift_control_transfer_statement_child_type = @swift_expression | @swift_token_throw_keyword
-
-#keyset[swift_control_transfer_statement, index]
-swift_control_transfer_statement_child(
-  int swift_control_transfer_statement: @swift_control_transfer_statement ref,
-  int index: int ref,
-  unique int child: @swift_control_transfer_statement_child_type ref
-);
-
-swift_control_transfer_statement_def(
-  unique int id: @swift_control_transfer_statement
-);
-
-swift_deinit_declaration_child(
-  unique int swift_deinit_declaration: @swift_deinit_declaration ref,
-  unique int child: @swift_modifiers ref
-);
-
-swift_deinit_declaration_def(
-  unique int id: @swift_deinit_declaration,
-  int body: @swift_function_body ref
-);
-
-@swift_deprecated_operator_declaration_body_child_type = @swift_line_string_literal | @swift_multi_line_string_literal | @swift_raw_string_literal | @swift_token_bin_literal | @swift_token_boolean_literal | @swift_token_hex_literal | @swift_token_integer_literal | @swift_token_oct_literal | @swift_token_real_literal | @swift_token_regex_literal | @swift_token_simple_identifier
-
-#keyset[swift_deprecated_operator_declaration_body, index]
-swift_deprecated_operator_declaration_body_child(
-  int swift_deprecated_operator_declaration_body: @swift_deprecated_operator_declaration_body ref,
-  int index: int ref,
-  unique int child: @swift_deprecated_operator_declaration_body_child_type ref
-);
-
-swift_deprecated_operator_declaration_body_def(
-  unique int id: @swift_deprecated_operator_declaration_body
-);
-
-#keyset[swift_dictionary_literal, index]
-swift_dictionary_literal_key(
-  int swift_dictionary_literal: @swift_dictionary_literal ref,
-  int index: int ref,
-  unique int key__: @swift_expression ref
-);
-
-#keyset[swift_dictionary_literal, index]
-swift_dictionary_literal_value(
-  int swift_dictionary_literal: @swift_dictionary_literal ref,
-  int index: int ref,
-  unique int value: @swift_expression ref
-);
-
-swift_dictionary_literal_def(
-  unique int id: @swift_dictionary_literal
-);
-
-swift_dictionary_type_def(
-  unique int id: @swift_dictionary_type,
-  int key__: @swift_type__ ref,
-  int value: @swift_type__ ref
-);
-
-@swift_didset_clause_child_type = @swift_modifiers | @swift_statements | @swift_token_simple_identifier
-
-#keyset[swift_didset_clause, index]
-swift_didset_clause_child(
-  int swift_didset_clause: @swift_didset_clause ref,
-  int index: int ref,
-  unique int child: @swift_didset_clause_child_type ref
-);
-
-swift_didset_clause_def(
-  unique int id: @swift_didset_clause
-);
-
-@swift_directive_child_type = @swift_token_boolean_literal | @swift_token_integer_literal | @swift_token_simple_identifier
-
-#keyset[swift_directive, index]
-swift_directive_child(
-  int swift_directive: @swift_directive ref,
-  int index: int ref,
-  unique int child: @swift_directive_child_type ref
-);
-
-swift_directive_def(
-  unique int id: @swift_directive
-);
-
-swift_directly_assignable_expression_def(
-  unique int id: @swift_directly_assignable_expression,
-  int child: @swift_expression ref
-);
-
-case @swift_disjunction_expression.op of
-  0 = @swift_disjunction_expression_pipepipe
-;
-
-
-swift_disjunction_expression_def(
-  unique int id: @swift_disjunction_expression,
-  int lhs: @swift_expression ref,
-  int op: int ref,
-  int rhs: @swift_expression ref
-);
-
-@swift_do_statement_child_type = @swift_catch_block | @swift_statements
-
-#keyset[swift_do_statement, index]
-swift_do_statement_child(
-  int swift_do_statement: @swift_do_statement ref,
-  int index: int ref,
-  unique int child: @swift_do_statement_child_type ref
-);
-
-swift_do_statement_def(
-  unique int id: @swift_do_statement
-);
-
-@swift_enum_class_body_child_type = @swift_enum_entry | @swift_type_level_declaration
-
-#keyset[swift_enum_class_body, index]
-swift_enum_class_body_child(
-  int swift_enum_class_body: @swift_enum_class_body ref,
-  int index: int ref,
-  unique int child: @swift_enum_class_body_child_type ref
-);
-
-swift_enum_class_body_def(
-  unique int id: @swift_enum_class_body
-);
-
-#keyset[swift_enum_entry, index]
-swift_enum_entry_data_contents(
-  int swift_enum_entry: @swift_enum_entry ref,
-  int index: int ref,
-  unique int data_contents: @swift_enum_type_parameters ref
-);
-
-#keyset[swift_enum_entry, index]
-swift_enum_entry_name(
-  int swift_enum_entry: @swift_enum_entry ref,
-  int index: int ref,
-  unique int name: @swift_token_simple_identifier ref
-);
-
-#keyset[swift_enum_entry, index]
-swift_enum_entry_raw_value(
-  int swift_enum_entry: @swift_enum_entry ref,
-  int index: int ref,
-  unique int raw_value: @swift_expression ref
-);
-
-swift_enum_entry_child(
-  unique int swift_enum_entry: @swift_enum_entry ref,
-  unique int child: @swift_modifiers ref
-);
-
-swift_enum_entry_def(
-  unique int id: @swift_enum_entry
-);
-
-@swift_enum_type_parameters_child_type = @swift_expression | @swift_token_wildcard_pattern | @swift_type__
-
-#keyset[swift_enum_type_parameters, index]
-swift_enum_type_parameters_child(
-  int swift_enum_type_parameters: @swift_enum_type_parameters ref,
-  int index: int ref,
-  unique int child: @swift_enum_type_parameters_child_type ref
-);
-
-swift_enum_type_parameters_def(
-  unique int id: @swift_enum_type_parameters
-);
-
-@swift_equality_constraint_constrained_type_type = @swift_identifier | @swift_nested_type_identifier
-
-#keyset[swift_equality_constraint, index]
-swift_equality_constraint_child(
-  int swift_equality_constraint: @swift_equality_constraint ref,
-  int index: int ref,
-  unique int child: @swift_attribute ref
-);
-
-swift_equality_constraint_def(
-  unique int id: @swift_equality_constraint,
-  int constrained_type: @swift_equality_constraint_constrained_type_type ref,
-  int must_equal: @swift_type__ ref
-);
-
-case @swift_equality_expression.op of
-  0 = @swift_equality_expression_bangequal
-| 1 = @swift_equality_expression_bangequalequal
-| 2 = @swift_equality_expression_equalequal
-| 3 = @swift_equality_expression_equalequalequal
-;
-
-
-swift_equality_expression_def(
-  unique int id: @swift_equality_expression,
-  int lhs: @swift_expression ref,
-  int op: int ref,
-  int rhs: @swift_expression ref
-);
-
-swift_existential_type_def(
-  unique int id: @swift_existential_type,
-  int child: @swift_unannotated_type ref
-);
-
-@swift_expression = @swift_additive_expression | @swift_array_literal | @swift_as_expression | @swift_assignment | @swift_await_expression | @swift_bitwise_operation | @swift_call_expression | @swift_check_expression | @swift_comparison_expression | @swift_conjunction_expression | @swift_constructor_expression | @swift_dictionary_literal | @swift_directive | @swift_disjunction_expression | @swift_equality_expression | @swift_if_statement | @swift_infix_expression | @swift_key_path_expression | @swift_key_path_string_expression | @swift_lambda_literal | @swift_line_string_literal | @swift_macro_invocation | @swift_multi_line_string_literal | @swift_multiplicative_expression | @swift_navigation_expression | @swift_nil_coalescing_expression | @swift_open_end_range_expression | @swift_open_start_range_expression | @swift_optional_chain_marker | @swift_playground_literal | @swift_postfix_expression | @swift_prefix_expression | @swift_range_expression | @swift_raw_string_literal | @swift_referenceable_operator | @swift_reserved_word | @swift_selector_expression | @swift_switch_statement | @swift_ternary_expression | @swift_token_bin_literal | @swift_token_boolean_literal | @swift_token_diagnostic | @swift_token_fully_open_range | @swift_token_hex_literal | @swift_token_integer_literal | @swift_token_oct_literal | @swift_token_real_literal | @swift_token_regex_literal | @swift_token_self_expression | @swift_token_simple_identifier | @swift_token_special_literal | @swift_token_super_expression | @swift_try_expression | @swift_tuple_expression | @swift_value_pack_expansion | @swift_value_parameter_pack
-
-swift_external_macro_definition_def(
-  unique int id: @swift_external_macro_definition,
-  int child: @swift_value_arguments ref
-);
-
-@swift_for_statement_child_type = @swift_statements | @swift_token_try_operator | @swift_type_annotation | @swift_where_clause
-
-#keyset[swift_for_statement, index]
-swift_for_statement_child(
-  int swift_for_statement: @swift_for_statement ref,
-  int index: int ref,
-  unique int child: @swift_for_statement_child_type ref
-);
-
-swift_for_statement_def(
-  unique int id: @swift_for_statement,
-  int collection: @swift_expression ref,
-  int item: @swift_pattern ref
-);
-
-swift_function_body_child(
-  unique int swift_function_body: @swift_function_body ref,
-  unique int child: @swift_statements ref
-);
-
-swift_function_body_def(
-  unique int id: @swift_function_body
-);
-
-#keyset[swift_function_declaration, index]
-swift_function_declaration_default_value(
-  int swift_function_declaration: @swift_function_declaration ref,
-  int index: int ref,
-  unique int default_value: @swift_expression ref
-);
-
-@swift_function_declaration_name_type = @swift_referenceable_operator | @swift_token_simple_identifier
-
-@swift_function_declaration_return_type_type = @swift_implicitly_unwrapped_type | @swift_type__
-
-swift_function_declaration_return_type(
-  unique int swift_function_declaration: @swift_function_declaration ref,
-  unique int return_type: @swift_function_declaration_return_type_type ref
-);
-
-@swift_function_declaration_child_type = @swift_attribute | @swift_modifiers | @swift_parameter | @swift_throws_clause | @swift_token_inheritance_modifier | @swift_token_ownership_modifier | @swift_token_property_behavior_modifier | @swift_token_throws | @swift_type_constraints | @swift_type_parameters
-
-#keyset[swift_function_declaration, index]
-swift_function_declaration_child(
-  int swift_function_declaration: @swift_function_declaration ref,
-  int index: int ref,
-  unique int child: @swift_function_declaration_child_type ref
-);
-
-swift_function_declaration_def(
-  unique int id: @swift_function_declaration,
-  int body: @swift_function_body ref,
-  int name: @swift_function_declaration_name_type ref
-);
-
-@swift_function_type_child_type = @swift_throws_clause | @swift_token_throws
-
-swift_function_type_child(
-  unique int swift_function_type: @swift_function_type ref,
-  unique int child: @swift_function_type_child_type ref
-);
-
-swift_function_type_def(
-  unique int id: @swift_function_type,
-  int params: @swift_unannotated_type ref,
-  int return_type: @swift_type__ ref
-);
-
-@swift_getter_specifier_child_type = @swift_throws_clause | @swift_token_mutation_modifier | @swift_token_throws
-
-#keyset[swift_getter_specifier, index]
-swift_getter_specifier_child(
-  int swift_getter_specifier: @swift_getter_specifier ref,
-  int index: int ref,
-  unique int child: @swift_getter_specifier_child_type ref
-);
-
-swift_getter_specifier_def(
-  unique int id: @swift_getter_specifier
-);
-
-@swift_global_declaration = @swift_associatedtype_declaration | @swift_class_declaration | @swift_function_declaration | @swift_import_declaration | @swift_init_declaration | @swift_macro_declaration | @swift_operator_declaration | @swift_precedence_group_declaration | @swift_property_declaration | @swift_protocol_declaration | @swift_typealias_declaration
-
-#keyset[swift_guard_statement, index]
-swift_guard_statement_condition(
-  int swift_guard_statement: @swift_guard_statement ref,
-  int index: int ref,
-  unique int condition: @swift_if_condition ref
-);
-
-@swift_guard_statement_child_type = @swift_statements | @swift_token_else
-
-#keyset[swift_guard_statement, index]
-swift_guard_statement_child(
-  int swift_guard_statement: @swift_guard_statement ref,
-  int index: int ref,
-  unique int child: @swift_guard_statement_child_type ref
-);
-
-swift_guard_statement_def(
-  unique int id: @swift_guard_statement
-);
-
-#keyset[swift_identifier, index]
-swift_identifier_child(
-  int swift_identifier: @swift_identifier ref,
-  int index: int ref,
-  unique int child: @swift_token_simple_identifier ref
-);
-
-swift_identifier_def(
-  unique int id: @swift_identifier
-);
-
-@swift_if_condition_child_type = @swift_availability_condition | @swift_expression | @swift_if_let_binding
-
-swift_if_condition_def(
-  unique int id: @swift_if_condition,
-  int child: @swift_if_condition_child_type ref
-);
-
-swift_if_let_binding_bound_identifier(
-  unique int swift_if_let_binding: @swift_if_let_binding ref,
-  unique int bound_identifier: @swift_token_simple_identifier ref
-);
-
-@swift_if_let_binding_child_type = @swift_expression | @swift_pattern | @swift_token_wildcard_pattern | @swift_type__ | @swift_type_annotation | @swift_user_type | @swift_value_binding_pattern | @swift_where_clause
-
-#keyset[swift_if_let_binding, index]
-swift_if_let_binding_child(
-  int swift_if_let_binding: @swift_if_let_binding ref,
-  int index: int ref,
-  unique int child: @swift_if_let_binding_child_type ref
-);
-
-swift_if_let_binding_def(
-  unique int id: @swift_if_let_binding
-);
-
-#keyset[swift_if_statement, index]
-swift_if_statement_condition(
-  int swift_if_statement: @swift_if_statement ref,
-  int index: int ref,
-  unique int condition: @swift_if_condition ref
-);
-
-@swift_if_statement_child_type = @swift_if_statement | @swift_statements | @swift_token_else
-
-#keyset[swift_if_statement, index]
-swift_if_statement_child(
-  int swift_if_statement: @swift_if_statement ref,
-  int index: int ref,
-  unique int child: @swift_if_statement_child_type ref
-);
-
-swift_if_statement_def(
-  unique int id: @swift_if_statement
-);
-
-swift_implicitly_unwrapped_type_def(
-  unique int id: @swift_implicitly_unwrapped_type,
-  int child: @swift_type__ ref
-);
-
-@swift_import_declaration_child_type = @swift_identifier | @swift_modifiers
-
-#keyset[swift_import_declaration, index]
-swift_import_declaration_child(
-  int swift_import_declaration: @swift_import_declaration ref,
-  int index: int ref,
-  unique int child: @swift_import_declaration_child_type ref
-);
-
-swift_import_declaration_def(
-  unique int id: @swift_import_declaration
-);
-
-swift_infix_expression_def(
-  unique int id: @swift_infix_expression,
-  int lhs: @swift_expression ref,
-  int op: @swift_token_custom_operator ref,
-  int rhs: @swift_expression ref
-);
-
-@swift_inheritance_constraint_constrained_type_type = @swift_identifier | @swift_nested_type_identifier
-
-@swift_inheritance_constraint_inherits_from_type = @swift_implicitly_unwrapped_type | @swift_type__
-
-#keyset[swift_inheritance_constraint, index]
-swift_inheritance_constraint_child(
-  int swift_inheritance_constraint: @swift_inheritance_constraint ref,
-  int index: int ref,
-  unique int child: @swift_attribute ref
-);
-
-swift_inheritance_constraint_def(
-  unique int id: @swift_inheritance_constraint,
-  int constrained_type: @swift_inheritance_constraint_constrained_type_type ref,
-  int inherits_from: @swift_inheritance_constraint_inherits_from_type ref
-);
-
-@swift_inheritance_specifier_inherits_from_type = @swift_function_type | @swift_suppressed_constraint | @swift_user_type
-
-swift_inheritance_specifier_def(
-  unique int id: @swift_inheritance_specifier,
-  int inherits_from: @swift_inheritance_specifier_inherits_from_type ref
-);
-
-swift_init_declaration_body(
-  unique int swift_init_declaration: @swift_init_declaration ref,
-  unique int body: @swift_function_body ref
-);
-
-#keyset[swift_init_declaration, index]
-swift_init_declaration_default_value(
-  int swift_init_declaration: @swift_init_declaration ref,
-  int index: int ref,
-  unique int default_value: @swift_expression ref
-);
-
-case @swift_init_declaration.name of
-  0 = @swift_init_declaration_init
-;
-
-
-@swift_init_declaration_child_type = @swift_attribute | @swift_modifiers | @swift_parameter | @swift_throws_clause | @swift_token_bang | @swift_token_throws | @swift_type_constraints | @swift_type_parameters
-
-#keyset[swift_init_declaration, index]
-swift_init_declaration_child(
-  int swift_init_declaration: @swift_init_declaration ref,
-  int index: int ref,
-  unique int child: @swift_init_declaration_child_type ref
-);
-
-swift_init_declaration_def(
-  unique int id: @swift_init_declaration,
-  int name: int ref
-);
-
-swift_interpolated_expression_name(
-  unique int swift_interpolated_expression: @swift_interpolated_expression ref,
-  unique int name: @swift_value_argument_label ref
-);
-
-#keyset[swift_interpolated_expression, index]
-swift_interpolated_expression_reference_specifier(
-  int swift_interpolated_expression: @swift_interpolated_expression ref,
-  int index: int ref,
-  unique int reference_specifier: @swift_value_argument_label ref
-);
-
-swift_interpolated_expression_value(
-  unique int swift_interpolated_expression: @swift_interpolated_expression ref,
-  unique int value: @swift_expression ref
-);
-
-swift_interpolated_expression_child(
-  unique int swift_interpolated_expression: @swift_interpolated_expression ref,
-  unique int child: @swift_type_modifiers ref
-);
-
-swift_interpolated_expression_def(
-  unique int id: @swift_interpolated_expression
-);
-
-@swift_key_path_expression_child_type = @swift_array_type | @swift_dictionary_type | @swift_token_bang | @swift_token_simple_identifier | @swift_token_type_identifier | @swift_type_arguments | @swift_value_argument
-
-#keyset[swift_key_path_expression, index]
-swift_key_path_expression_child(
-  int swift_key_path_expression: @swift_key_path_expression ref,
-  int index: int ref,
-  unique int child: @swift_key_path_expression_child_type ref
-);
-
-swift_key_path_expression_def(
-  unique int id: @swift_key_path_expression
-);
-
-swift_key_path_string_expression_def(
-  unique int id: @swift_key_path_string_expression,
-  int child: @swift_expression ref
-);
-
-@swift_lambda_function_type_return_type_type = @swift_implicitly_unwrapped_type | @swift_type__
-
-swift_lambda_function_type_return_type(
-  unique int swift_lambda_function_type: @swift_lambda_function_type ref,
-  unique int return_type: @swift_lambda_function_type_return_type_type ref
-);
-
-@swift_lambda_function_type_child_type = @swift_lambda_function_type_parameters | @swift_throws_clause | @swift_token_throws
-
-#keyset[swift_lambda_function_type, index]
-swift_lambda_function_type_child(
-  int swift_lambda_function_type: @swift_lambda_function_type ref,
-  int index: int ref,
-  unique int child: @swift_lambda_function_type_child_type ref
-);
-
-swift_lambda_function_type_def(
-  unique int id: @swift_lambda_function_type
-);
-
-#keyset[swift_lambda_function_type_parameters, index]
-swift_lambda_function_type_parameters_child(
-  int swift_lambda_function_type_parameters: @swift_lambda_function_type_parameters ref,
-  int index: int ref,
-  unique int child: @swift_lambda_parameter ref
-);
-
-swift_lambda_function_type_parameters_def(
-  unique int id: @swift_lambda_function_type_parameters
-);
-
-swift_lambda_literal_captures(
-  unique int swift_lambda_literal: @swift_lambda_literal ref,
-  unique int captures: @swift_capture_list ref
-);
-
-swift_lambda_literal_type(
-  unique int swift_lambda_literal: @swift_lambda_literal ref,
-  unique int type__: @swift_lambda_function_type ref
-);
-
-@swift_lambda_literal_child_type = @swift_attribute | @swift_statements
-
-#keyset[swift_lambda_literal, index]
-swift_lambda_literal_child(
-  int swift_lambda_literal: @swift_lambda_literal ref,
-  int index: int ref,
-  unique int child: @swift_lambda_literal_child_type ref
-);
-
-swift_lambda_literal_def(
-  unique int id: @swift_lambda_literal
-);
-
-swift_lambda_parameter_external_name(
-  unique int swift_lambda_parameter: @swift_lambda_parameter ref,
-  unique int external_name: @swift_token_simple_identifier ref
-);
-
-swift_lambda_parameter_name(
-  unique int swift_lambda_parameter: @swift_lambda_parameter ref,
-  unique int name: @swift_token_simple_identifier ref
-);
-
-@swift_lambda_parameter_type_type = @swift_implicitly_unwrapped_type | @swift_type__
-
-swift_lambda_parameter_type(
-  unique int swift_lambda_parameter: @swift_lambda_parameter ref,
-  unique int type__: @swift_lambda_parameter_type_type ref
-);
-
-@swift_lambda_parameter_child_type = @swift_parameter_modifiers | @swift_token_self_expression
-
-swift_lambda_parameter_child(
-  unique int swift_lambda_parameter: @swift_lambda_parameter ref,
-  unique int child: @swift_lambda_parameter_child_type ref
-);
-
-swift_lambda_parameter_def(
-  unique int id: @swift_lambda_parameter
-);
-
-#keyset[swift_line_string_literal, index]
-swift_line_string_literal_interpolation(
-  int swift_line_string_literal: @swift_line_string_literal ref,
-  int index: int ref,
-  unique int interpolation: @swift_interpolated_expression ref
-);
-
-@swift_line_string_literal_text_type = @swift_token_line_str_text | @swift_token_str_escaped_char
-
-#keyset[swift_line_string_literal, index]
-swift_line_string_literal_text(
-  int swift_line_string_literal: @swift_line_string_literal ref,
-  int index: int ref,
-  unique int text: @swift_line_string_literal_text_type ref
-);
-
-swift_line_string_literal_def(
-  unique int id: @swift_line_string_literal
-);
-
-@swift_local_declaration = @swift_class_declaration | @swift_function_declaration | @swift_property_declaration | @swift_typealias_declaration
-
-#keyset[swift_macro_declaration, index]
-swift_macro_declaration_default_value(
-  int swift_macro_declaration: @swift_macro_declaration ref,
-  int index: int ref,
-  unique int default_value: @swift_expression ref
-);
-
-swift_macro_declaration_definition(
-  unique int swift_macro_declaration: @swift_macro_declaration ref,
-  unique int definition: @swift_macro_definition ref
-);
-
-@swift_macro_declaration_child_type = @swift_attribute | @swift_modifiers | @swift_parameter | @swift_token_simple_identifier | @swift_type_constraints | @swift_type_parameters | @swift_unannotated_type
-
-#keyset[swift_macro_declaration, index]
-swift_macro_declaration_child(
-  int swift_macro_declaration: @swift_macro_declaration ref,
-  int index: int ref,
-  unique int child: @swift_macro_declaration_child_type ref
-);
-
-swift_macro_declaration_def(
-  unique int id: @swift_macro_declaration
-);
-
-@swift_macro_definition_body_type = @swift_expression | @swift_external_macro_definition
-
-swift_macro_definition_def(
-  unique int id: @swift_macro_definition,
-  int body: @swift_macro_definition_body_type ref
-);
-
-@swift_macro_invocation_child_type = @swift_call_suffix | @swift_token_simple_identifier | @swift_type_parameters
-
-#keyset[swift_macro_invocation, index]
-swift_macro_invocation_child(
-  int swift_macro_invocation: @swift_macro_invocation ref,
-  int index: int ref,
-  unique int child: @swift_macro_invocation_child_type ref
-);
-
-swift_macro_invocation_def(
-  unique int id: @swift_macro_invocation
-);
-
-swift_metatype_def(
-  unique int id: @swift_metatype,
-  int child: @swift_unannotated_type ref
-);
-
-@swift_modifiers_child_type = @swift_attribute | @swift_token_function_modifier | @swift_token_inheritance_modifier | @swift_token_member_modifier | @swift_token_mutation_modifier | @swift_token_ownership_modifier | @swift_token_parameter_modifier | @swift_token_property_behavior_modifier | @swift_token_property_modifier | @swift_token_visibility_modifier
-
-#keyset[swift_modifiers, index]
-swift_modifiers_child(
-  int swift_modifiers: @swift_modifiers ref,
-  int index: int ref,
-  unique int child: @swift_modifiers_child_type ref
-);
-
-swift_modifiers_def(
-  unique int id: @swift_modifiers
-);
-
-swift_modify_specifier_child(
-  unique int swift_modify_specifier: @swift_modify_specifier ref,
-  unique int child: @swift_token_mutation_modifier ref
-);
-
-swift_modify_specifier_def(
-  unique int id: @swift_modify_specifier
-);
-
-#keyset[swift_multi_line_string_literal, index]
-swift_multi_line_string_literal_interpolation(
-  int swift_multi_line_string_literal: @swift_multi_line_string_literal ref,
-  int index: int ref,
-  unique int interpolation: @swift_interpolated_expression ref
-);
-
-@swift_multi_line_string_literal_text_type = @swift_reserved_word | @swift_token_multi_line_str_text | @swift_token_str_escaped_char
-
-#keyset[swift_multi_line_string_literal, index]
-swift_multi_line_string_literal_text(
-  int swift_multi_line_string_literal: @swift_multi_line_string_literal ref,
-  int index: int ref,
-  unique int text: @swift_multi_line_string_literal_text_type ref
-);
-
-swift_multi_line_string_literal_def(
-  unique int id: @swift_multi_line_string_literal
-);
-
-case @swift_multiplicative_expression.op of
-  0 = @swift_multiplicative_expression_percent
-| 1 = @swift_multiplicative_expression_star
-| 2 = @swift_multiplicative_expression_slash
-;
-
-
-swift_multiplicative_expression_def(
-  unique int id: @swift_multiplicative_expression,
-  int lhs: @swift_expression ref,
-  int op: int ref,
-  int rhs: @swift_expression ref
-);
-
-@swift_navigation_expression_target_type = @swift_array_type | @swift_dictionary_type | @swift_existential_type | @swift_expression | @swift_opaque_type | @swift_reserved_word | @swift_user_type
-
-#keyset[swift_navigation_expression, index]
-swift_navigation_expression_target(
-  int swift_navigation_expression: @swift_navigation_expression ref,
-  int index: int ref,
-  unique int target: @swift_navigation_expression_target_type ref
-);
-
-swift_navigation_expression_def(
-  unique int id: @swift_navigation_expression,
-  int suffix: @swift_navigation_suffix ref
-);
-
-@swift_navigation_suffix_suffix_type = @swift_token_integer_literal | @swift_token_simple_identifier
-
-swift_navigation_suffix_def(
-  unique int id: @swift_navigation_suffix,
-  int suffix: @swift_navigation_suffix_suffix_type ref
-);
-
-@swift_nested_type_identifier_child_type = @swift_token_simple_identifier | @swift_unannotated_type
-
-#keyset[swift_nested_type_identifier, index]
-swift_nested_type_identifier_child(
-  int swift_nested_type_identifier: @swift_nested_type_identifier ref,
-  int index: int ref,
-  unique int child: @swift_nested_type_identifier_child_type ref
-);
-
-swift_nested_type_identifier_def(
-  unique int id: @swift_nested_type_identifier
-);
-
-swift_nil_coalescing_expression_def(
-  unique int id: @swift_nil_coalescing_expression,
-  int if_nil: @swift_expression ref,
-  int value: @swift_expression ref
-);
-
-swift_opaque_type_def(
-  unique int id: @swift_opaque_type,
-  int child: @swift_unannotated_type ref
-);
-
-swift_open_end_range_expression_def(
-  unique int id: @swift_open_end_range_expression,
-  int start: @swift_expression ref
-);
-
-swift_open_start_range_expression_def(
-  unique int id: @swift_open_start_range_expression,
-  int end: @swift_expression ref
-);
-
-@swift_operator_declaration_child_type = @swift_deprecated_operator_declaration_body | @swift_referenceable_operator | @swift_token_simple_identifier
-
-#keyset[swift_operator_declaration, index]
-swift_operator_declaration_child(
-  int swift_operator_declaration: @swift_operator_declaration ref,
-  int index: int ref,
-  unique int child: @swift_operator_declaration_child_type ref
-);
-
-swift_operator_declaration_def(
-  unique int id: @swift_operator_declaration
-);
-
-swift_optional_chain_marker_def(
-  unique int id: @swift_optional_chain_marker,
-  int child: @swift_expression ref
-);
-
-@swift_optional_type_wrapped_type = @swift_array_type | @swift_dictionary_type | @swift_tuple_type | @swift_user_type
-
-swift_optional_type_def(
-  unique int id: @swift_optional_type,
-  int wrapped: @swift_optional_type_wrapped_type ref
-);
-
-swift_parameter_external_name(
-  unique int swift_parameter: @swift_parameter ref,
-  unique int external_name: @swift_token_simple_identifier ref
-);
-
-@swift_parameter_type_type = @swift_implicitly_unwrapped_type | @swift_type__
-
-swift_parameter_child(
-  unique int swift_parameter: @swift_parameter ref,
-  unique int child: @swift_parameter_modifiers ref
-);
-
-swift_parameter_def(
-  unique int id: @swift_parameter,
-  int name: @swift_token_simple_identifier ref,
-  int type__: @swift_parameter_type_type ref
-);
-
-#keyset[swift_parameter_modifiers, index]
-swift_parameter_modifiers_child(
-  int swift_parameter_modifiers: @swift_parameter_modifiers ref,
-  int index: int ref,
-  unique int child: @swift_token_parameter_modifier ref
-);
-
-swift_parameter_modifiers_def(
-  unique int id: @swift_parameter_modifiers
-);
-
-swift_pattern_bound_identifier(
-  unique int swift_pattern: @swift_pattern ref,
-  unique int bound_identifier: @swift_token_simple_identifier ref
-);
-
-@swift_pattern_child_type = @swift_expression | @swift_pattern | @swift_token_wildcard_pattern | @swift_type__ | @swift_user_type | @swift_value_binding_pattern
-
-#keyset[swift_pattern, index]
-swift_pattern_child(
-  int swift_pattern: @swift_pattern ref,
-  int index: int ref,
-  unique int child: @swift_pattern_child_type ref
-);
-
-swift_pattern_def(
-  unique int id: @swift_pattern
-);
-
-#keyset[swift_playground_literal, index]
-swift_playground_literal_child(
-  int swift_playground_literal: @swift_playground_literal ref,
-  int index: int ref,
-  unique int child: @swift_expression ref
-);
-
-swift_playground_literal_def(
-  unique int id: @swift_playground_literal
-);
-
-@swift_postfix_expression_operation_type = @swift_reserved_word | @swift_token_bang
-
-swift_postfix_expression_def(
-  unique int id: @swift_postfix_expression,
-  int operation: @swift_postfix_expression_operation_type ref,
-  int target: @swift_expression ref
-);
-
-@swift_precedence_group_attribute_child_type = @swift_token_boolean_literal | @swift_token_simple_identifier
-
-#keyset[swift_precedence_group_attribute, index]
-swift_precedence_group_attribute_child(
-  int swift_precedence_group_attribute: @swift_precedence_group_attribute ref,
-  int index: int ref,
-  unique int child: @swift_precedence_group_attribute_child_type ref
-);
-
-swift_precedence_group_attribute_def(
-  unique int id: @swift_precedence_group_attribute
-);
-
-#keyset[swift_precedence_group_attributes, index]
-swift_precedence_group_attributes_child(
-  int swift_precedence_group_attributes: @swift_precedence_group_attributes ref,
-  int index: int ref,
-  unique int child: @swift_precedence_group_attribute ref
-);
-
-swift_precedence_group_attributes_def(
-  unique int id: @swift_precedence_group_attributes
-);
-
-@swift_precedence_group_declaration_child_type = @swift_precedence_group_attributes | @swift_token_simple_identifier
-
-#keyset[swift_precedence_group_declaration, index]
-swift_precedence_group_declaration_child(
-  int swift_precedence_group_declaration: @swift_precedence_group_declaration ref,
-  int index: int ref,
-  unique int child: @swift_precedence_group_declaration_child_type ref
-);
-
-swift_precedence_group_declaration_def(
-  unique int id: @swift_precedence_group_declaration
-);
-
-@swift_prefix_expression_operation_type = @swift_reserved_word | @swift_token_bang | @swift_token_custom_operator
-
-swift_prefix_expression_def(
-  unique int id: @swift_prefix_expression,
-  int operation: @swift_prefix_expression_operation_type ref,
-  int target: @swift_expression ref
-);
-
-#keyset[swift_property_declaration, index]
-swift_property_declaration_computed_value(
-  int swift_property_declaration: @swift_property_declaration ref,
-  int index: int ref,
-  unique int computed_value: @swift_computed_property ref
-);
-
-#keyset[swift_property_declaration, index]
-swift_property_declaration_name(
-  int swift_property_declaration: @swift_property_declaration ref,
-  int index: int ref,
-  unique int name: @swift_pattern ref
-);
-
-#keyset[swift_property_declaration, index]
-swift_property_declaration_value(
-  int swift_property_declaration: @swift_property_declaration ref,
-  int index: int ref,
-  unique int value: @swift_expression ref
-);
-
-@swift_property_declaration_child_type = @swift_attribute | @swift_modifiers | @swift_token_inheritance_modifier | @swift_token_ownership_modifier | @swift_token_property_behavior_modifier | @swift_type_annotation | @swift_type_constraints | @swift_value_binding_pattern | @swift_willset_didset_block
-
-#keyset[swift_property_declaration, index]
-swift_property_declaration_child(
-  int swift_property_declaration: @swift_property_declaration ref,
-  int index: int ref,
-  unique int child: @swift_property_declaration_child_type ref
-);
-
-swift_property_declaration_def(
-  unique int id: @swift_property_declaration
-);
-
-#keyset[swift_protocol_body, index]
-swift_protocol_body_child(
-  int swift_protocol_body: @swift_protocol_body ref,
-  int index: int ref,
-  unique int child: @swift_protocol_member_declaration ref
-);
-
-swift_protocol_body_def(
-  unique int id: @swift_protocol_body
-);
-
-#keyset[swift_protocol_composition_type, index]
-swift_protocol_composition_type_child(
-  int swift_protocol_composition_type: @swift_protocol_composition_type ref,
-  int index: int ref,
-  unique int child: @swift_unannotated_type ref
-);
-
-swift_protocol_composition_type_def(
-  unique int id: @swift_protocol_composition_type
-);
-
-case @swift_protocol_declaration.declaration_kind of
-  0 = @swift_protocol_declaration_protocol
-;
-
-
-@swift_protocol_declaration_child_type = @swift_attribute | @swift_inheritance_specifier | @swift_modifiers | @swift_type_constraints | @swift_type_parameters
-
-#keyset[swift_protocol_declaration, index]
-swift_protocol_declaration_child(
-  int swift_protocol_declaration: @swift_protocol_declaration ref,
-  int index: int ref,
-  unique int child: @swift_protocol_declaration_child_type ref
-);
-
-swift_protocol_declaration_def(
-  unique int id: @swift_protocol_declaration,
-  int body: @swift_protocol_body ref,
-  int declaration_kind: int ref,
-  int name: @swift_token_type_identifier ref
-);
-
-swift_protocol_function_declaration_body(
-  unique int swift_protocol_function_declaration: @swift_protocol_function_declaration ref,
-  unique int body: @swift_function_body ref
-);
-
-#keyset[swift_protocol_function_declaration, index]
-swift_protocol_function_declaration_default_value(
-  int swift_protocol_function_declaration: @swift_protocol_function_declaration ref,
-  int index: int ref,
-  unique int default_value: @swift_expression ref
-);
-
-@swift_protocol_function_declaration_name_type = @swift_referenceable_operator | @swift_token_simple_identifier
-
-@swift_protocol_function_declaration_return_type_type = @swift_implicitly_unwrapped_type | @swift_type__
-
-swift_protocol_function_declaration_return_type(
-  unique int swift_protocol_function_declaration: @swift_protocol_function_declaration ref,
-  unique int return_type: @swift_protocol_function_declaration_return_type_type ref
-);
-
-@swift_protocol_function_declaration_child_type = @swift_attribute | @swift_modifiers | @swift_parameter | @swift_throws_clause | @swift_token_throws | @swift_type_constraints | @swift_type_parameters
-
-#keyset[swift_protocol_function_declaration, index]
-swift_protocol_function_declaration_child(
-  int swift_protocol_function_declaration: @swift_protocol_function_declaration ref,
-  int index: int ref,
-  unique int child: @swift_protocol_function_declaration_child_type ref
-);
-
-swift_protocol_function_declaration_def(
-  unique int id: @swift_protocol_function_declaration,
-  int name: @swift_protocol_function_declaration_name_type ref
-);
-
-@swift_protocol_member_declaration = @swift_associatedtype_declaration | @swift_deinit_declaration | @swift_init_declaration | @swift_protocol_function_declaration | @swift_protocol_property_declaration | @swift_subscript_declaration | @swift_typealias_declaration
-
-@swift_protocol_property_declaration_child_type = @swift_modifiers | @swift_protocol_property_requirements | @swift_type_annotation | @swift_type_constraints
-
-#keyset[swift_protocol_property_declaration, index]
-swift_protocol_property_declaration_child(
-  int swift_protocol_property_declaration: @swift_protocol_property_declaration ref,
-  int index: int ref,
-  unique int child: @swift_protocol_property_declaration_child_type ref
-);
-
-swift_protocol_property_declaration_def(
-  unique int id: @swift_protocol_property_declaration,
-  int name: @swift_pattern ref
-);
-
-@swift_protocol_property_requirements_child_type = @swift_getter_specifier | @swift_setter_specifier
-
-#keyset[swift_protocol_property_requirements, index]
-swift_protocol_property_requirements_child(
-  int swift_protocol_property_requirements: @swift_protocol_property_requirements ref,
-  int index: int ref,
-  unique int child: @swift_protocol_property_requirements_child_type ref
-);
-
-swift_protocol_property_requirements_def(
-  unique int id: @swift_protocol_property_requirements
-);
-
-case @swift_range_expression.op of
-  0 = @swift_range_expression_dotdotdot
-| 1 = @swift_range_expression_dotdotlangle
-;
-
-
-swift_range_expression_def(
-  unique int id: @swift_range_expression,
-  int end: @swift_expression ref,
-  int op: int ref,
-  int start: @swift_expression ref
-);
-
-#keyset[swift_raw_str_interpolation, index]
-swift_raw_str_interpolation_interpolation(
-  int swift_raw_str_interpolation: @swift_raw_str_interpolation ref,
-  int index: int ref,
-  unique int interpolation: @swift_interpolated_expression ref
-);
-
-swift_raw_str_interpolation_def(
-  unique int id: @swift_raw_str_interpolation,
-  int child: @swift_token_raw_str_interpolation_start ref
-);
-
-#keyset[swift_raw_string_literal, index]
-swift_raw_string_literal_interpolation(
-  int swift_raw_string_literal: @swift_raw_string_literal ref,
-  int index: int ref,
-  unique int interpolation: @swift_raw_str_interpolation ref
-);
-
-@swift_raw_string_literal_text_type = @swift_token_raw_str_end_part | @swift_token_raw_str_part
-
-#keyset[swift_raw_string_literal, index]
-swift_raw_string_literal_text(
-  int swift_raw_string_literal: @swift_raw_string_literal ref,
-  int index: int ref,
-  unique int text: @swift_raw_string_literal_text_type ref
-);
-
-#keyset[swift_raw_string_literal, index]
-swift_raw_string_literal_child(
-  int swift_raw_string_literal: @swift_raw_string_literal ref,
-  int index: int ref,
-  unique int child: @swift_token_raw_str_continuing_indicator ref
-);
-
-swift_raw_string_literal_def(
-  unique int id: @swift_raw_string_literal
-);
-
-@swift_referenceable_operator_child_type = @swift_token_bang | @swift_token_custom_operator
-
-swift_referenceable_operator_child(
-  unique int swift_referenceable_operator: @swift_referenceable_operator ref,
-  unique int child: @swift_referenceable_operator_child_type ref
-);
-
-swift_referenceable_operator_def(
-  unique int id: @swift_referenceable_operator
-);
-
-#keyset[swift_repeat_while_statement, index]
-swift_repeat_while_statement_condition(
-  int swift_repeat_while_statement: @swift_repeat_while_statement ref,
-  int index: int ref,
-  unique int condition: @swift_if_condition ref
-);
-
-swift_repeat_while_statement_child(
-  unique int swift_repeat_while_statement: @swift_repeat_while_statement ref,
-  unique int child: @swift_statements ref
-);
-
-swift_repeat_while_statement_def(
-  unique int id: @swift_repeat_while_statement
-);
-
-swift_selector_expression_def(
-  unique int id: @swift_selector_expression,
-  int child: @swift_expression ref
-);
-
-swift_setter_specifier_child(
-  unique int swift_setter_specifier: @swift_setter_specifier ref,
-  unique int child: @swift_token_mutation_modifier ref
-);
-
-swift_setter_specifier_def(
-  unique int id: @swift_setter_specifier
-);
-
-@swift_source_file_child_type = @swift_do_statement | @swift_expression | @swift_for_statement | @swift_global_declaration | @swift_guard_statement | @swift_repeat_while_statement | @swift_token_shebang_line | @swift_token_statement_label | @swift_token_throw_keyword | @swift_while_statement
-
-#keyset[swift_source_file, index]
-swift_source_file_child(
-  int swift_source_file: @swift_source_file ref,
-  int index: int ref,
-  unique int child: @swift_source_file_child_type ref
-);
-
-swift_source_file_def(
-  unique int id: @swift_source_file
-);
-
-@swift_statements_child_type = @swift_control_transfer_statement | @swift_do_statement | @swift_expression | @swift_for_statement | @swift_guard_statement | @swift_local_declaration | @swift_repeat_while_statement | @swift_token_statement_label | @swift_while_statement
-
-#keyset[swift_statements, index]
-swift_statements_child(
-  int swift_statements: @swift_statements ref,
-  int index: int ref,
-  unique int child: @swift_statements_child_type ref
-);
-
-swift_statements_def(
-  unique int id: @swift_statements
-);
-
-#keyset[swift_subscript_declaration, index]
-swift_subscript_declaration_default_value(
-  int swift_subscript_declaration: @swift_subscript_declaration ref,
-  int index: int ref,
-  unique int default_value: @swift_expression ref
-);
-
-@swift_subscript_declaration_return_type_type = @swift_implicitly_unwrapped_type | @swift_type__
-
-swift_subscript_declaration_return_type(
-  unique int swift_subscript_declaration: @swift_subscript_declaration ref,
-  unique int return_type: @swift_subscript_declaration_return_type_type ref
-);
-
-@swift_subscript_declaration_child_type = @swift_attribute | @swift_computed_property | @swift_modifiers | @swift_parameter | @swift_type_constraints | @swift_type_parameters
-
-#keyset[swift_subscript_declaration, index]
-swift_subscript_declaration_child(
-  int swift_subscript_declaration: @swift_subscript_declaration ref,
-  int index: int ref,
-  unique int child: @swift_subscript_declaration_child_type ref
-);
-
-swift_subscript_declaration_def(
-  unique int id: @swift_subscript_declaration
-);
-
-swift_suppressed_constraint_def(
-  unique int id: @swift_suppressed_constraint,
-  int suppressed: @swift_token_type_identifier ref
-);
-
-@swift_switch_entry_child_type = @swift_expression | @swift_modifiers | @swift_statements | @swift_switch_pattern | @swift_token_default_keyword | @swift_token_where_keyword
-
-#keyset[swift_switch_entry, index]
-swift_switch_entry_child(
-  int swift_switch_entry: @swift_switch_entry ref,
-  int index: int ref,
-  unique int child: @swift_switch_entry_child_type ref
-);
-
-swift_switch_entry_def(
-  unique int id: @swift_switch_entry
-);
-
-swift_switch_pattern_def(
-  unique int id: @swift_switch_pattern,
-  int child: @swift_pattern ref
-);
-
-#keyset[swift_switch_statement, index]
-swift_switch_statement_child(
-  int swift_switch_statement: @swift_switch_statement ref,
-  int index: int ref,
-  unique int child: @swift_switch_entry ref
-);
-
-swift_switch_statement_def(
-  unique int id: @swift_switch_statement,
-  int expr: @swift_expression ref
-);
-
-swift_ternary_expression_def(
-  unique int id: @swift_ternary_expression,
-  int condition: @swift_expression ref,
-  int if_false: @swift_expression ref,
-  int if_true: @swift_expression ref
-);
-
-swift_throws_clause_def(
-  unique int id: @swift_throws_clause,
-  int type__: @swift_unannotated_type ref
-);
-
-swift_try_expression_def(
-  unique int id: @swift_try_expression,
-  int expr: @swift_expression ref,
-  int child: @swift_token_try_operator ref
-);
-
-#keyset[swift_tuple_expression, index]
-swift_tuple_expression_name(
-  int swift_tuple_expression: @swift_tuple_expression ref,
-  int index: int ref,
-  unique int name: @swift_token_simple_identifier ref
-);
-
-#keyset[swift_tuple_expression, index]
-swift_tuple_expression_value(
-  int swift_tuple_expression: @swift_tuple_expression ref,
-  int index: int ref,
-  unique int value: @swift_expression ref
-);
-
-swift_tuple_expression_def(
-  unique int id: @swift_tuple_expression
-);
-
-#keyset[swift_tuple_type, index]
-swift_tuple_type_element(
-  int swift_tuple_type: @swift_tuple_type ref,
-  int index: int ref,
-  unique int element: @swift_tuple_type_item ref
-);
-
-swift_tuple_type_child(
-  unique int swift_tuple_type: @swift_tuple_type ref,
-  unique int child: @swift_tuple_type_item ref
-);
-
-swift_tuple_type_def(
-  unique int id: @swift_tuple_type
-);
-
-swift_tuple_type_item_name(
-  unique int swift_tuple_type_item: @swift_tuple_type_item ref,
-  unique int name: @swift_token_simple_identifier ref
-);
-
-swift_tuple_type_item_type(
-  unique int swift_tuple_type_item: @swift_tuple_type_item ref,
-  unique int type__: @swift_type__ ref
-);
-
-@swift_tuple_type_item_child_type = @swift_dictionary_type | @swift_existential_type | @swift_opaque_type | @swift_parameter_modifiers | @swift_token_wildcard_pattern
-
-#keyset[swift_tuple_type_item, index]
-swift_tuple_type_item_child(
-  int swift_tuple_type_item: @swift_tuple_type_item ref,
+/*- Unified dbscheme -*/
+#keyset[unified_apply_pattern, index]
+unified_apply_pattern_argument(
+  int unified_apply_pattern: @unified_apply_pattern ref,
   int index: int ref,
-  unique int child: @swift_tuple_type_item_child_type ref
-);
-
-swift_tuple_type_item_def(
-  unique int id: @swift_tuple_type_item
+  unique int argument: @unified_pattern ref
 );
 
-swift_type_modifiers(
-  unique int swift_type__: @swift_type__ ref,
-  unique int modifiers: @swift_type_modifiers ref
+unified_apply_pattern_def(
+  unique int id: @unified_apply_pattern,
+  int constructor: @unified_expr ref
 );
 
-swift_type_def(
-  unique int id: @swift_type__,
-  int name: @swift_unannotated_type ref
+unified_binary_expr_def(
+  unique int id: @unified_binary_expr,
+  int left: @unified_expr ref,
+  int operator: @unified_token_operator ref,
+  int right: @unified_expr ref
 );
 
-@swift_type_annotation_type_type = @swift_implicitly_unwrapped_type | @swift_type__
-
-swift_type_annotation_def(
-  unique int id: @swift_type_annotation,
-  int type__: @swift_type_annotation_type_type ref
-);
-
-#keyset[swift_type_arguments, index]
-swift_type_arguments_child(
-  int swift_type_arguments: @swift_type_arguments ref,
+#keyset[unified_block_stmt, index]
+unified_block_stmt_body(
+  int unified_block_stmt: @unified_block_stmt ref,
   int index: int ref,
-  unique int child: @swift_type__ ref
-);
-
-swift_type_arguments_def(
-  unique int id: @swift_type_arguments
+  unique int body: @unified_stmt ref
 );
 
-@swift_type_constraint_child_type = @swift_equality_constraint | @swift_inheritance_constraint
-
-swift_type_constraint_def(
-  unique int id: @swift_type_constraint,
-  int child: @swift_type_constraint_child_type ref
+unified_block_stmt_def(
+  unique int id: @unified_block_stmt
 );
 
-@swift_type_constraints_child_type = @swift_token_where_keyword | @swift_type_constraint
-
-#keyset[swift_type_constraints, index]
-swift_type_constraints_child(
-  int swift_type_constraints: @swift_type_constraints ref,
+#keyset[unified_call_expr, index]
+unified_call_expr_argument(
+  int unified_call_expr: @unified_call_expr ref,
   int index: int ref,
-  unique int child: @swift_type_constraints_child_type ref
+  unique int argument: @unified_expr ref
 );
 
-swift_type_constraints_def(
-  unique int id: @swift_type_constraints
+unified_call_expr_def(
+  unique int id: @unified_call_expr,
+  int function: @unified_expr ref
 );
 
-@swift_type_level_declaration = @swift_associatedtype_declaration | @swift_class_declaration | @swift_deinit_declaration | @swift_function_declaration | @swift_import_declaration | @swift_init_declaration | @swift_operator_declaration | @swift_precedence_group_declaration | @swift_property_declaration | @swift_protocol_declaration | @swift_subscript_declaration | @swift_typealias_declaration
-
-#keyset[swift_type_modifiers, index]
-swift_type_modifiers_child(
-  int swift_type_modifiers: @swift_type_modifiers ref,
-  int index: int ref,
-  unique int child: @swift_attribute ref
-);
+@unified_condition = @unified_expr_condition | @unified_let_pattern_condition | @unified_sequence_condition | @unified_token_unsupported_node
 
-swift_type_modifiers_def(
-  unique int id: @swift_type_modifiers
-);
+@unified_expr = @unified_binary_expr | @unified_call_expr | @unified_lambda_expr | @unified_member_access_expr | @unified_name_expr | @unified_token_int_literal | @unified_token_string_literal | @unified_token_unsupported_node | @unified_unary_expr
 
-swift_type_pack_expansion_def(
-  unique int id: @swift_type_pack_expansion,
-  int child: @swift_unannotated_type ref
+unified_expr_condition_def(
+  unique int id: @unified_expr_condition,
+  int expr: @unified_expr ref
 );
 
-@swift_type_parameter_child_type = @swift_token_type_identifier | @swift_type__ | @swift_type_parameter_modifiers | @swift_type_parameter_pack
-
-#keyset[swift_type_parameter, index]
-swift_type_parameter_child(
-  int swift_type_parameter: @swift_type_parameter ref,
-  int index: int ref,
-  unique int child: @swift_type_parameter_child_type ref
+unified_expr_stmt_def(
+  unique int id: @unified_expr_stmt,
+  int expr: @unified_expr ref
 );
 
-swift_type_parameter_def(
-  unique int id: @swift_type_parameter
+unified_guard_if_stmt_def(
+  unique int id: @unified_guard_if_stmt,
+  int condition: @unified_condition ref,
+  int else: @unified_stmt ref
 );
 
-#keyset[swift_type_parameter_modifiers, index]
-swift_type_parameter_modifiers_child(
-  int swift_type_parameter_modifiers: @swift_type_parameter_modifiers ref,
-  int index: int ref,
-  unique int child: @swift_attribute ref
+unified_if_stmt_else(
+  unique int unified_if_stmt: @unified_if_stmt ref,
+  unique int else: @unified_stmt ref
 );
 
-swift_type_parameter_modifiers_def(
-  unique int id: @swift_type_parameter_modifiers
+unified_if_stmt_then(
+  unique int unified_if_stmt: @unified_if_stmt ref,
+  unique int then: @unified_stmt ref
 );
 
-swift_type_parameter_pack_def(
-  unique int id: @swift_type_parameter_pack,
-  int child: @swift_unannotated_type ref
+unified_if_stmt_def(
+  unique int id: @unified_if_stmt,
+  int condition: @unified_condition ref
 );
 
-@swift_type_parameters_child_type = @swift_type_constraints | @swift_type_parameter
+@unified_lambda_expr_body_type = @unified_expr | @unified_stmt
 
-#keyset[swift_type_parameters, index]
-swift_type_parameters_child(
-  int swift_type_parameters: @swift_type_parameters ref,
+#keyset[unified_lambda_expr, index]
+unified_lambda_expr_parameter(
+  int unified_lambda_expr: @unified_lambda_expr ref,
   int index: int ref,
-  unique int child: @swift_type_parameters_child_type ref
+  unique int parameter: @unified_parameter ref
 );
 
-swift_type_parameters_def(
-  unique int id: @swift_type_parameters
+unified_lambda_expr_def(
+  unique int id: @unified_lambda_expr,
+  int body: @unified_lambda_expr_body_type ref
 );
 
-@swift_typealias_declaration_child_type = @swift_attribute | @swift_modifiers | @swift_token_inheritance_modifier | @swift_token_ownership_modifier | @swift_token_property_behavior_modifier | @swift_type_parameters
-
-#keyset[swift_typealias_declaration, index]
-swift_typealias_declaration_child(
-  int swift_typealias_declaration: @swift_typealias_declaration ref,
-  int index: int ref,
-  unique int child: @swift_typealias_declaration_child_type ref
+unified_let_pattern_condition_def(
+  unique int id: @unified_let_pattern_condition,
+  int pattern: @unified_pattern ref,
+  int value: @unified_expr ref
 );
 
-swift_typealias_declaration_def(
-  unique int id: @swift_typealias_declaration,
-  int name: @swift_token_type_identifier ref,
-  int value: @swift_type__ ref
+unified_member_access_expr_def(
+  unique int id: @unified_member_access_expr,
+  int member: @unified_token_identifier ref,
+  int target: @unified_expr ref
 );
 
-@swift_unannotated_type = @swift_array_type | @swift_dictionary_type | @swift_existential_type | @swift_function_type | @swift_metatype | @swift_opaque_type | @swift_optional_type | @swift_protocol_composition_type | @swift_suppressed_constraint | @swift_tuple_type | @swift_type_pack_expansion | @swift_type_parameter_pack | @swift_user_type
-
-@swift_user_type_child_type = @swift_token_type_identifier | @swift_type_arguments
-
-#keyset[swift_user_type, index]
-swift_user_type_child(
-  int swift_user_type: @swift_user_type ref,
-  int index: int ref,
-  unique int child: @swift_user_type_child_type ref
+unified_name_expr_def(
+  unique int id: @unified_name_expr,
+  int identifier: @unified_token_identifier ref
 );
 
-swift_user_type_def(
-  unique int id: @swift_user_type
+unified_parameter_def(
+  unique int id: @unified_parameter,
+  int pattern: @unified_pattern ref
 );
 
-swift_value_argument_name(
-  unique int swift_value_argument: @swift_value_argument ref,
-  unique int name: @swift_value_argument_label ref
-);
+@unified_pattern = @unified_apply_pattern | @unified_token_ignore_pattern | @unified_token_unsupported_node | @unified_tuple_pattern | @unified_var_pattern
 
-#keyset[swift_value_argument, index]
-swift_value_argument_reference_specifier(
-  int swift_value_argument: @swift_value_argument ref,
+#keyset[unified_sequence_condition, index]
+unified_sequence_condition_stmt(
+  int unified_sequence_condition: @unified_sequence_condition ref,
   int index: int ref,
-  unique int reference_specifier: @swift_value_argument_label ref
+  unique int stmt: @unified_stmt ref
 );
 
-swift_value_argument_value(
-  unique int swift_value_argument: @swift_value_argument ref,
-  unique int value: @swift_expression ref
+unified_sequence_condition_def(
+  unique int id: @unified_sequence_condition,
+  int condition: @unified_condition ref
 );
 
-swift_value_argument_child(
-  unique int swift_value_argument: @swift_value_argument ref,
-  unique int child: @swift_type_modifiers ref
-);
-
-swift_value_argument_def(
-  unique int id: @swift_value_argument
-);
+@unified_stmt = @unified_block_stmt | @unified_expr_stmt | @unified_guard_if_stmt | @unified_if_stmt | @unified_token_empty_stmt | @unified_token_unsupported_node | @unified_variable_declaration_stmt
 
-swift_value_argument_label_def(
-  unique int id: @swift_value_argument_label,
-  int child: @swift_token_simple_identifier ref
-);
+@unified_top_level_body_type = @unified_expr | @unified_stmt
 
-#keyset[swift_value_arguments, index]
-swift_value_arguments_child(
-  int swift_value_arguments: @swift_value_arguments ref,
+#keyset[unified_top_level, index]
+unified_top_level_body(
+  int unified_top_level: @unified_top_level ref,
   int index: int ref,
-  unique int child: @swift_value_argument ref
+  unique int body: @unified_top_level_body_type ref
 );
 
-swift_value_arguments_def(
-  unique int id: @swift_value_arguments
+unified_top_level_def(
+  unique int id: @unified_top_level
 );
 
-case @swift_value_binding_pattern.mutability of
-  0 = @swift_value_binding_pattern_let
-| 1 = @swift_value_binding_pattern_var
-;
-
-
-swift_value_binding_pattern_def(
-  unique int id: @swift_value_binding_pattern,
-  int mutability: int ref
-);
-
-swift_value_pack_expansion_def(
-  unique int id: @swift_value_pack_expansion,
-  int child: @swift_expression ref
-);
-
-swift_value_parameter_pack_def(
-  unique int id: @swift_value_parameter_pack,
-  int child: @swift_expression ref
-);
-
-@swift_where_clause_child_type = @swift_expression | @swift_token_where_keyword
-
-#keyset[swift_where_clause, index]
-swift_where_clause_child(
-  int swift_where_clause: @swift_where_clause ref,
+#keyset[unified_tuple_pattern, index]
+unified_tuple_pattern_element(
+  int unified_tuple_pattern: @unified_tuple_pattern ref,
   int index: int ref,
-  unique int child: @swift_where_clause_child_type ref
-);
-
-swift_where_clause_def(
-  unique int id: @swift_where_clause
+  unique int element: @unified_pattern ref
 );
 
-#keyset[swift_while_statement, index]
-swift_while_statement_condition(
-  int swift_while_statement: @swift_while_statement ref,
-  int index: int ref,
-  unique int condition: @swift_if_condition ref
+unified_tuple_pattern_def(
+  unique int id: @unified_tuple_pattern
 );
 
-swift_while_statement_child(
-  unique int swift_while_statement: @swift_while_statement ref,
-  unique int child: @swift_statements ref
+unified_unary_expr_def(
+  unique int id: @unified_unary_expr,
+  int operand: @unified_expr ref,
+  int operator: @unified_token_operator ref
 );
 
-swift_while_statement_def(
-  unique int id: @swift_while_statement
+unified_var_pattern_def(
+  unique int id: @unified_var_pattern,
+  int identifier: @unified_token_identifier ref
 );
 
-@swift_willset_clause_child_type = @swift_modifiers | @swift_statements | @swift_token_simple_identifier
-
-#keyset[swift_willset_clause, index]
-swift_willset_clause_child(
-  int swift_willset_clause: @swift_willset_clause ref,
+#keyset[unified_variable_declaration_stmt, index]
+unified_variable_declaration_stmt_variable_declarator(
+  int unified_variable_declaration_stmt: @unified_variable_declaration_stmt ref,
   int index: int ref,
-  unique int child: @swift_willset_clause_child_type ref
+  unique int variable_declarator: @unified_variable_declarator ref
 );
 
-swift_willset_clause_def(
-  unique int id: @swift_willset_clause
+unified_variable_declaration_stmt_def(
+  unique int id: @unified_variable_declaration_stmt
 );
 
-@swift_willset_didset_block_child_type = @swift_didset_clause | @swift_willset_clause
-
-#keyset[swift_willset_didset_block, index]
-swift_willset_didset_block_child(
-  int swift_willset_didset_block: @swift_willset_didset_block ref,
-  int index: int ref,
-  unique int child: @swift_willset_didset_block_child_type ref
+unified_variable_declarator_value(
+  unique int unified_variable_declarator: @unified_variable_declarator ref,
+  unique int value: @unified_expr ref
 );
 
-swift_willset_didset_block_def(
-  unique int id: @swift_willset_didset_block
+unified_variable_declarator_def(
+  unique int id: @unified_variable_declarator,
+  int pattern: @unified_pattern ref
 );
 
-swift_tokeninfo(
-  unique int id: @swift_token,
+unified_tokeninfo(
+  unique int id: @unified_token,
   int kind: int ref,
   string value: string ref
 );
 
-case @swift_token.kind of
-  0 = @swift_reserved_word
-| 1 = @swift_token_as_operator
-| 2 = @swift_token_bang
-| 3 = @swift_token_bin_literal
-| 4 = @swift_token_boolean_literal
-| 5 = @swift_token_catch_keyword
-| 6 = @swift_token_comment
-| 7 = @swift_token_custom_operator
-| 8 = @swift_token_default_keyword
-| 9 = @swift_token_diagnostic
-| 10 = @swift_token_else
-| 11 = @swift_token_fully_open_range
-| 12 = @swift_token_function_modifier
-| 13 = @swift_token_hex_literal
-| 14 = @swift_token_inheritance_modifier
-| 15 = @swift_token_integer_literal
-| 16 = @swift_token_line_str_text
-| 17 = @swift_token_member_modifier
-| 18 = @swift_token_multi_line_str_text
-| 19 = @swift_token_multiline_comment
-| 20 = @swift_token_mutation_modifier
-| 21 = @swift_token_oct_literal
-| 22 = @swift_token_ownership_modifier
-| 23 = @swift_token_parameter_modifier
-| 24 = @swift_token_property_behavior_modifier
-| 25 = @swift_token_property_modifier
-| 26 = @swift_token_raw_str_continuing_indicator
-| 27 = @swift_token_raw_str_end_part
-| 28 = @swift_token_raw_str_interpolation_start
-| 29 = @swift_token_raw_str_part
-| 30 = @swift_token_real_literal
-| 31 = @swift_token_regex_literal
-| 32 = @swift_token_self_expression
-| 33 = @swift_token_shebang_line
-| 34 = @swift_token_simple_identifier
-| 35 = @swift_token_special_literal
-| 36 = @swift_token_statement_label
-| 37 = @swift_token_str_escaped_char
-| 38 = @swift_token_super_expression
-| 39 = @swift_token_throw_keyword
-| 40 = @swift_token_throws
-| 41 = @swift_token_try_operator
-| 42 = @swift_token_type_identifier
-| 43 = @swift_token_visibility_modifier
-| 44 = @swift_token_where_keyword
-| 45 = @swift_token_wildcard_pattern
+case @unified_token.kind of
+  1 = @unified_token_empty_stmt
+| 2 = @unified_token_identifier
+| 3 = @unified_token_ignore_pattern
+| 4 = @unified_token_int_literal
+| 5 = @unified_token_operator
+| 6 = @unified_token_string_literal
+| 7 = @unified_token_unsupported_node
 ;
 
 
-@swift_ast_node = @swift_additive_expression | @swift_array_literal | @swift_array_type | @swift_as_expression | @swift_assignment | @swift_associatedtype_declaration | @swift_attribute | @swift_availability_condition | @swift_await_expression | @swift_bitwise_operation | @swift_call_expression | @swift_call_suffix | @swift_capture_list | @swift_capture_list_item | @swift_catch_block | @swift_check_expression | @swift_class_body | @swift_class_declaration | @swift_comparison_expression | @swift_computed_getter | @swift_computed_modify | @swift_computed_property | @swift_computed_setter | @swift_conjunction_expression | @swift_constructor_expression | @swift_constructor_suffix | @swift_control_transfer_statement | @swift_deinit_declaration | @swift_deprecated_operator_declaration_body | @swift_dictionary_literal | @swift_dictionary_type | @swift_didset_clause | @swift_directive | @swift_directly_assignable_expression | @swift_disjunction_expression | @swift_do_statement | @swift_enum_class_body | @swift_enum_entry | @swift_enum_type_parameters | @swift_equality_constraint | @swift_equality_expression | @swift_existential_type | @swift_external_macro_definition | @swift_for_statement | @swift_function_body | @swift_function_declaration | @swift_function_type | @swift_getter_specifier | @swift_guard_statement | @swift_identifier | @swift_if_condition | @swift_if_let_binding | @swift_if_statement | @swift_implicitly_unwrapped_type | @swift_import_declaration | @swift_infix_expression | @swift_inheritance_constraint | @swift_inheritance_specifier | @swift_init_declaration | @swift_interpolated_expression | @swift_key_path_expression | @swift_key_path_string_expression | @swift_lambda_function_type | @swift_lambda_function_type_parameters | @swift_lambda_literal | @swift_lambda_parameter | @swift_line_string_literal | @swift_macro_declaration | @swift_macro_definition | @swift_macro_invocation | @swift_metatype | @swift_modifiers | @swift_modify_specifier | @swift_multi_line_string_literal | @swift_multiplicative_expression | @swift_navigation_expression | @swift_navigation_suffix | @swift_nested_type_identifier | @swift_nil_coalescing_expression | @swift_opaque_type | @swift_open_end_range_expression | @swift_open_start_range_expression | @swift_operator_declaration | @swift_optional_chain_marker | @swift_optional_type | @swift_parameter | @swift_parameter_modifiers | @swift_pattern | @swift_playground_literal | @swift_postfix_expression | @swift_precedence_group_attribute | @swift_precedence_group_attributes | @swift_precedence_group_declaration | @swift_prefix_expression | @swift_property_declaration | @swift_protocol_body | @swift_protocol_composition_type | @swift_protocol_declaration | @swift_protocol_function_declaration | @swift_protocol_property_declaration | @swift_protocol_property_requirements | @swift_range_expression | @swift_raw_str_interpolation | @swift_raw_string_literal | @swift_referenceable_operator | @swift_repeat_while_statement | @swift_selector_expression | @swift_setter_specifier | @swift_source_file | @swift_statements | @swift_subscript_declaration | @swift_suppressed_constraint | @swift_switch_entry | @swift_switch_pattern | @swift_switch_statement | @swift_ternary_expression | @swift_throws_clause | @swift_token | @swift_try_expression | @swift_tuple_expression | @swift_tuple_type | @swift_tuple_type_item | @swift_type__ | @swift_type_annotation | @swift_type_arguments | @swift_type_constraint | @swift_type_constraints | @swift_type_modifiers | @swift_type_pack_expansion | @swift_type_parameter | @swift_type_parameter_modifiers | @swift_type_parameter_pack | @swift_type_parameters | @swift_typealias_declaration | @swift_user_type | @swift_value_argument | @swift_value_argument_label | @swift_value_arguments | @swift_value_binding_pattern | @swift_value_pack_expansion | @swift_value_parameter_pack | @swift_where_clause | @swift_while_statement | @swift_willset_clause | @swift_willset_didset_block
+@unified_ast_node = @unified_apply_pattern | @unified_binary_expr | @unified_block_stmt | @unified_call_expr | @unified_expr_condition | @unified_expr_stmt | @unified_guard_if_stmt | @unified_if_stmt | @unified_lambda_expr | @unified_let_pattern_condition | @unified_member_access_expr | @unified_name_expr | @unified_parameter | @unified_sequence_condition | @unified_token | @unified_top_level | @unified_tuple_pattern | @unified_unary_expr | @unified_var_pattern | @unified_variable_declaration_stmt | @unified_variable_declarator
 
-swift_ast_node_location(
-  unique int node: @swift_ast_node ref,
+unified_ast_node_location(
+  unique int node: @unified_ast_node ref,
   int loc: @location_default ref
 );
 
 #keyset[parent, parent_index]
-swift_ast_node_parent(
-  unique int node: @swift_ast_node ref,
-  int parent: @swift_ast_node ref,
+unified_ast_node_parent(
+  unique int node: @unified_ast_node ref,
+  int parent: @unified_ast_node ref,
   int parent_index: int ref
 );
 
diff --git a/unified/ql/test/library-tests/BasicTest/name_expr.swift b/unified/ql/test/library-tests/BasicTest/name_expr.swift
new file mode 100644
index 000000000000..613f3a62861a
--- /dev/null
+++ b/unified/ql/test/library-tests/BasicTest/name_expr.swift
@@ -0,0 +1 @@
+var x = y + 2;
diff --git a/unified/ql/test/library-tests/BasicTest/test.expected b/unified/ql/test/library-tests/BasicTest/test.expected
index 62b8146bf040..5298ec6f982f 100644
--- a/unified/ql/test/library-tests/BasicTest/test.expected
+++ b/unified/ql/test/library-tests/BasicTest/test.expected
@@ -1,101 +1,9 @@
-identifier
-| test.swift:1:8:1:17 | Foundation | Foundation |
-| test.swift:5:9:5:13 | items | items |
-| test.swift:7:19:7:21 | add | add |
-| test.swift:7:23:7:23 | _ | _ |
-| test.swift:7:25:7:28 | item | item |
-| test.swift:8:9:8:13 | items | items |
-| test.swift:8:15:8:20 | append | append |
-| test.swift:8:22:8:25 | item | item |
-| test.swift:11:10:11:17 | contains | contains |
-| test.swift:11:19:11:19 | _ | _ |
-| test.swift:11:21:11:24 | item | item |
-| test.swift:12:16:12:20 | items | items |
-| test.swift:12:22:12:29 | contains | contains |
-| test.swift:12:31:12:34 | item | item |
-| test.swift:19:9:19:13 | count | count |
-| test.swift:20:10:20:13 | item | item |
-| test.swift:20:15:20:16 | at | at |
-| test.swift:20:18:20:22 | index | index |
-| test.swift:24:6:24:10 | merge | merge |
-| test.swift:24:27:24:27 | _ | _ |
-| test.swift:24:29:24:33 | first | first |
-| test.swift:24:39:24:39 | _ | _ |
-| test.swift:24:41:24:46 | second | second |
-| test.swift:24:73:24:73 | T | T |
-| test.swift:24:75:24:81 | Element | Element |
-| test.swift:25:9:25:14 | result | result |
-| test.swift:25:18:25:22 | Array | Array |
-| test.swift:25:24:25:28 | first | first |
-| test.swift:26:9:26:12 | item | item |
-| test.swift:26:17:26:22 | second | second |
-| test.swift:27:13:27:18 | result | result |
-| test.swift:27:20:27:27 | contains | contains |
-| test.swift:27:29:27:32 | item | item |
-| test.swift:28:13:28:18 | result | result |
-| test.swift:28:20:28:25 | append | append |
-| test.swift:28:27:28:30 | item | item |
-| test.swift:31:12:31:17 | result | result |
-| test.swift:37:17:37:20 | data | data |
-| test.swift:39:9:39:13 | count | count |
-| test.swift:40:16:40:19 | data | data |
-| test.swift:40:21:40:25 | count | count |
-| test.swift:43:9:43:15 | isEmpty | isEmpty |
-| test.swift:44:9:44:12 | data | data |
-| test.swift:44:14:44:20 | isEmpty | isEmpty |
-| test.swift:47:10:47:13 | item | item |
-| test.swift:47:15:47:16 | at | at |
-| test.swift:47:18:47:22 | index | index |
-| test.swift:48:15:48:19 | index | index |
-| test.swift:48:29:48:33 | index | index |
-| test.swift:48:37:48:40 | data | data |
-| test.swift:48:42:48:46 | count | count |
-| test.swift:49:16:49:19 | data | data |
-| test.swift:49:21:49:25 | index | index |
-| test.swift:52:10:52:12 | add | add |
-| test.swift:52:14:52:14 | _ | _ |
-| test.swift:52:16:52:19 | item | item |
-| test.swift:53:9:53:12 | data | data |
-| test.swift:53:14:53:19 | append | append |
-| test.swift:53:21:53:24 | item | item |
-| test.swift:59:10:59:16 | success | success |
-| test.swift:60:10:60:16 | failure | failure |
-| test.swift:62:10:62:12 | map | map |
-| test.swift:62:17:62:17 | _ | _ |
-| test.swift:62:19:62:27 | transform | transform |
-| test.swift:64:15:64:21 | success | success |
-| test.swift:64:27:64:31 | value | value |
-| test.swift:65:21:65:27 | success | success |
-| test.swift:65:29:65:37 | transform | transform |
-| test.swift:65:39:65:43 | value | value |
-| test.swift:66:15:66:21 | failure | failure |
-| test.swift:66:27:66:31 | error | error |
-| test.swift:67:21:67:27 | failure | failure |
-| test.swift:67:29:67:33 | error | error |
-| test.swift:73:23:73:29 | Element | Element |
-| test.swift:74:10:74:17 | isSorted | isSorted |
-| test.swift:75:13:75:13 | i | i |
-| test.swift:75:23:75:31 | blah | blah |
-| test.swift:76:21:76:21 | i | i |
-| test.swift:76:31:76:35 | blah | blah |
-| test.swift:85:6:85:12 | combine | combine |
-| test.swift:85:17:85:17 | _ | _ |
-| test.swift:85:19:85:24 | values | values |
-| test.swift:85:32:85:40 | transform | transform |
-| test.swift:86:12:86:17 | values | values |
-| test.swift:86:19:86:25 | isEmpty | isEmpty |
-| test.swift:87:12:87:17 | values | values |
-| test.swift:87:19:87:27 | dropFirst | dropFirst |
-| test.swift:87:31:87:36 | reduce | reduce |
-| test.swift:87:38:87:43 | values | values |
-| test.swift:87:49:87:57 | transform | transform |
-func
-| test.swift:7:5:9:5 | FunctionDeclaration |
-| test.swift:11:5:13:5 | FunctionDeclaration |
-| test.swift:24:1:32:1 | FunctionDeclaration |
-| test.swift:47:5:50:5 | FunctionDeclaration |
-| test.swift:52:5:54:5 | FunctionDeclaration |
-| test.swift:62:5:69:5 | FunctionDeclaration |
-| test.swift:74:5:81:5 | FunctionDeclaration |
-| test.swift:85:1:88:1 | FunctionDeclaration |
-add
+nameExpr
+unsupported
+| test.swift:3:1:3:38 |  |  |
+| test.swift:16:1:16:32 |  |  |
+| test.swift:23:1:23:37 |  |  |
+| test.swift:34:1:34:49 |  |  |
+| test.swift:57:1:57:30 |  |  |
+| test.swift:72:1:72:37 |  |  |
+| test.swift:84:1:84:24 |  |  |
diff --git a/unified/ql/test/library-tests/BasicTest/test.ql b/unified/ql/test/library-tests/BasicTest/test.ql
index 3a5ee2f1c157..ca422d039781 100644
--- a/unified/ql/test/library-tests/BasicTest/test.ql
+++ b/unified/ql/test/library-tests/BasicTest/test.ql
@@ -1,9 +1,5 @@
-import codeql.unified.Ast
+import codeql.unified.Ast::Unified
 
-query predicate identifier(Swift::SimpleIdentifier node, string name) { name = node.getValue() }
+query predicate nameExpr(NameExpr node, string value) { value = node.getIdentifier().getValue() }
 
-query predicate func(Swift::FunctionDeclaration node) { any() }
-
-query predicate add(Swift::AdditiveExpression node, Swift::AstNode lhs, Swift::AstNode rhs) {
-  lhs = node.getLhs(0) and rhs = node.getRhs(0)
-}
+query predicate unsupported(UnsupportedNode node, string value) { value = node.getValue() }
diff --git a/unified/scripts/update-corpus.sh b/unified/scripts/update-corpus.sh
new file mode 100755
index 000000000000..2f3ebade8cb3
--- /dev/null
+++ b/unified/scripts/update-corpus.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+cd "$(dirname "$0")/.."
+
+cd extractor
+UNIFIED_UPDATE_CORPUS=1 cargo test