WIP

2026-03-10 15:49:33 +00:00 · 2024-01-21 17:07:32 +01:00
250 changed files with 9852 additions and 45959 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -42,9 +42,9 @@ Please replace this sentence with log output, if applicable.
 <!-- Please complete the following information: -->

 - Operating system (e.g. MacOS Monterey).
- Java version (i.e. `java --version`, e.g. `17.0.13`).
- Error Prone version (e.g. `2.35.1`).
- Error Prone Support version (e.g. `0.19.0`).
+- Java version (i.e. `java --version`, e.g. `17.0.8`).
+- Error Prone version (e.g. `2.18.0`).
+- Error Prone Support version (e.g. `0.9.0`).

 ### Additional context

--- a/.github/release.yml
+++ b/.github/release.yml
@@ -3,16 +3,16 @@ changelog:
    labels:
      - "ignore-changelog"
  categories:
-    - title: ":warning: Update considerations and deprecations"
-      labels:
-        - "breaking change"
-        - "deprecation"
    - title: ":rocket: New Error Prone checks and Refaster rules"
      labels:
        - "new feature"
    - title: ":sparkles: Improvements"
      labels:
        - "improvement"
+    - title: ":warning: Update considerations and deprecations"
+      labels:
+        - "breaking change"
+        - "deprecation"
    - title: ":bug: Bug fixes"
      labels:
        - "bug"
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,44 +9,33 @@ jobs:
  build:
    strategy:
      matrix:
-        os: [ ubuntu-24.04 ]
-        jdk: [ 17.0.13, 21.0.5, 23.0.1 ]
+        os: [ ubuntu-22.04 ]
+        jdk: [ 11.0.20, 17.0.8, 21.0.0 ]
        distribution: [ temurin ]
        experimental: [ false ]
        include:
-          - os: macos-14
-            jdk: 17.0.13
+          - os: macos-12
+            jdk: 17.0.8
            distribution: temurin
            experimental: false
          - os: windows-2022
-            jdk: 17.0.13
+            jdk: 17.0.8
            distribution: temurin
            experimental: false
    runs-on: ${{ matrix.os }}
    continue-on-error: ${{ matrix.experimental }}
    steps:
-      - name: Install Harden-Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          disable-sudo: true
-          egress-policy: block
-          allowed-endpoints: >
-            api.adoptium.net:443
-            github.com:443
-            jitpack.io:443
-            objects.githubusercontent.com:443
-            repo.maven.apache.org:443
      # We run the build twice for each supported JDK: once against the
      # original Error Prone release, using only Error Prone checks available
      # on Maven Central, and once against the Picnic Error Prone fork,
      # additionally enabling all checks defined in this project and any Error
      # Prone checks available only from other artifact repositories.
      - name: Check out code and set up JDK and Maven
-        uses: s4u/setup-maven-action@9a27433d289dd99d73851f653607c39d3444e8ba # v1.17.0
+        uses: s4u/setup-maven-action@fa2c7e4517ed008b1f73e7e0195a9eecf5582cd4 # v1.11.0
        with:
          java-version: ${{ matrix.jdk }}
          java-distribution: ${{ matrix.distribution }}
-          maven-version: 3.9.9
+          maven-version: 3.9.6
      - name: Display build environment details
        run: mvn --version
      - name: Build project against vanilla Error Prone, compile Javadoc
@@ -54,6 +43,6 @@ jobs:
      - name: Build project with self-check against Error Prone fork
        run: mvn -T1C clean verify -Perror-prone-fork -Pnon-maven-central -Pself-check -s settings.xml
      - name: Remove installed project artifacts
-        run: mvn dependency:purge-local-repository -DmanualInclude='${project.groupId}' -DresolutionFuzziness=groupId
+        run: mvn build-helper:remove-project-artifact

 # XXX: Enable Codecov once we "go public".
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -19,34 +19,22 @@ jobs:
    permissions:
      contents: read
      security-events: write
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    steps:
-      - name: Install Harden-Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          disable-sudo: true
-          egress-policy: block
-          allowed-endpoints: >
-            api.adoptium.net:443
-            api.github.com:443
-            github.com:443
-            objects.githubusercontent.com:443
-            repo.maven.apache.org:443
-            uploads.github.com:443
      - name: Check out code and set up JDK and Maven
-        uses: s4u/setup-maven-action@9a27433d289dd99d73851f653607c39d3444e8ba # v1.17.0
+        uses: s4u/setup-maven-action@fa2c7e4517ed008b1f73e7e0195a9eecf5582cd4 # v1.11.0
        with:
-          java-version: 17.0.13
+          java-version: 17.0.8
          java-distribution: temurin
-          maven-version: 3.9.9
+          maven-version: 3.9.6
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
        with:
          languages: ${{ matrix.language }}
      - name: Perform minimal build
        if: matrix.language == 'java'
        run: mvn -T1C clean package -DskipTests -Dverification.skip
      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
        with:
          category: /language:${{ matrix.language }}
--- a/.github/workflows/deploy-website.yml
+++ b/.github/workflows/deploy-website.yml
@@ -9,45 +9,18 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
  build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    steps:
-      - name: Install Harden-Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          disable-sudo: true
-          egress-policy: block
-          allowed-endpoints: >
-            api.adoptium.net:443
-            api.github.com:443
-            bestpractices.coreinfrastructure.org:443
-            blog.picnic.nl:443
-            errorprone.info:443
-            github.com:443
-            img.shields.io:443
-            index.rubygems.org:443
-            jitpack.io:443
-            maven.apache.org:443
-            objects.githubusercontent.com:443
-            pitest.org:443
-            repo.maven.apache.org:443
-            rubygems.org:443
-            search.maven.org:443
-            securityscorecards.dev:443
-            sonarcloud.io:443
-            www.baeldung.com:443
-            www.bestpractices.dev:443
-            www.youtube.com:443
-            youtrack.jetbrains.com:443
      - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
          persist-credentials: false
-      - uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
+      - uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # v1.165.1
        with:
          working-directory: ./website
          bundler-cache: true
      - name: Configure Github Pages
-        uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0
+        uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4.0.0
      - name: Generate documentation
        run: ./generate-docs.sh
      - name: Build website with Jekyll
@@ -59,7 +32,7 @@ jobs:
        # "Refaster rules" terminology on our website and in the code.
        run: bundle exec htmlproofer --disable_external true --check-external-hash false ./_site
      - name: Upload website as artifact
-        uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
+        uses: actions/upload-pages-artifact@0252fc4ba7626f0298f0cf00902a25c6afc77fa8 # v3.0.0
        with:
          path: ./website/_site
  deploy:
@@ -68,18 +41,11 @@ jobs:
    permissions:
      id-token: write
      pages: write
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    environment:
      name: github-pages
      url: ${{ steps.deployment.outputs.page_url }}
    steps:
-      - name: Install Harden-Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          disable-sudo: true
-          egress-policy: block
-          allowed-endpoints: >
-            api.github.com:443
      - name: Deploy to GitHub Pages
        id: deployment
-        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
+        uses: actions/deploy-pages@87c3283f01cd6fe19a0ab93a23b2f6fcba5a8e42 # v4.0.3
--- a/.github/workflows/openssf-scorecard.yml
+++ b/.github/workflows/openssf-scorecard.yml
@@ -18,36 +18,19 @@ jobs:
      contents: read
      security-events: write
      id-token: write
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    steps:
-      - name: Install Harden-Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          disable-sudo: true
-          egress-policy: block
-          allowed-endpoints: >
-            api.deps.dev:443
-            api.github.com:443
-            api.osv.dev:443
-            api.scorecard.dev:443
-            api.securityscorecards.dev:443
-            github.com:443
-            index.docker.io:443
-            oss-fuzz-build-logs.storage.googleapis.com:443
-            repo.maven.apache.org:443
-            *.sigstore.dev:443
-            www.bestpractices.dev:443
      - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
          persist-credentials: false
      - name: Run OpenSSF Scorecard analysis
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
        with:
          results_file: results.sarif
          results_format: sarif
          publish_results: ${{ github.ref == 'refs/heads/master' }}
      - name: Update GitHub's code scanning dashboard
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
        with:
          sarif_file: results.sarif
--- a/.github/workflows/pitest-analyze-pr.yml
+++ b/.github/workflows/pitest-analyze-pr.yml
@@ -9,25 +9,15 @@ permissions:
  contents: read
 jobs:
  analyze-pr:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    steps:
-      - name: Install Harden-Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          disable-sudo: true
-          egress-policy: block
-          allowed-endpoints: >
-            api.adoptium.net:443
-            github.com:443
-            objects.githubusercontent.com:443
-            repo.maven.apache.org:443
      - name: Check out code and set up JDK and Maven
-        uses: s4u/setup-maven-action@9a27433d289dd99d73851f653607c39d3444e8ba # v1.17.0
+        uses: s4u/setup-maven-action@fa2c7e4517ed008b1f73e7e0195a9eecf5582cd4 # v1.11.0
        with:
          checkout-fetch-depth: 2
-          java-version: 17.0.13
+          java-version: 17.0.8
          java-distribution: temurin
-          maven-version: 3.9.9
+          maven-version: 3.9.6
      - name: Run Pitest
        # By running with features `+GIT(from[HEAD~1]), +gitci`, Pitest only
        # analyzes lines changed in the associated pull request, as GitHub
@@ -38,7 +28,7 @@ jobs:
      - name: Aggregate Pitest reports
        run: mvn pitest-git:aggregate -DkilledEmoji=":tada:" -DmutantEmoji=":zombie:" -DtrailingText="Mutation testing report by [Pitest](https://pitest.org/). Review any surviving mutants by inspecting the line comments under [_Files changed_](${{ github.event.number }}/files)."
      - name: Upload Pitest reports as artifact
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
        with:
          name: pitest-reports
          path: ./target/pit-reports-ci
--- a/.github/workflows/pitest-update-pr.yml
+++ b/.github/workflows/pitest-update-pr.yml
@@ -17,27 +17,16 @@ jobs:
      checks: write
      contents: read
      pull-requests: write
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    steps:
-      - name: Install Harden-Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          disable-sudo: true
-          egress-policy: block
-          allowed-endpoints: >
-            api.adoptium.net:443
-            api.github.com:443
-            github.com:443
-            objects.githubusercontent.com:443
-            repo.maven.apache.org:443
      - name: Check out code and set up JDK and Maven
-        uses: s4u/setup-maven-action@9a27433d289dd99d73851f653607c39d3444e8ba # v1.17.0
+        uses: s4u/setup-maven-action@fa2c7e4517ed008b1f73e7e0195a9eecf5582cd4 # v1.11.0
        with:
-          java-version: 17.0.13
+          java-version: 17.0.8
          java-distribution: temurin
-          maven-version: 3.9.9
+          maven-version: 3.9.6
      - name: Download Pitest analysis artifact
-        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
+        uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d # v3.0.0
        with:
          workflow: ${{ github.event.workflow_run.workflow_id }}
          name: pitest-reports
--- a/.github/workflows/run-integration-tests.yml
+++ b/.github/workflows/run-integration-tests.yml
@@ -1,9 +1,9 @@
 # If requested by means of a pull request comment, runs integration tests
 # against the project, using the code found on the pull request branch.
-# XXX: Review whether then build matrix should also vary JDK or OS versions.
-# XXX: Support `/integration-test [name...]` comment syntax to specify the
-# subset of integration tests to run.
-# See this example of a dynamic build matrix:
+# XXX: Generalize this to a matrix build of multiple integration tests,
+# possibly using multiple JDK or OS versions.
+# XXX: Investigate whether the comment can specify which integration tests run
+# run. See this example of a dynamic build matrix:
 # https://docs.github.com/en/actions/learn-github-actions/expressions#example-returning-a-json-object
 name: "Integration tests"
 on:
@@ -16,48 +16,24 @@ jobs:
    name: On-demand integration test
    if: |
      github.event.issue.pull_request && contains(github.event.comment.body, '/integration-test')
-    runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        integration-test: [ "checkstyle", "metrics", "prometheus-java-client" ]
+    runs-on: ubuntu-22.04
    steps:
-      - name: Install Harden-Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          disable-sudo: true
-          egress-policy: block
-          allowed-endpoints: >
-            # XXX: After updating the validation build flags in
-            # `integration-tests/prometheus-java-client.sh`, review whether the
-            # Docker domains specified here can be dropped.
-            api.adoptium.net:443
-            auth.docker.io:443
-            checkstyle.org:443
-            example.com:80
-            github.com:443
-            objects.githubusercontent.com:443
-            oss.sonatype.org:443
-            production.cloudflare.docker.com:443
-            raw.githubusercontent.com:443
-            registry-1.docker.io:443
-            repo.maven.apache.org:443
-            repository.sonatype.org:443
      - name: Check out code and set up JDK and Maven
-        uses: s4u/setup-maven-action@9a27433d289dd99d73851f653607c39d3444e8ba # v1.17.0
+        uses: s4u/setup-maven-action@fa2c7e4517ed008b1f73e7e0195a9eecf5582cd4 # v1.11.0
        with:
          checkout-ref: "refs/pull/${{ github.event.issue.number }}/head"
-          java-version: 17.0.13
+          java-version: 17.0.8
          java-distribution: temurin
-          maven-version: 3.9.9
+          maven-version: 3.9.6
      - name: Install project to local Maven repository
        run: mvn -T1C install -DskipTests -Dverification.skip
      - name: Run integration test
-        run: xvfb-run "./integration-tests/${{ matrix.integration-test }}.sh" "${{ runner.temp }}/artifacts"
+        run: xvfb-run ./integration-tests/checkstyle-10.12.4.sh "${{ runner.temp }}/artifacts"
      - name: Upload artifacts on failure
        if: ${{ failure() }}
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
        with:
-          name: "integration-test-${{ matrix.integration-test }}"
+          name: integration-test-checkstyle-10.12.4
          path: "${{ runner.temp }}/artifacts"
      - name: Remove installed project artifacts
-        run: mvn dependency:purge-local-repository -DmanualInclude='${project.groupId}' -DresolutionFuzziness=groupId
+        run: mvn build-helper:remove-project-artifact
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -13,34 +13,18 @@ jobs:
  analyze:
    # Analysis of code in forked repositories is skipped, as such workflow runs
    # do not have access to the requisite secrets.
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
+    if: github.event.pull_request.head.repo.full_name == github.repository
    permissions:
      contents: read
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    steps:
-      - name: Install Harden-Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          disable-sudo: true
-          egress-policy: block
-          allowed-endpoints: >
-            analysis-sensorcache-eu-central-1-prod.s3.amazonaws.com:443
-            api.adoptium.net:443
-            api.nuget.org:443
-            ea6ne4j2sb.execute-api.eu-central-1.amazonaws.com:443
-            github.com:443
-            objects.githubusercontent.com:443
-            repo.maven.apache.org:443
-            sc-cleancode-sensorcache-eu-central-1-prod.s3.amazonaws.com:443
-            *.sonarcloud.io:443
-            sonarcloud.io:443
      - name: Check out code and set up JDK and Maven
-        uses: s4u/setup-maven-action@9a27433d289dd99d73851f653607c39d3444e8ba # v1.17.0
+        uses: s4u/setup-maven-action@fa2c7e4517ed008b1f73e7e0195a9eecf5582cd4 # v1.11.0
        with:
          checkout-fetch-depth: 0
-          java-version: 17.0.13
+          java-version: 17.0.8
          java-distribution: temurin
-          maven-version: 3.9.9
+          maven-version: 3.9.6
      - name: Create missing `test` directory
        # XXX: Drop this step in favour of actually having a test.
        run: mkdir refaster-compiler/src/test
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 .DS_Store
 .factorypath
 .idea
-!.idea/icon.svg
 .project
 .settings
 target
--- a/.idea/icon.svg
+++ b/.idea/icon.svg
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 1259 1199" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-624.154,-988.431)">
-        <g transform="matrix(1,0,0,1,-70.1122,-35.0561)">
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1227.03,1988.79C1237.78,2070.45 1225.83,2190.1 1192.24,2194.53C1158.65,2198.95 1116.14,2086.46 1105.39,2004.81C1094.64,1923.16 1128.44,1902.11 1153.32,1898.84C1178.18,1895.56 1216.28,1907.14 1227.03,1988.79Z" style="fill:rgb(219,220,211);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1151.08,1881.86C1134.93,1883.99 1114.77,1892.69 1101.6,1913.17C1088.42,1933.64 1082.71,1963.73 1088.42,2007.04C1094.04,2049.75 1107.59,2099.16 1124.51,2138.68C1132.97,2158.45 1142.15,2175.68 1152.59,2188.86C1163.04,2202.05 1176.31,2213.89 1194.48,2211.5C1212.65,2209.11 1222.39,2194.23 1229.07,2178.8C1235.75,2163.36 1240.15,2144.34 1243.21,2123.05C1249.32,2080.5 1249.63,2029.27 1244,1986.56C1238.3,1943.24 1225,1915.66 1206.98,1899.29C1188.95,1882.93 1167.22,1879.74 1151.08,1881.86ZM1155.55,1915.81C1164.27,1914.66 1174.03,1915.62 1183.96,1924.64C1193.89,1933.66 1205.01,1952.69 1210.06,1991.03C1215.18,2029.97 1214.89,2079.4 1209.32,2118.19C1206.53,2137.58 1202.32,2154.4 1197.65,2165.2C1194.14,2173.29 1190.82,2176.3 1189.96,2177.22C1188.89,2176.55 1184.91,2174.51 1179.43,2167.6C1172.12,2158.38 1163.7,2143.22 1155.99,2125.21C1140.57,2089.18 1127.49,2041.51 1122.36,2002.57C1117.32,1964.24 1123.13,1942.97 1130.39,1931.69C1137.65,1920.42 1146.82,1916.96 1155.55,1915.81Z" style="fill:rgb(26,26,26);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1516.33,1963.1C1466.19,1897.75 1427.4,1906.77 1407.5,1922.05C1387.59,1937.32 1368.84,1972.45 1418.98,2037.8C1431.75,2054.44 1447.26,2071.84 1463.69,2088.19C1495.18,2119.52 1534.33,2139.39 1582.98,2126.14C1606.4,2119.76 1622.19,2110.46 1623.75,2098.64C1625.79,2083.16 1603,2065.78 1569.69,2050.47C1554.75,2019.83 1535.59,1988.2 1516.33,1963.1Z" style="fill:rgb(219,220,211);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1397.07,1908.46C1409.99,1898.55 1430.41,1890.44 1454.2,1895.61C1478,1900.77 1503.31,1918 1529.91,1952.67C1548.92,1977.44 1567.3,2007.65 1582.28,2037.56C1597.47,2044.87 1610.74,2052.64 1621.09,2061.47C1632.68,2071.35 1642.93,2084.12 1640.73,2100.88C1639.05,2113.64 1630.31,2122.66 1620.9,2128.78C1611.49,2134.9 1600.29,2139.17 1587.48,2142.66C1532.39,2157.66 1485.57,2134.11 1451.61,2100.32C1434.7,2083.49 1418.73,2065.6 1405.39,2048.22C1378.79,2013.56 1368.69,1984.64 1369.86,1960.32C1371.04,1936 1384.15,1918.38 1397.07,1908.46ZM1417.92,1935.63C1410.94,1940.99 1404.71,1948.57 1404.07,1961.97C1403.43,1975.37 1409.02,1996.69 1432.56,2027.38C1444.76,2043.27 1459.82,2060.18 1475.77,2076.05C1504.8,2104.93 1536.26,2121.12 1578.48,2109.62C1589.1,2106.73 1597.5,2103.16 1602.23,2100.08C1605.14,2098.18 1606.16,2096.97 1606.54,2096.46C1606.07,2095.66 1604.57,2092.39 1598.86,2087.52C1591.24,2081.02 1578.31,2073.28 1562.54,2066.03L1556.98,2063.47L1554.29,2057.97C1539.86,2028.35 1521.12,1997.46 1502.75,1973.52C1479.2,1942.84 1460.05,1931.91 1446.94,1929.07C1433.84,1926.23 1424.9,1930.27 1417.92,1935.63Z" style="fill:rgb(26,26,26);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M917.121,1633.14C845.801,1674.32 730.68,1709.07 713.738,1679.73C696.797,1650.39 784.453,1568.07 855.777,1526.89C927.102,1485.71 959.48,1508.89 972.02,1530.62C984.562,1552.34 988.445,1591.97 917.121,1633.14Z" style="fill:rgb(219,220,211);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M986.848,1522.06C978.707,1507.95 962.949,1492.66 938.992,1488.32C915.031,1483.98 885.055,1490.22 847.219,1512.07C809.906,1533.61 769.453,1565.03 739.41,1595.79C724.391,1611.17 711.977,1626.24 703.797,1640.94C695.617,1655.64 689.746,1672.42 698.914,1688.29C708.078,1704.17 725.547,1707.48 742.363,1707.74C759.184,1708.01 778.445,1704.79 799.273,1699.47C840.934,1688.83 888.375,1669.51 925.684,1647.97C963.52,1626.12 983.91,1603.29 992.137,1580.37C1000.36,1557.45 994.988,1536.16 986.848,1522.06ZM957.195,1539.18C961.594,1546.79 964.438,1556.18 959.906,1568.8C955.379,1581.43 942.047,1598.98 908.562,1618.32C874.551,1637.96 828.77,1656.6 790.801,1666.3C771.816,1671.14 754.664,1673.69 742.902,1673.5C734.082,1673.37 730.035,1671.45 728.859,1671C729.062,1669.76 729.426,1665.3 733.715,1657.59C739.434,1647.31 750.215,1633.73 763.906,1619.72C791.285,1591.68 830.324,1561.36 864.336,1541.72C897.824,1522.38 919.695,1519.62 932.895,1522.01C946.09,1524.4 952.797,1531.56 957.195,1539.18Z" style="fill:rgb(26,26,26);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1791.57,1526.89C1862.89,1568.07 1950.54,1650.39 1933.61,1679.74C1916.66,1709.08 1801.54,1674.33 1730.22,1633.15C1658.9,1591.97 1662.78,1552.34 1675.32,1530.62C1687.86,1508.89 1720.24,1485.72 1791.57,1526.89Z" style="fill:rgb(219,220,211);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1660.5,1522.06C1652.35,1536.16 1646.98,1557.45 1655.21,1580.37C1663.43,1603.29 1683.82,1626.13 1721.66,1647.97C1758.97,1669.52 1806.41,1688.84 1848.07,1699.48C1868.9,1704.79 1888.16,1708.01 1904.98,1707.75C1921.79,1707.48 1939.27,1704.17 1948.43,1688.3C1957.59,1672.42 1951.73,1655.64 1943.55,1640.94C1935.37,1626.25 1922.95,1611.17 1907.93,1595.79C1877.89,1565.04 1837.43,1533.61 1800.12,1512.07C1762.29,1490.22 1732.31,1483.98 1708.35,1488.32C1684.39,1492.66 1668.64,1507.95 1660.5,1522.06ZM1690.15,1539.18C1694.55,1531.56 1701.25,1524.4 1714.45,1522.02C1727.64,1519.62 1749.52,1522.39 1783,1541.72C1817.02,1561.36 1856.06,1591.68 1883.44,1619.72C1897.12,1633.73 1907.91,1647.32 1913.63,1657.59C1917.92,1665.3 1918.28,1669.77 1918.48,1671.01C1917.31,1671.45 1913.26,1673.37 1904.44,1673.51C1892.68,1673.69 1875.52,1671.15 1856.54,1666.3C1818.57,1656.61 1772.79,1637.96 1738.78,1618.32C1705.29,1598.99 1691.97,1581.43 1687.43,1568.81C1682.91,1556.18 1685.75,1546.8 1690.15,1539.18Z" style="fill:rgb(26,26,26);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1322.81,1013.67C1058.16,1014.17 843.293,1229.45 843.297,1494.11L843.223,1862.19C843.223,1955.32 919.055,2031.16 1012.19,2031.16C1054.55,2031.16 1093.39,2015.51 1123.09,1989.7C1169.54,2049.44 1242.17,2087.79 1323.7,2087.79C1405.22,2087.79 1477.84,2049.45 1524.28,1989.73C1553.98,2015.52 1592.81,2031.16 1635.15,2031.16C1728.29,2031.16 1804.12,1955.32 1804.12,1862.19L1804.12,1494.1C1804.12,1229.09 1588.7,1013.67 1323.69,1013.67L1322.84,1013.67L1322.81,1013.67ZM1322.92,1068.46L1323.69,1068.46C1559.09,1068.46 1749.33,1258.7 1749.33,1494.11L1749.33,1862.19C1749.33,1925.92 1698.88,1976.37 1635.15,1976.37C1596.91,1976.37 1563.67,1958.03 1542.94,1929.68L1517.91,1895.48L1497,1932.34C1462.85,1992.53 1398.48,2033 1323.7,2033C1248.9,2033 1184.52,1992.51 1150.38,1932.3L1129.45,1895.41L1104.43,1929.65C1083.69,1958.02 1050.44,1976.37 1012.19,1976.37C948.461,1976.37 898.016,1925.93 898.012,1862.2L898.086,1494.11C898.086,1259.03 1087.84,1068.92 1322.92,1068.47L1322.92,1068.46Z" style="fill:rgb(26,26,26);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1322.86,1041.07C1072.99,1041.54 870.684,1244.23 870.688,1494.11L870.648,1862.19C870.648,1940.62 933.789,2003.77 1012.22,2003.77C1073.65,2003.77 1125.69,1965.03 1145.37,1910.56C1201.73,1934.69 1262.41,1947.14 1323.72,1947.14C1385.02,1947.14 1445.69,1934.69 1502.04,1910.57C1521.72,1965.04 1573.76,2003.77 1635.19,2003.77C1713.62,2003.77 1776.76,1940.62 1776.76,1862.19L1776.76,1494.11C1776.76,1243.9 1573.93,1041.07 1323.72,1041.07L1322.86,1041.07Z" style="fill:white;fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1323.7,1494.1C1449.2,1494.1 1550.24,1595.14 1550.24,1720.64L1550.24,1833.86C1550.24,1959.36 1449.2,2060.4 1323.7,2060.4C1198.2,2060.4 1097.16,1959.36 1097.16,1833.86L1097.16,1720.64C1097.16,1595.14 1198.2,1494.1 1323.7,1494.1Z" style="fill:white;fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1322.86,1041.07C1262.14,1041.18 1204.25,1053.27 1151.36,1075.05C1316.07,1142.87 1432.03,1304.93 1432.03,1494.11L1432.03,1811.95C1432.03,2003.63 1209.62,2024.85 1126.54,1945.82C1177.52,2034.1 1254.55,2060.4 1323.7,2060.4C1408.4,2060.4 1481.95,2014.37 1520.82,1945.86C1546.53,1981.01 1588.08,2003.77 1635.15,2003.77C1713.58,2003.77 1776.72,1940.62 1776.72,1862.19L1776.72,1494.11C1776.72,1243.9 1573.89,1041.07 1323.68,1041.07L1322.86,1041.07Z" style="fill:rgb(219,220,211);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1322.86,1041.07C1304.33,1041.1 1286.06,1042.28 1268.11,1044.48C1492.04,1071.93 1665.46,1262.75 1665.46,1494.11L1665.46,1862.19C1665.46,1920.85 1630.14,1970.94 1579.54,1992.48C1596.59,1999.74 1615.38,2003.77 1635.15,2003.77C1713.58,2003.77 1776.72,1940.62 1776.72,1862.19L1776.72,1494.11C1776.72,1243.9 1573.89,1041.07 1323.68,1041.07L1322.86,1041.07Z" style="fill:rgb(189,191,175);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1322.85,1034.22C1069.29,1034.69 863.84,1240.54 863.84,1494.11L863.766,1862.19C863.766,1944.3 930.078,2010.61 1012.19,2010.61C1057.88,2010.61 1098.53,1989.94 1125.71,1957.58C1166.88,2023.5 1240.02,2067.25 1323.7,2067.25C1407.36,2067.25 1480.48,2023.52 1521.66,1957.62C1548.84,1989.96 1589.47,2010.61 1635.15,2010.61C1717.25,2010.61 1783.57,1944.3 1783.57,1862.19L1783.57,1494.11C1783.57,1240.2 1577.59,1034.21 1323.68,1034.22L1322.85,1034.22ZM1322.86,1047.92L1323.68,1047.92C1570.19,1047.92 1769.87,1247.6 1769.87,1494.11L1769.87,1862.19C1769.87,1936.95 1709.91,1996.92 1635.15,1996.92C1590.29,1996.92 1550.82,1975.26 1526.36,1941.82L1520.1,1933.27L1514.87,1942.48C1477.18,2008.91 1405.92,2053.55 1323.7,2053.55C1241.46,2053.55 1170.19,2008.89 1132.5,1942.44L1127.27,1933.21L1121.02,1941.77C1096.56,1975.24 1057.07,1996.92 1012.19,1996.92C937.43,1996.92 877.469,1936.95 877.465,1862.19L877.539,1494.11C877.539,1247.94 1076.7,1048.39 1322.86,1047.92Z" style="fill:rgb(26,26,26);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1576.29,1470.72C1576.29,1481.36 1568.75,1491.56 1555.31,1499.08C1541.88,1506.6 1523.67,1510.83 1504.68,1510.83C1465.12,1510.83 1433.06,1492.87 1433.06,1470.72C1433.06,1448.57 1465.12,1430.62 1504.68,1430.62C1523.67,1430.62 1541.88,1434.84 1555.31,1442.36C1568.75,1449.89 1576.29,1460.09 1576.29,1470.72Z" style="fill:rgb(255,155,173);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1214.28,1470.72C1214.28,1481.36 1206.73,1491.56 1193.31,1499.08C1179.87,1506.6 1161.66,1510.83 1142.66,1510.83C1103.11,1510.83 1071.05,1492.87 1071.05,1470.72C1071.05,1448.57 1103.11,1430.62 1142.66,1430.62C1161.66,1430.62 1179.87,1434.84 1193.31,1442.36C1206.73,1449.89 1214.28,1460.09 1214.28,1470.72Z" style="fill:rgb(255,155,173);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1104.39,1401.46C1104.39,1375.15 1118.45,1350.79 1141.24,1337.63C1164.03,1324.48 1192.16,1324.48 1214.95,1337.63C1237.74,1350.79 1251.81,1375.15 1251.81,1401.46L1224.41,1401.46C1224.41,1384.9 1215.6,1369.64 1201.25,1361.36C1186.9,1353.07 1169.29,1353.07 1154.94,1361.36C1140.59,1369.64 1131.78,1384.9 1131.78,1401.46L1104.39,1401.46Z" style="fill:rgb(26,26,26);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1395.54,1401.46C1395.54,1375.15 1409.61,1350.79 1432.39,1337.63C1455.18,1324.48 1483.32,1324.48 1506.11,1337.63C1528.89,1350.79 1542.96,1375.15 1542.96,1401.46L1515.56,1401.46C1515.56,1384.9 1506.75,1369.64 1492.41,1361.36C1478.06,1353.07 1460.44,1353.07 1446.09,1361.36C1431.74,1369.64 1422.93,1384.9 1422.93,1401.46L1395.54,1401.46Z" style="fill:rgb(26,26,26);fill-rule:nonzero;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0,9.81959)">
-                <path d="M1256.81,1448.61C1256.81,1472.48 1269.56,1494.57 1290.24,1506.51C1310.92,1518.45 1336.42,1518.45 1357.1,1506.51C1377.78,1494.57 1390.53,1472.48 1390.53,1448.61L1376.83,1448.61C1376.83,1467.61 1366.71,1485.15 1350.25,1494.65C1333.79,1504.15 1313.55,1504.15 1297.09,1494.65C1280.63,1485.15 1270.51,1467.61 1270.51,1448.61L1256.81,1448.61Z" style="fill:rgb(26,26,26);fill-rule:nonzero;"/>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/.renovaterc.json
+++ b/.renovaterc.json
@@ -3,30 +3,16 @@
  "extends": [
    "helpers:pinGitHubActionDigests"
  ],
-  "customManagers": [
-    {
-      "customType": "regex",
-      "fileMatch": [
-        "^integration-tests/.*(-init\\.patch|\\.sh)$"
-      ],
-      "matchStrings": [
-        "\\b(?<packageName>[a-z0-9_.-]+?:[a-z0-9_.-]+?):(?<currentValue>[^:]+?):[a-zA-Z0-9_-]+\\b",
-        "<version>(?<currentValue>.*?)<!-- Renovate: (?<packageName>.*?) --></version>"
-      ],
-      "datasourceTemplate": "maven"
-    }
-  ],
  "packageRules": [
    {
-      "matchPackageNames": [
-        "/^org\\.springframework:spring-framework-bom$/",
-        "/^org\\.springframework\\.boot:spring-boot[a-z-]*$/"
+      "matchPackagePatterns": [
+        "^org\\.springframework:spring-framework-bom$",
+        "^org\\.springframework\\.boot:spring-boot[a-z-]*$"
      ],
      "separateMinorPatch": true
    },
    {
-      "matchPackageNames": [
-        "dawidd6/action-download-artifact",
+      "matchDepNames": [
        "github/codeql-action",
        "ruby/setup-ruby"
      ],
--- a/README.md
+++ b/README.md
@@ -49,9 +49,7 @@ high-quality and consistent Java code_][picnic-blog-ep-post].
 ### Installation

 This library is built on top of [Error Prone][error-prone-orig-repo]. To use
-it, read the installation guide for Maven or Gradle below. The library requires
-that your build is executed using JDK 17 or above, but supports builds that
-[target][baeldung-java-source-target-options] older versions of Java.
+it, read the installation guide for Maven or Gradle below.

 #### Maven

@@ -217,7 +215,7 @@ Other highly relevant commands:
 - `mvn fmt:format` formats the code using
  [`google-java-format`][google-java-format].
 - [`./run-full-build.sh`][script-run-full-build] builds the project twice,
-  where the second pass validates compatibility with Picnic's [Error Prone
+  where the second pass validates compatbility with Picnic's [Error Prone
  fork][error-prone-fork-repo] and compliance of the code with any rules
  defined within this project. (Consider running this before [opening a pull
  request][contributing-pull-request], as the PR checks also perform this
@@ -265,7 +263,6 @@ guidelines][contributing].
 If you want to report a security vulnerability, please do so through a private
 channel; please see our [security policy][security] for details.

-[baeldung-java-source-target-options]: https://www.baeldung.com/java-source-target-options
 [bug-checks]: https://github.com/PicnicSupermarket/error-prone-support/blob/master/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/
 [bug-checks-identity-conversion]: https://github.com/PicnicSupermarket/error-prone-support/blob/master/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/IdentityConversion.java
 [codeql-badge]: https://github.com/PicnicSupermarket/error-prone-support/actions/workflows/codeql.yml/badge.svg?branch=master&event=push
@@ -302,7 +299,7 @@ channel; please see our [security policy][security] for details.
 [refaster]: https://errorprone.info/docs/refaster
 [refaster-rules-bigdecimal]: https://github.com/PicnicSupermarket/error-prone-support/blob/master/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/BigDecimalRules.java
 [refaster-rules]: https://github.com/PicnicSupermarket/error-prone-support/blob/master/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/
-[reproducible-builds-badge]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jvm-repo-rebuild/reproducible-central/master/content/tech/picnic/error-prone-support/error-prone-support/badge.json
+[reproducible-builds-badge]: https://img.shields.io/badge/Reproducible_Builds-ok-success?labelColor=1e5b96
 [reproducible-builds-report]: https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/tech/picnic/error-prone-support/error-prone-support/README.md
 [script-apply-error-prone-suggestions]: https://github.com/PicnicSupermarket/error-prone-support/blob/master/apply-error-prone-suggestions.sh
 [script-run-branch-mutation-tests]: https://github.com/PicnicSupermarket/error-prone-support/blob/master/run-branch-mutation-tests.sh
--- a/documentation-support/pom.xml
+++ b/documentation-support/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>tech.picnic.error-prone-support</groupId>
        <artifactId>error-prone-support</artifactId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.14.1-SNAPSHOT</version>
    </parent>

    <artifactId>documentation-support</artifactId>
@@ -33,15 +33,6 @@
            <artifactId>error_prone_test_helpers</artifactId>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>error-prone-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>refaster-test-support</artifactId>
-            <scope>test</scope>
-        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
--- a/documentation-support/src/main/java/tech/picnic/errorprone/documentation/BugPatternTestExtractor.java
+++ b/documentation-support/src/main/java/tech/picnic/errorprone/documentation/BugPatternTestExtractor.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import org.jspecify.annotations.Nullable;
-import tech.picnic.errorprone.documentation.BugPatternTestExtractor.BugPatternTestCases;
+import tech.picnic.errorprone.documentation.BugPatternTestExtractor.TestCases;

 /**
 * An {@link Extractor} that describes how to extract data from classes that test a {@code
@@ -40,7 +40,7 @@ import tech.picnic.errorprone.documentation.BugPatternTestExtractor.BugPatternTe
@Immutable
@AutoService(Extractor.class)
@SuppressWarnings("rawtypes" /* See https://github.com/google/auto/issues/870. */)
-public final class BugPatternTestExtractor implements Extractor<BugPatternTestCases> {
+public final class BugPatternTestExtractor implements Extractor<TestCases> {
  /** Instantiates a new {@link BugPatternTestExtractor} instance. */
  public BugPatternTestExtractor() {}

@@ -50,7 +50,7 @@ public final class BugPatternTestExtractor implements Extractor<BugPatternTestCa
  }

  @Override
-  public Optional<BugPatternTestCases> tryExtract(ClassTree tree, VisitorState state) {
+  public Optional<TestCases> tryExtract(ClassTree tree, VisitorState state) {
    BugPatternTestCollector collector = new BugPatternTestCollector();

    collector.scan(tree, state);
@@ -59,7 +59,7 @@ public final class BugPatternTestExtractor implements Extractor<BugPatternTestCa
        .filter(not(ImmutableList::isEmpty))
        .map(
            tests ->
-                new AutoValue_BugPatternTestExtractor_BugPatternTestCases(
+                new AutoValue_BugPatternTestExtractor_TestCases(
                    state.getPath().getCompilationUnit().getSourceFile().toUri(),
                    ASTHelpers.getSymbol(tree).className(),
                    tests));
@@ -95,10 +95,10 @@ public final class BugPatternTestExtractor implements Extractor<BugPatternTestCa
            .onDescendantOf("com.google.errorprone.BugCheckerRefactoringTestHelper.ExpectOutput")
            .namedAnyOf("addOutputLines", "expectUnchanged");

-    private final List<BugPatternTestCase> collectedBugPatternTestCases = new ArrayList<>();
+    private final List<TestCase> collectedTestCases = new ArrayList<>();

-    private ImmutableList<BugPatternTestCase> getCollectedTests() {
-      return ImmutableList.copyOf(collectedBugPatternTestCases);
+    private ImmutableList<TestCase> getCollectedTests() {
+      return ImmutableList.copyOf(collectedTestCases);
    }

    @Override
@@ -110,14 +110,14 @@ public final class BugPatternTestExtractor implements Extractor<BugPatternTestCa
                classUnderTest -> {
                  List<TestEntry> entries = new ArrayList<>();
                  if (isReplacementTest) {
-                    extractReplacementBugPatternTestCases(node, entries, state);
+                    extractReplacementTestCases(node, entries, state);
                  } else {
-                    extractIdentificationBugPatternTestCases(node, entries, state);
+                    extractIdentificationTestCases(node, entries, state);
                  }

                  if (!entries.isEmpty()) {
-                    collectedBugPatternTestCases.add(
-                        new AutoValue_BugPatternTestExtractor_BugPatternTestCase(
+                    collectedTestCases.add(
+                        new AutoValue_BugPatternTestExtractor_TestCase(
                            classUnderTest, ImmutableList.copyOf(entries).reverse()));
                  }
                });
@@ -135,12 +135,12 @@ public final class BugPatternTestExtractor implements Extractor<BugPatternTestCa
      }

      ExpressionTree receiver = ASTHelpers.getReceiver(tree);
-      return receiver instanceof MethodInvocationTree methodInvocation
-          ? getClassUnderTest(methodInvocation, state)
+      return receiver instanceof MethodInvocationTree
+          ? getClassUnderTest((MethodInvocationTree) receiver, state)
          : Optional.empty();
    }

-    private static void extractIdentificationBugPatternTestCases(
+    private static void extractIdentificationTestCases(
        MethodInvocationTree tree, List<TestEntry> sink, VisitorState state) {
      if (IDENTIFICATION_SOURCE_LINES.matches(tree, state)) {
        String path = ASTHelpers.constValue(tree.getArguments().get(0), String.class);
@@ -154,12 +154,12 @@ public final class BugPatternTestExtractor implements Extractor<BugPatternTestCa
      }

      ExpressionTree receiver = ASTHelpers.getReceiver(tree);
-      if (receiver instanceof MethodInvocationTree methodInvocation) {
-        extractIdentificationBugPatternTestCases(methodInvocation, sink, state);
+      if (receiver instanceof MethodInvocationTree) {
+        extractIdentificationTestCases((MethodInvocationTree) receiver, sink, state);
      }
    }

-    private static void extractReplacementBugPatternTestCases(
+    private static void extractReplacementTestCases(
        MethodInvocationTree tree, List<TestEntry> sink, VisitorState state) {
      if (REPLACEMENT_OUTPUT_SOURCE_LINES.matches(tree, state)) {
        /*
@@ -184,8 +184,8 @@ public final class BugPatternTestExtractor implements Extractor<BugPatternTestCa
      }

      ExpressionTree receiver = ASTHelpers.getReceiver(tree);
-      if (receiver instanceof MethodInvocationTree methodInvocation) {
-        extractReplacementBugPatternTestCases(methodInvocation, sink, state);
+      if (receiver instanceof MethodInvocationTree) {
+        extractReplacementTestCases((MethodInvocationTree) receiver, sink, state);
      }
    }

@@ -208,26 +208,24 @@ public final class BugPatternTestExtractor implements Extractor<BugPatternTestCa
  }

  @AutoValue
-  @JsonDeserialize(as = AutoValue_BugPatternTestExtractor_BugPatternTestCases.class)
-  abstract static class BugPatternTestCases {
-    static BugPatternTestCases create(
-        URI source, String testClass, ImmutableList<BugPatternTestCase> testCases) {
-      return new AutoValue_BugPatternTestExtractor_BugPatternTestCases(
-          source, testClass, testCases);
+  @JsonDeserialize(as = AutoValue_BugPatternTestExtractor_TestCases.class)
+  abstract static class TestCases {
+    static TestCases create(URI source, String testClass, ImmutableList<TestCase> testCases) {
+      return new AutoValue_BugPatternTestExtractor_TestCases(source, testClass, testCases);
    }

    abstract URI source();

    abstract String testClass();

-    abstract ImmutableList<BugPatternTestCase> testCases();
+    abstract ImmutableList<TestCase> testCases();
  }

  @AutoValue
-  @JsonDeserialize(as = AutoValue_BugPatternTestExtractor_BugPatternTestCase.class)
-  abstract static class BugPatternTestCase {
-    static BugPatternTestCase create(String classUnderTest, ImmutableList<TestEntry> entries) {
-      return new AutoValue_BugPatternTestExtractor_BugPatternTestCase(classUnderTest, entries);
+  @JsonDeserialize(as = AutoValue_BugPatternTestExtractor_TestCase.class)
+  abstract static class TestCase {
+    static TestCase create(String classUnderTest, ImmutableList<TestEntry> entries) {
+      return new AutoValue_BugPatternTestExtractor_TestCase(classUnderTest, entries);
    }

    abstract String classUnderTest();
--- a/documentation-support/src/main/java/tech/picnic/errorprone/documentation/DocumentationGeneratorTaskListener.java
+++ b/documentation-support/src/main/java/tech/picnic/errorprone/documentation/DocumentationGeneratorTaskListener.java
@@ -14,6 +14,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ServiceLoader;
 import javax.tools.JavaFileObject;

@@ -86,6 +87,6 @@ final class DocumentationGeneratorTaskListener implements TaskListener {
  }

  private static String getSimpleClassName(URI path) {
-    return Path.of(path).getFileName().toString().replace(".java", "");
+    return Paths.get(path).getFileName().toString().replace(".java", "");
  }
 }
--- a/documentation-support/src/main/java/tech/picnic/errorprone/documentation/RefasterRuleCollectionTestExtractor.java
+++ b/documentation-support/src/main/java/tech/picnic/errorprone/documentation/RefasterRuleCollectionTestExtractor.java
@@ -1,176 +0,0 @@
-package tech.picnic.errorprone.documentation;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.errorprone.matchers.Matchers.isSubtypeOf;
-import static java.util.stream.Collectors.joining;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.auto.service.AutoService;
-import com.google.auto.value.AutoValue;
-import com.google.common.base.Splitter;
-import com.google.common.base.Supplier;
-import com.google.common.base.VerifyException;
-import com.google.common.collect.ImmutableList;
-import com.google.errorprone.VisitorState;
-import com.google.errorprone.annotations.FormatMethod;
-import com.google.errorprone.annotations.Immutable;
-import com.google.errorprone.matchers.Matcher;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.MethodTree;
-import java.net.URI;
-import java.util.Optional;
-import java.util.regex.Pattern;
-import tech.picnic.errorprone.documentation.RefasterRuleCollectionTestExtractor.RefasterTestCases;
-import tech.picnic.errorprone.utils.SourceCode;
-
-/**
- * An {@link Extractor} that describes how to extract data from Refaster rule input and output test
- * classes.
- */
-// XXX: Drop this extractor if/when the Refaster test framework is reimplemented such that tests can
-// be located alongside rules, rather than in two additional resource files as currently required by
-// `RefasterRuleCollection`.
-@Immutable
-@AutoService(Extractor.class)
-@SuppressWarnings("rawtypes" /* See https://github.com/google/auto/issues/870. */)
-public final class RefasterRuleCollectionTestExtractor implements Extractor<RefasterTestCases> {
-  private static final Matcher<ClassTree> IS_REFASTER_RULE_COLLECTION_TEST_CASE =
-      isSubtypeOf("tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase");
-  private static final Pattern TEST_CLASS_NAME_PATTERN = Pattern.compile("(.*)Test");
-  private static final Pattern TEST_CLASS_FILE_NAME_PATTERN =
-      Pattern.compile(".*(Input|Output)\\.java");
-  private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("test(.*)");
-  private static final String LINE_SEPARATOR = "\n";
-  private static final Splitter LINE_SPLITTER = Splitter.on(LINE_SEPARATOR);
-
-  /** Instantiates a new {@link RefasterRuleCollectionTestExtractor} instance. */
-  public RefasterRuleCollectionTestExtractor() {}
-
-  @Override
-  public String identifier() {
-    return "refaster-rule-collection-test";
-  }
-
-  @Override
-  public Optional<RefasterTestCases> tryExtract(ClassTree tree, VisitorState state) {
-    if (!IS_REFASTER_RULE_COLLECTION_TEST_CASE.matches(tree, state)) {
-      return Optional.empty();
-    }
-
-    URI sourceFile = state.getPath().getCompilationUnit().getSourceFile().toUri();
-    return Optional.of(
-        RefasterTestCases.create(
-            sourceFile,
-            getRuleCollectionName(tree),
-            isInputFile(sourceFile),
-            getRefasterTestCases(tree, state)));
-  }
-
-  private static String getRuleCollectionName(ClassTree tree) {
-    String className = tree.getSimpleName().toString();
-
-    // XXX: Instead of throwing an error here, it'd be nicer to have a bug checker validate key
-    // aspects of `RefasterRuleCollectionTestCase` subtypes.
-    return tryExtractPatternGroup(className, TEST_CLASS_NAME_PATTERN)
-        .orElseThrow(
-            violation(
-                "Refaster rule collection test class name '%s' does not match '%s'",
-                className, TEST_CLASS_NAME_PATTERN));
-  }
-
-  private static boolean isInputFile(URI sourceFile) {
-    String path = sourceFile.getPath();
-
-    // XXX: Instead of throwing an error here, it'd be nicer to have a bug checker validate key
-    // aspects of `RefasterRuleCollectionTestCase` subtypes.
-    return "Input"
-        .equals(
-            tryExtractPatternGroup(path, TEST_CLASS_FILE_NAME_PATTERN)
-                .orElseThrow(
-                    violation(
-                        "Refaster rule collection test file name '%s' does not match '%s'",
-                        path, TEST_CLASS_FILE_NAME_PATTERN)));
-  }
-
-  private static ImmutableList<RefasterTestCase> getRefasterTestCases(
-      ClassTree tree, VisitorState state) {
-    return tree.getMembers().stream()
-        .filter(MethodTree.class::isInstance)
-        .map(MethodTree.class::cast)
-        .flatMap(m -> tryExtractRefasterTestCase(m, state).stream())
-        .collect(toImmutableList());
-  }
-
-  private static Optional<RefasterTestCase> tryExtractRefasterTestCase(
-      MethodTree method, VisitorState state) {
-    return tryExtractPatternGroup(method.getName().toString(), TEST_METHOD_NAME_PATTERN)
-        .map(name -> RefasterTestCase.create(name, getFormattedSource(method, state)));
-  }
-
-  /**
-   * Returns the source code for the specified method.
-   *
-   * @implNote This operation attempts to trim leading whitespace, such that the start and end of
-   *     the method declaration are aligned. The implemented heuristic assumes that the code is
-   *     formatted using Google Java Format.
-   */
-  // XXX: Leading Javadoc and other comments are currently not extracted. Consider fixing this.
-  private static String getFormattedSource(MethodTree method, VisitorState state) {
-    String source = SourceCode.treeToString(method, state);
-    int finalNewline = source.lastIndexOf(LINE_SEPARATOR);
-    if (finalNewline < 0) {
-      return source;
-    }
-
-    int indentation = Math.max(0, source.lastIndexOf(' ') - finalNewline);
-    String prefixToStrip = " ".repeat(indentation);
-
-    return LINE_SPLITTER
-        .splitToStream(source)
-        .map(line -> line.startsWith(prefixToStrip) ? line.substring(indentation) : line)
-        .collect(joining(LINE_SEPARATOR));
-  }
-
-  private static Optional<String> tryExtractPatternGroup(String input, Pattern pattern) {
-    java.util.regex.Matcher matcher = pattern.matcher(input);
-    return matcher.matches() ? Optional.of(matcher.group(1)) : Optional.empty();
-  }
-
-  @FormatMethod
-  private static Supplier<VerifyException> violation(String format, Object... args) {
-    return () -> new VerifyException(String.format(format, args));
-  }
-
-  @AutoValue
-  @JsonDeserialize(as = AutoValue_RefasterRuleCollectionTestExtractor_RefasterTestCases.class)
-  abstract static class RefasterTestCases {
-    static RefasterTestCases create(
-        URI source,
-        String ruleCollection,
-        boolean isInput,
-        ImmutableList<RefasterTestCase> testCases) {
-      return new AutoValue_RefasterRuleCollectionTestExtractor_RefasterTestCases(
-          source, ruleCollection, isInput, testCases);
-    }
-
-    abstract URI source();
-
-    abstract String ruleCollection();
-
-    abstract boolean isInput();
-
-    abstract ImmutableList<RefasterTestCase> testCases();
-  }
-
-  @AutoValue
-  @JsonDeserialize(as = AutoValue_RefasterRuleCollectionTestExtractor_RefasterTestCase.class)
-  abstract static class RefasterTestCase {
-    static RefasterTestCase create(String name, String content) {
-      return new AutoValue_RefasterRuleCollectionTestExtractor_RefasterTestCase(name, content);
-    }
-
-    abstract String name();
-
-    abstract String content();
-  }
-}
--- a/documentation-support/src/test/java/tech/picnic/errorprone/documentation/BugPatternTestExtractorTest.java
+++ b/documentation-support/src/test/java/tech/picnic/errorprone/documentation/BugPatternTestExtractorTest.java
@@ -7,10 +7,10 @@ import java.net.URI;
 import java.nio.file.Path;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import tech.picnic.errorprone.documentation.BugPatternTestExtractor.BugPatternTestCase;
-import tech.picnic.errorprone.documentation.BugPatternTestExtractor.BugPatternTestCases;
 import tech.picnic.errorprone.documentation.BugPatternTestExtractor.IdentificationTestEntry;
 import tech.picnic.errorprone.documentation.BugPatternTestExtractor.ReplacementTestEntry;
+import tech.picnic.errorprone.documentation.BugPatternTestExtractor.TestCase;
+import tech.picnic.errorprone.documentation.BugPatternTestExtractor.TestCases;

 final class BugPatternTestExtractorTest {
  @Test
@@ -269,11 +269,11 @@ final class BugPatternTestExtractorTest {
    verifyGeneratedFileContent(
        outputDirectory,
        "SingleFileCompilationTestHelperTest",
-        BugPatternTestCases.create(
+        TestCases.create(
            URI.create("file:///SingleFileCompilationTestHelperTest.java"),
            "SingleFileCompilationTestHelperTest",
            ImmutableList.of(
-                BugPatternTestCase.create(
+                TestCase.create(
                    "SingleFileCompilationTestHelperTest.TestChecker",
                    ImmutableList.of(
                        IdentificationTestEntry.create(
@@ -302,11 +302,11 @@ final class BugPatternTestExtractorTest {
    verifyGeneratedFileContent(
        outputDirectory,
        "SingleFileCompilationTestHelperWithSetArgsTest",
-        BugPatternTestCases.create(
+        TestCases.create(
            URI.create("file:///SingleFileCompilationTestHelperWithSetArgsTest.java"),
            "SingleFileCompilationTestHelperWithSetArgsTest",
            ImmutableList.of(
-                BugPatternTestCase.create(
+                TestCase.create(
                    "SingleFileCompilationTestHelperWithSetArgsTest.TestChecker",
                    ImmutableList.of(
                        IdentificationTestEntry.create(
@@ -335,11 +335,11 @@ final class BugPatternTestExtractorTest {
    verifyGeneratedFileContent(
        outputDirectory,
        "MultiFileCompilationTestHelperTest",
-        BugPatternTestCases.create(
+        TestCases.create(
            URI.create("file:///MultiFileCompilationTestHelperTest.java"),
            "MultiFileCompilationTestHelperTest",
            ImmutableList.of(
-                BugPatternTestCase.create(
+                TestCase.create(
                    "MultiFileCompilationTestHelperTest.TestChecker",
                    ImmutableList.of(
                        IdentificationTestEntry.create(
@@ -370,11 +370,11 @@ final class BugPatternTestExtractorTest {
    verifyGeneratedFileContent(
        outputDirectory,
        "SingleFileBugCheckerRefactoringTestHelperTest",
-        BugPatternTestCases.create(
+        TestCases.create(
            URI.create("file:///SingleFileBugCheckerRefactoringTestHelperTest.java"),
            "SingleFileBugCheckerRefactoringTestHelperTest",
            ImmutableList.of(
-                BugPatternTestCase.create(
+                TestCase.create(
                    "SingleFileBugCheckerRefactoringTestHelperTest.TestChecker",
                    ImmutableList.of(
                        ReplacementTestEntry.create(
@@ -408,12 +408,12 @@ final class BugPatternTestExtractorTest {
    verifyGeneratedFileContent(
        outputDirectory,
        "SingleFileBugCheckerRefactoringTestHelperWithSetArgsFixChooserAndCustomTestModeTest",
-        BugPatternTestCases.create(
+        TestCases.create(
            URI.create(
                "file:///SingleFileBugCheckerRefactoringTestHelperWithSetArgsFixChooserAndCustomTestModeTest.java"),
            "SingleFileBugCheckerRefactoringTestHelperWithSetArgsFixChooserAndCustomTestModeTest",
            ImmutableList.of(
-                BugPatternTestCase.create(
+                TestCase.create(
                    "SingleFileBugCheckerRefactoringTestHelperWithSetArgsFixChooserAndCustomTestModeTest.TestChecker",
                    ImmutableList.of(
                        ReplacementTestEntry.create(
@@ -444,11 +444,11 @@ final class BugPatternTestExtractorTest {
    verifyGeneratedFileContent(
        outputDirectory,
        "MultiFileBugCheckerRefactoringTestHelperTest",
-        BugPatternTestCases.create(
+        TestCases.create(
            URI.create("file:///MultiFileBugCheckerRefactoringTestHelperTest.java"),
            "MultiFileBugCheckerRefactoringTestHelperTest",
            ImmutableList.of(
-                BugPatternTestCase.create(
+                TestCase.create(
                    "MultiFileBugCheckerRefactoringTestHelperTest.TestChecker",
                    ImmutableList.of(
                        ReplacementTestEntry.create(
@@ -484,16 +484,16 @@ final class BugPatternTestExtractorTest {
    verifyGeneratedFileContent(
        outputDirectory,
        "CompilationAndBugCheckerRefactoringTestHelpersTest",
-        BugPatternTestCases.create(
+        TestCases.create(
            URI.create("file:///CompilationAndBugCheckerRefactoringTestHelpersTest.java"),
            "CompilationAndBugCheckerRefactoringTestHelpersTest",
            ImmutableList.of(
-                BugPatternTestCase.create(
+                TestCase.create(
                    "CompilationAndBugCheckerRefactoringTestHelpersTest.TestChecker",
                    ImmutableList.of(
                        IdentificationTestEntry.create(
                            "A.java", "// BUG: Diagnostic contains:\nclass A {}\n"))),
-                BugPatternTestCase.create(
+                TestCase.create(
                    "CompilationAndBugCheckerRefactoringTestHelpersTest.TestChecker",
                    ImmutableList.of(
                        ReplacementTestEntry.create(
@@ -532,17 +532,17 @@ final class BugPatternTestExtractorTest {
    verifyGeneratedFileContent(
        outputDirectory,
        "CompilationAndBugCheckerRefactoringTestHelpersWithCustomCheckerPackageAndNamesTest",
-        BugPatternTestCases.create(
+        TestCases.create(
            URI.create(
                "file:///CompilationAndBugCheckerRefactoringTestHelpersWithCustomCheckerPackageAndNamesTest.java"),
            "pkg.CompilationAndBugCheckerRefactoringTestHelpersWithCustomCheckerPackageAndNamesTest",
            ImmutableList.of(
-                BugPatternTestCase.create(
+                TestCase.create(
                    "pkg.CompilationAndBugCheckerRefactoringTestHelpersWithCustomCheckerPackageAndNamesTest.CustomTestChecker",
                    ImmutableList.of(
                        IdentificationTestEntry.create(
                            "A.java", "// BUG: Diagnostic contains:\nclass A {}\n"))),
-                BugPatternTestCase.create(
+                TestCase.create(
                    "pkg.CompilationAndBugCheckerRefactoringTestHelpersWithCustomCheckerPackageAndNamesTest.CustomTestChecker2",
                    ImmutableList.of(
                        ReplacementTestEntry.create(
@@ -550,9 +550,9 @@ final class BugPatternTestExtractorTest {
  }

  private static void verifyGeneratedFileContent(
-      Path outputDirectory, String testClass, BugPatternTestCases expected) {
+      Path outputDirectory, String testClass, TestCases expected) {
    assertThat(outputDirectory.resolve(String.format("bugpattern-test-%s.json", testClass)))
        .exists()
-        .returns(expected, path -> Json.read(path, BugPatternTestCases.class));
+        .returns(expected, path -> Json.read(path, TestCases.class));
  }
 }
--- a/documentation-support/src/test/java/tech/picnic/errorprone/documentation/DocumentationGeneratorTaskListenerTest.java
+++ b/documentation-support/src/test/java/tech/picnic/errorprone/documentation/DocumentationGeneratorTaskListenerTest.java
@@ -10,6 +10,7 @@ import static org.junit.jupiter.api.condition.OS.WINDOWS;
 import com.google.auto.service.AutoService;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Streams;
 import com.google.errorprone.VisitorState;
@@ -40,8 +41,7 @@ final class DocumentationGeneratorTaskListenerTest {
                entry ->
                    AclEntry.newBuilder(entry)
                        .setPermissions(
-                            Sets.difference(
-                                entry.permissions(), Sets.immutableEnumSet(ADD_SUBDIRECTORY)))
+                            Sets.difference(entry.permissions(), ImmutableSet.of(ADD_SUBDIRECTORY)))
                        .build())
            .collect(toImmutableList()));

@@ -93,20 +93,13 @@ final class DocumentationGeneratorTaskListenerTest {
        "DocumentationGeneratorTaskListenerTestClass.java",
        "class DocumentationGeneratorTaskListenerTestClass {}");

+    // XXX: Once we support only JDK 15+, use a text block for the `expected` string.
    assertThat(
            outputDirectory.resolve(
                "documentation-generator-task-listener-test-DocumentationGeneratorTaskListenerTestClass.json"))
        .content(UTF_8)
        .isEqualToIgnoringWhitespace(
-            """
-            {
-              "className": "DocumentationGeneratorTaskListenerTestClass",
-              "path": [
-                "CLASS: DocumentationGeneratorTaskListenerTestClass",
-                "COMPILATION_UNIT"
-              ]
-            }
-            """);
+            "{\"className\":\"DocumentationGeneratorTaskListenerTestClass\",\"path\":[\"CLASS: DocumentationGeneratorTaskListenerTestClass\",\"COMPILATION_UNIT\"]}");
  }

  @Immutable
@@ -132,8 +125,8 @@ final class DocumentationGeneratorTaskListenerTest {
    }

    private static String describeTree(Tree tree) {
-      return (tree instanceof ClassTree clazz)
-          ? String.join(": ", String.valueOf(tree.getKind()), clazz.getSimpleName())
+      return (tree instanceof ClassTree)
+          ? String.join(": ", String.valueOf(tree.getKind()), ((ClassTree) tree).getSimpleName())
          : tree.getKind().toString();
    }
  }
--- a/documentation-support/src/test/java/tech/picnic/errorprone/documentation/RefasterRuleCollectionTestExtractorTest.java
+++ b/documentation-support/src/test/java/tech/picnic/errorprone/documentation/RefasterRuleCollectionTestExtractorTest.java
@@ -1,166 +0,0 @@
-package tech.picnic.errorprone.documentation;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import com.google.common.base.VerifyException;
-import com.google.common.collect.ImmutableList;
-import java.net.URI;
-import java.nio.file.Path;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import tech.picnic.errorprone.documentation.RefasterRuleCollectionTestExtractor.RefasterTestCase;
-import tech.picnic.errorprone.documentation.RefasterRuleCollectionTestExtractor.RefasterTestCases;
-
-final class RefasterRuleCollectionTestExtractorTest {
-  @Test
-  void noRefasterRuleTest(@TempDir Path outputDirectory) {
-    Compilation.compileWithDocumentationGenerator(
-        outputDirectory, "NoRefasterRuleTest.java", "public final class NoRefasterRuleTest {}");
-
-    assertThat(outputDirectory.toAbsolutePath()).isEmptyDirectory();
-  }
-
-  @Test
-  void invalidTestClassName(@TempDir Path outputDirectory) {
-    assertThatThrownBy(
-            () ->
-                Compilation.compileWithDocumentationGenerator(
-                    outputDirectory,
-                    "InvalidTestClassNameInput.java",
-                    "import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase;",
-                    "",
-                    "final class InvalidTestClassName implements RefasterRuleCollectionTestCase {}"))
-        .cause()
-        .isInstanceOf(VerifyException.class)
-        .hasMessage(
-            "Refaster rule collection test class name 'InvalidTestClassName' does not match '(.*)Test'");
-  }
-
-  @Test
-  void invalidFileName(@TempDir Path outputDirectory) {
-    assertThatThrownBy(
-            () ->
-                Compilation.compileWithDocumentationGenerator(
-                    outputDirectory,
-                    "InvalidFileNameTest.java",
-                    "import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase;",
-                    "",
-                    "final class InvalidFileNameTest implements RefasterRuleCollectionTestCase {}"))
-        .cause()
-        .isInstanceOf(VerifyException.class)
-        .hasMessage(
-            "Refaster rule collection test file name '/InvalidFileNameTest.java' does not match '.*(Input|Output)\\.java'");
-  }
-
-  @Test
-  void emptyRefasterRuleCollectionTestInput(@TempDir Path outputDirectory) {
-    Compilation.compileWithDocumentationGenerator(
-        outputDirectory,
-        "EmptyRefasterRuleCollectionTestInput.java",
-        "import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase;",
-        "",
-        "final class EmptyRefasterRuleCollectionTest implements RefasterRuleCollectionTestCase {}");
-
-    verifyGeneratedFileContent(
-        outputDirectory,
-        "EmptyRefasterRuleCollectionTestInput",
-        RefasterTestCases.create(
-            URI.create("file:///EmptyRefasterRuleCollectionTestInput.java"),
-            "EmptyRefasterRuleCollection",
-            /* isInput= */ true,
-            ImmutableList.of()));
-  }
-
-  @Test
-  void singletonRefasterRuleCollectionTestOutput(@TempDir Path outputDirectory) {
-    Compilation.compileWithDocumentationGenerator(
-        outputDirectory,
-        "SingletonRefasterRuleCollectionTestOutput.java",
-        "import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase;",
-        "",
-        "final class SingletonRefasterRuleCollectionTest implements RefasterRuleCollectionTestCase {",
-        "  int testMyRule() {",
-        "    return 42;",
-        "  }",
-        "}");
-
-    verifyGeneratedFileContent(
-        outputDirectory,
-        "SingletonRefasterRuleCollectionTestOutput",
-        RefasterTestCases.create(
-            URI.create("file:///SingletonRefasterRuleCollectionTestOutput.java"),
-            "SingletonRefasterRuleCollection",
-            /* isInput= */ false,
-            ImmutableList.of(
-                RefasterTestCase.create(
-                    "MyRule",
-                    """
-                    int testMyRule() {
-                      return 42;
-                    }"""))));
-  }
-
-  @Test
-  void complexRefasterRuleCollectionTestOutput(@TempDir Path outputDirectory) {
-    Compilation.compileWithDocumentationGenerator(
-        outputDirectory,
-        "pkg/ComplexRefasterRuleCollectionTestInput.java",
-        "package pkg;",
-        "",
-        "import com.google.common.collect.ImmutableSet;",
-        "import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase;",
-        "",
-        "final class ComplexRefasterRuleCollectionTest implements RefasterRuleCollectionTestCase {",
-        "  private static final String IGNORED_CONSTANT = \"constant\";",
-        "",
-        "  @Override",
-        "  public ImmutableSet<Object> elidedTypesAndStaticImports() {",
-        "    return ImmutableSet.of();",
-        "  }",
-        "",
-        "  /** Javadoc. */",
-        "  String testFirstRule() {",
-        "    return \"Don't panic\";",
-        "  }",
-        "",
-        "  // Comment.",
-        "  String testSecondRule() {",
-        "    return \"Carry a towel\";",
-        "  }",
-        "",
-        "  void testEmptyRule() {}",
-        "}");
-
-    verifyGeneratedFileContent(
-        outputDirectory,
-        "ComplexRefasterRuleCollectionTestInput",
-        RefasterTestCases.create(
-            URI.create("file:///pkg/ComplexRefasterRuleCollectionTestInput.java"),
-            "ComplexRefasterRuleCollection",
-            /* isInput= */ true,
-            ImmutableList.of(
-                RefasterTestCase.create(
-                    "FirstRule",
-                    """
-                    String testFirstRule() {
-                      return "Don't panic";
-                    }"""),
-                RefasterTestCase.create(
-                    "SecondRule",
-                    """
-                    String testSecondRule() {
-                      return "Carry a towel";
-                    }"""),
-                RefasterTestCase.create("EmptyRule", "void testEmptyRule() {}"))));
-  }
-
-  private static void verifyGeneratedFileContent(
-      Path outputDirectory, String testIdentifier, RefasterTestCases expected) {
-    assertThat(
-            outputDirectory.resolve(
-                String.format("refaster-rule-collection-test-%s.json", testIdentifier)))
-        .exists()
-        .returns(expected, path -> Json.read(path, RefasterTestCases.class));
-  }
-}
--- a/error-prone-contrib/pom.xml
+++ b/error-prone-contrib/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>tech.picnic.error-prone-support</groupId>
        <artifactId>error-prone-support</artifactId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.14.1-SNAPSHOT</version>
    </parent>

    <artifactId>error-prone-contrib</artifactId>
@@ -48,19 +48,10 @@
            `annotationProcessorPaths` configuration below. -->
            <scope>provided</scope>
        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>error-prone-utils</artifactId>
-        </dependency>
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>refaster-support</artifactId>
-            <!-- XXX: One would expect this to be a `provided` dependency (as
-            Refaster rules are interpreted by the `refaster-runner` module),
-            but the `OptionalOrElseGet` bug checker defined by this module
-            depends on the `RequiresComputation` matcher that
-            `refaster-support` primarily exposes for use by Refaster rules.
-            Review this setup. (Should the matchers be moved elsewhere?) -->
+            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>${project.groupId}</groupId>
@@ -72,11 +63,6 @@
            <artifactId>jackson-annotations</artifactId>
            <scope>provided</scope>
        </dependency>
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
-            <scope>provided</scope>
-        </dependency>
        <dependency>
            <groupId>com.google.auto.service</groupId>
            <artifactId>auto-service-annotations</artifactId>
@@ -88,13 +74,12 @@
            <scope>provided</scope>
        </dependency>
        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>provided</scope>
+            <groupId>com.google.googlejavaformat</groupId>
+            <artifactId>google-java-format</artifactId>
        </dependency>
        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-core</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -137,11 +122,6 @@
            <artifactId>jakarta.servlet-api</artifactId>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
        <dependency>
            <groupId>javax.inject</groupId>
            <artifactId>javax.inject</artifactId>
@@ -167,11 +147,6 @@
            <artifactId>value-annotations</artifactId>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>org.jooq</groupId>
-            <artifactId>jooq</artifactId>
-            <scope>test</scope>
-        </dependency>
        <dependency>
            <groupId>org.jspecify</groupId>
            <artifactId>jspecify</artifactId>
@@ -216,7 +191,7 @@
        </dependency>
        <dependency>
            <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-java-17</artifactId>
+            <artifactId>rewrite-java-11</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -264,11 +239,6 @@
            <artifactId>spring-boot-test</artifactId>
            <scope>provided</scope>
        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-            <scope>test</scope>
-        </dependency>
        <dependency>
            <groupId>org.testng</groupId>
            <artifactId>testng</artifactId>
@@ -304,58 +274,10 @@
                            </path>
                        </annotationProcessorPaths>
                        <compilerArgs combine.children="append">
+                            <arg>-Xplugin:RefasterRuleCompiler</arg>
                            <arg>-Xplugin:DocumentationGenerator -XoutputDirectory=${project.build.directory}/docs</arg>
                        </compilerArgs>
                    </configuration>
-                    <executions>
-                        <!-- The Refaster input/output test classes used by
-                        `RefasterRuleCollection` are modelled as classpath
-                        resources, and thus not subject to the default test
-                        compilation step. These two custom compilation steps
-                        serve two purposes:
-                        - To provide early feedback in case of syntax errors.
-                        - To enable the `DocumentationGenerator` compiler
-                        plugin to extract documentation metadata from them.
-                        Note that the input and output files must be compiled
-                        separately and to distinct output directories, as they
-                        define the same set of class names. -->
-                        <!-- XXX: Drop these executions if/when the Refaster
-                        test framework is reimplemented such that tests can be
-                        located alongside rules, rather than in two additional
-                        resource files. -->
-                        <execution>
-                            <id>compile-refaster-test-input</id>
-                            <goals>
-                                <goal>testCompile</goal>
-                            </goals>
-                            <phase>process-test-resources</phase>
-                            <configuration>
-                                <compileSourceRoots>
-                                    <compileSourceRoot>${project.basedir}/src/test/resources</compileSourceRoot>
-                                </compileSourceRoots>
-                                <testIncludes>
-                                    <testInclude>**/*Input.java</testInclude>
-                                </testIncludes>
-                                <outputDirectory>${project.build.directory}/refaster-test-input</outputDirectory>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>compile-refaster-test-output</id>
-                            <goals>
-                                <goal>testCompile</goal>
-                            </goals>
-                            <phase>process-test-resources</phase>
-                            <configuration>
-                                <compileSourceRoots>
-                                    <compileSourceRoot>${project.basedir}/src/test/resources</compileSourceRoot>
-                                </compileSourceRoots>
-                                <testIncludes>
-                                    <testInclude>**/*Output.java</testInclude>
-                                </testIncludes>
-                                <outputDirectory>${project.build.directory}/refaster-test-output</outputDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
                </plugin>
            </plugins>
        </pluginManagement>
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/AmbiguousJsonCreator.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/AmbiguousJsonCreator.java
@@ -4,7 +4,7 @@ import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.google.errorprone.BugPattern.StandardTags.LIKELY_ERROR;
 import static com.google.errorprone.matchers.Matchers.isType;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -18,7 +18,7 @@ import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.AnnotationTree;
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.Tree.Kind;
+import com.sun.source.tree.Tree;
 import com.sun.tools.javac.code.Symbol;
 import java.util.Map;
 import javax.lang.model.element.AnnotationValue;
@@ -46,7 +46,7 @@ public final class AmbiguousJsonCreator extends BugChecker implements Annotation
    }

    ClassTree clazz = state.findEnclosing(ClassTree.class);
-    if (clazz == null || clazz.getKind() != Kind.ENUM) {
+    if (clazz == null || clazz.getKind() != Tree.Kind.ENUM) {
      return Description.NO_MATCH;
    }

--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/AssertJIsNull.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/AssertJIsNull.java
@@ -8,7 +8,7 @@ import static com.google.errorprone.matchers.Matchers.argument;
 import static com.google.errorprone.matchers.Matchers.argumentCount;
 import static com.google.errorprone.matchers.Matchers.instanceMethod;
 import static com.google.errorprone.matchers.Matchers.nullLiteral;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
--- a/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/AssociativeMethodInvocation.java
+++ b/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/AssociativeMethodInvocation.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.guidelines.bugpatterns;
+package tech.picnic.errorprone.bugpatterns;

 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
@@ -7,7 +7,7 @@ import static com.google.errorprone.matchers.Matchers.allOf;
 import static com.google.errorprone.matchers.Matchers.not;
 import static com.google.errorprone.matchers.Matchers.staticMethod;
 import static com.google.errorprone.matchers.Matchers.toType;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableSet;
@@ -27,7 +27,7 @@ import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.tools.javac.code.Type;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags unnecessarily nested usage of methods that implement an
@@ -36,8 +36,6 @@ import tech.picnic.errorprone.utils.SourceCode;
 * <p>The arguments to such methods can be flattened without affecting semantics, while making the
 * code more readable.
 */
-// XXX: Move this check to the `error-prone-contrib` module once it also covers non-Error Prone
-// methods.
@AutoService(BugChecker.class)
@BugPattern(
    summary =
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/AutowiredConstructor.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/AutowiredConstructor.java
@@ -6,7 +6,7 @@ import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
 import static com.google.errorprone.matchers.ChildMultiMatcher.MatchType.AT_LEAST_ONE;
 import static com.google.errorprone.matchers.Matchers.annotations;
 import static com.google.errorprone.matchers.Matchers.isType;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.Iterables;
@@ -23,7 +23,7 @@ import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.MethodTree;
 import com.sun.source.tree.Tree;
 import java.util.List;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /** A {@link BugChecker} that flags redundant {@code @Autowired} constructor annotations. */
@AutoService(BugChecker.class)
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/CanonicalAnnotationSyntax.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/CanonicalAnnotationSyntax.java
@@ -3,7 +3,7 @@ package tech.picnic.errorprone.bugpatterns;
 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableSet;
@@ -19,13 +19,14 @@ import com.sun.source.tree.AnnotationTree;
 import com.sun.source.tree.AssignmentTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.NewArrayTree;
+import com.sun.source.tree.Tree.Kind;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /** A {@link BugChecker} that flags annotations that could be written more concisely. */
@AutoService(BugChecker.class)
@@ -118,7 +119,7 @@ public final class CanonicalAnnotationSyntax extends BugChecker implements Annot
       * the expression as a whole.
       */
      ExpressionTree value =
-          (arg instanceof AssignmentTree assignment) ? assignment.getExpression() : arg;
+          (arg.getKind() == Kind.ASSIGNMENT) ? ((AssignmentTree) arg).getExpression() : arg;

      /* Store a fix for each expression that was successfully simplified. */
      simplifyAttributeValue(value, state)
@@ -129,10 +130,13 @@ public final class CanonicalAnnotationSyntax extends BugChecker implements Annot
  }

  private static Optional<String> simplifyAttributeValue(ExpressionTree expr, VisitorState state) {
-    /* Drop curly braces or commas if possible. */
-    return expr instanceof NewArrayTree newArray
-        ? simplifySingletonArray(newArray, state).or(() -> dropTrailingComma(newArray, state))
-        : Optional.empty();
+    if (expr.getKind() != Kind.NEW_ARRAY) {
+      /* There are no curly braces or commas to be dropped here. */
+      return Optional.empty();
+    }
+
+    NewArrayTree array = (NewArrayTree) expr;
+    return simplifySingletonArray(array, state).or(() -> dropTrailingComma(array, state));
  }

  /** Returns the expression describing the array's sole element, if any. */
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/CanonicalClassNameUsage.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/CanonicalClassNameUsage.java
@@ -9,7 +9,7 @@ import static com.google.errorprone.matchers.Matchers.classLiteral;
 import static com.google.errorprone.matchers.Matchers.instanceMethod;
 import static com.google.errorprone.matchers.Matchers.receiverOfInvocation;
 import static com.google.errorprone.matchers.Matchers.toType;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -81,8 +81,9 @@ public final class CanonicalClassNameUsage extends BugChecker
      path = path.getParentPath();
    }

-    return path.getLeaf() instanceof MethodInvocationTree methodInvocation
-        && isOwnedByCanonicalNameUsingType(ASTHelpers.getSymbol(methodInvocation));
+    return path.getLeaf() instanceof MethodInvocationTree
+        && isOwnedByCanonicalNameUsingType(
+            ASTHelpers.getSymbol((MethodInvocationTree) path.getLeaf()));
  }

  private static boolean isOwnedByCanonicalNameUsingType(MethodSymbol symbol) {
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ClassCastLambdaUsage.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ClassCastLambdaUsage.java
@@ -1,76 +0,0 @@
-package tech.picnic.errorprone.bugpatterns;
-
-import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
-import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
-import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-
-import com.google.auto.service.AutoService;
-import com.google.common.collect.Iterables;
-import com.google.errorprone.BugPattern;
-import com.google.errorprone.VisitorState;
-import com.google.errorprone.bugpatterns.BugChecker;
-import com.google.errorprone.bugpatterns.BugChecker.LambdaExpressionTreeMatcher;
-import com.google.errorprone.fixes.SuggestedFix;
-import com.google.errorprone.matchers.Description;
-import com.google.errorprone.util.ASTHelpers;
-import com.sun.source.tree.LambdaExpressionTree;
-import com.sun.source.tree.TypeCastTree;
-import com.sun.source.tree.VariableTree;
-import com.sun.tools.javac.code.Type;
-import javax.lang.model.type.TypeKind;
-import tech.picnic.errorprone.utils.SourceCode;
-
-/**
- * A {@link BugChecker} that flags lambda expressions that can be replaced with a method reference
- * of the form {@code T.class::cast}.
- */
-// XXX: Consider folding this logic into the `MethodReferenceUsage` check of the
-// `error-prone-experimental` module.
-// XXX: This check and its tests are structurally nearly identical to `IsInstanceLambdaUsage`.
-// Unless folded into `MethodReferenceUsage`, consider merging the two.
-@AutoService(BugChecker.class)
-@BugPattern(
-    summary = "Prefer `Class::cast` method reference over equivalent lambda expression",
-    link = BUG_PATTERNS_BASE_URL + "ClassCastLambdaUsage",
-    linkType = CUSTOM,
-    severity = SUGGESTION,
-    tags = SIMPLIFICATION)
-public final class ClassCastLambdaUsage extends BugChecker implements LambdaExpressionTreeMatcher {
-  private static final long serialVersionUID = 1L;
-
-  /** Instantiates a new {@link ClassCastLambdaUsage} instance. */
-  public ClassCastLambdaUsage() {}
-
-  @Override
-  public Description matchLambdaExpression(LambdaExpressionTree tree, VisitorState state) {
-    if (tree.getParameters().size() != 1 || !(tree.getBody() instanceof TypeCastTree typeCast)) {
-      return Description.NO_MATCH;
-    }
-
-    Type type = ASTHelpers.getType(typeCast);
-    if (type == null
-        || type.isParameterized()
-        || type.isPrimitive()
-        || type.getKind() == TypeKind.TYPEVAR) {
-      /*
-       * The method reference syntax does not support casting to parameterized types, and type
-       * variables aren't supported either. Additionally, `Class#cast` does not support the same
-       * range of type conversions between (boxed) primitive types as the cast operator.
-       */
-      // XXX: Depending on the declared type of the value being cast, in some cases we _can_ rewrite
-      // primitive casts. Add support for this.
-      return Description.NO_MATCH;
-    }
-
-    VariableTree param = Iterables.getOnlyElement(tree.getParameters());
-    if (!ASTHelpers.getSymbol(param).equals(ASTHelpers.getSymbol(typeCast.getExpression()))) {
-      return Description.NO_MATCH;
-    }
-
-    return describeMatch(
-        tree,
-        SuggestedFix.replace(
-            tree, SourceCode.treeToString(typeCast.getType(), state) + ".class::cast"));
-  }
-}
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/CollectorMutability.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/CollectorMutability.java
@@ -4,7 +4,7 @@ import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.google.errorprone.BugPattern.StandardTags.FRAGILE_CODE;
 import static com.google.errorprone.matchers.method.MethodMatchers.staticMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
-import tech.picnic.errorprone.utils.ThirdPartyLibrary;
+import tech.picnic.errorprone.bugpatterns.util.ThirdPartyLibrary;

 /**
 * A {@link BugChecker} that flags {@link Collector Collectors} that don't clearly express
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ConstantNaming.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ConstantNaming.java
@@ -1,125 +0,0 @@
-package tech.picnic.errorprone.bugpatterns;
-
-import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
-import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
-import static com.google.errorprone.BugPattern.StandardTags.STYLE;
-import static com.google.errorprone.matchers.Matchers.allOf;
-import static com.google.errorprone.matchers.Matchers.hasModifier;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-
-import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-import com.google.errorprone.BugPattern;
-import com.google.errorprone.ErrorProneFlags;
-import com.google.errorprone.VisitorState;
-import com.google.errorprone.bugpatterns.BugChecker;
-import com.google.errorprone.bugpatterns.BugChecker.VariableTreeMatcher;
-import com.google.errorprone.fixes.SuggestedFixes;
-import com.google.errorprone.matchers.Description;
-import com.google.errorprone.matchers.Matcher;
-import com.google.errorprone.util.ASTHelpers;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.TreeScanner;
-import java.util.Locale;
-import java.util.regex.Pattern;
-import javax.inject.Inject;
-import javax.lang.model.element.Modifier;
-import org.jspecify.annotations.Nullable;
-import tech.picnic.errorprone.utils.Flags;
-
-/**
- * A {@link BugChecker} that flags static constants that do not follow the upper snake case naming
- * convention.
- */
-@AutoService(BugChecker.class)
-@BugPattern(
-    summary = "Constant variables should adhere to the `UPPER_SNAKE_CASE` naming convention",
-    link = BUG_PATTERNS_BASE_URL + "ConstantNaming",
-    linkType = CUSTOM,
-    severity = WARNING,
-    tags = STYLE)
-@SuppressWarnings("java:S2160" /* Super class equality definition suffices. */)
-public final class ConstantNaming extends BugChecker implements VariableTreeMatcher {
-  private static final long serialVersionUID = 1L;
-  private static final Matcher<VariableTree> IS_CONSTANT =
-      allOf(hasModifier(Modifier.STATIC), hasModifier(Modifier.FINAL));
-  private static final Matcher<VariableTree> IS_PRIVATE = hasModifier(Modifier.PRIVATE);
-  private static final Pattern SNAKE_CASE = Pattern.compile("([a-z])([A-Z])");
-  private static final ImmutableSet<String> DEFAULT_EXEMPTED_NAMES =
-      ImmutableSet.of("serialVersionUID");
-
-  /**
-   * Flag using which constant names that must not be flagged (in addition to those defined by
-   * {@link #DEFAULT_EXEMPTED_NAMES}) can be specified.
-   */
-  private static final String ADDITIONAL_EXEMPTED_NAMES_FLAG =
-      "CanonicalConstantNaming:ExemptedNames";
-
-  private final ImmutableSet<String> exemptedNames;
-
-  /** Instantiates a default {@link ConstantNaming} instance. */
-  public ConstantNaming() {
-    this(ErrorProneFlags.empty());
-  }
-
-  /**
-   * Instantiates a customized {@link ConstantNaming}.
-   *
-   * @param flags Any provided command line flags.
-   */
-  @Inject
-  ConstantNaming(ErrorProneFlags flags) {
-    exemptedNames =
-        Sets.union(DEFAULT_EXEMPTED_NAMES, Flags.getSet(flags, ADDITIONAL_EXEMPTED_NAMES_FLAG))
-            .immutableCopy();
-  }
-
-  @Override
-  public Description matchVariable(VariableTree tree, VisitorState state) {
-    String variableName = tree.getName().toString();
-    if (!IS_CONSTANT.matches(tree, state) || exemptedNames.contains(variableName)) {
-      return Description.NO_MATCH;
-    }
-
-    String replacement = toUpperSnakeCase(variableName);
-    if (replacement.equals(variableName)) {
-      return Description.NO_MATCH;
-    }
-
-    Description.Builder description = buildDescription(tree);
-    if (!IS_PRIVATE.matches(tree, state)) {
-      description.setMessage(
-          "%s; consider renaming to '%s', though note that this is not a private constant"
-              .formatted(message(), replacement));
-    } else if (isVariableNameInUse(replacement, state)) {
-      description.setMessage(
-          "%s; consider renaming to '%s', though note that a variable with this name is already declared"
-              .formatted(message(), replacement));
-    } else {
-      description.addFix(SuggestedFixes.renameVariable(tree, replacement, state));
-    }
-
-    return description.build();
-  }
-
-  private static String toUpperSnakeCase(String variableName) {
-    return SNAKE_CASE.matcher(variableName).replaceAll("$1_$2").toUpperCase(Locale.ROOT);
-  }
-
-  private static boolean isVariableNameInUse(String name, VisitorState state) {
-    return Boolean.TRUE.equals(
-        new TreeScanner<Boolean, @Nullable Void>() {
-          @Override
-          public Boolean visitVariable(VariableTree tree, @Nullable Void unused) {
-            return ASTHelpers.getSymbol(tree).getSimpleName().contentEquals(name)
-                || super.visitVariable(tree, null);
-          }
-
-          @Override
-          public Boolean reduce(Boolean r1, Boolean r2) {
-            return Boolean.TRUE.equals(r1) || Boolean.TRUE.equals(r2);
-          }
-        }.scan(state.getPath().getCompilationUnit(), null));
-  }
-}
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/DirectReturn.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/DirectReturn.java
@@ -11,7 +11,7 @@ import static com.google.errorprone.matchers.Matchers.not;
 import static com.google.errorprone.matchers.Matchers.returnStatement;
 import static com.google.errorprone.matchers.Matchers.staticMethod;
 import static com.google.errorprone.matchers.Matchers.toType;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.Streams;
@@ -39,8 +39,8 @@ import com.sun.tools.javac.code.Symbol;
 import java.util.List;
 import java.util.Optional;
 import org.jspecify.annotations.Nullable;
-import tech.picnic.errorprone.utils.MoreASTHelpers;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.MoreASTHelpers;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags unnecessary local variable assignments preceding a return
@@ -101,17 +101,19 @@ public final class DirectReturn extends BugChecker implements BlockTreeMatcher {
  }

  private static Optional<ExpressionTree> tryMatchAssignment(Symbol targetSymbol, Tree tree) {
-    if (tree instanceof ExpressionStatementTree expressionStatement) {
-      return tryMatchAssignment(targetSymbol, expressionStatement.getExpression());
+    if (tree instanceof ExpressionStatementTree) {
+      return tryMatchAssignment(targetSymbol, ((ExpressionStatementTree) tree).getExpression());
    }

-    if (tree instanceof AssignmentTree assignment) {
+    if (tree instanceof AssignmentTree) {
+      AssignmentTree assignment = (AssignmentTree) tree;
      return targetSymbol.equals(ASTHelpers.getSymbol(assignment.getVariable()))
          ? Optional.of(assignment.getExpression())
          : Optional.empty();
    }

-    if (tree instanceof VariableTree declaration) {
+    if (tree instanceof VariableTree) {
+      VariableTree declaration = (VariableTree) tree;
      return declaration.getModifiers().getAnnotations().isEmpty()
              && targetSymbol.equals(ASTHelpers.getSymbol(declaration))
          ? Optional.ofNullable(declaration.getInitializer())
@@ -149,11 +151,11 @@ public final class DirectReturn extends BugChecker implements BlockTreeMatcher {
            Streams.stream(state.getPath()).skip(1),
            Streams.stream(state.getPath()),
            (tree, child) -> {
-              if (!(tree instanceof TryTree tryTree)) {
+              if (!(tree instanceof TryTree)) {
                return null;
              }

-              BlockTree finallyBlock = tryTree.getFinallyBlock();
+              BlockTree finallyBlock = ((TryTree) tree).getFinallyBlock();
              return !child.equals(finallyBlock) ? finallyBlock : null;
            })
        .anyMatch(finallyBlock -> referencesIdentifierSymbol(symbol, finallyBlock));
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/EmptyMethod.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/EmptyMethod.java
@@ -7,7 +7,7 @@ import static com.google.errorprone.matchers.ChildMultiMatcher.MatchType.AT_LEAS
 import static com.google.errorprone.matchers.Matchers.annotations;
 import static com.google.errorprone.matchers.Matchers.anyOf;
 import static com.google.errorprone.matchers.Matchers.isType;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -21,7 +21,7 @@ import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.MethodTree;
 import com.sun.source.tree.Tree;
 import java.util.Optional;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /** A {@link BugChecker} that flags empty methods that seemingly can simply be deleted. */
@AutoService(BugChecker.class)
@@ -62,7 +62,7 @@ public final class EmptyMethod extends BugChecker implements MethodTreeMatcher {
  }

  private static boolean isInPossibleTestHelperClass(VisitorState state) {
-    return Optional.ofNullable(state.findEnclosing(ClassTree.class))
+    return Optional.ofNullable(ASTHelpers.findEnclosingNode(state.getPath(), ClassTree.class))
        .map(ClassTree::getSimpleName)
        .filter(name -> name.toString().contains("Test"))
        .isPresent();
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/EmptyMonoZip.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/EmptyMonoZip.java
@@ -1,89 +0,0 @@
-package tech.picnic.errorprone.bugpatterns;
-
-import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
-import static com.google.errorprone.BugPattern.SeverityLevel.ERROR;
-import static com.google.errorprone.BugPattern.StandardTags.LIKELY_ERROR;
-import static com.google.errorprone.matchers.Matchers.anyOf;
-import static com.google.errorprone.matchers.Matchers.instanceMethod;
-import static com.google.errorprone.matchers.Matchers.staticMethod;
-import static com.google.errorprone.matchers.Matchers.typePredicateMatcher;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-import static tech.picnic.errorprone.utils.MoreTypePredicates.isSubTypeOf;
-import static tech.picnic.errorprone.utils.MoreTypes.generic;
-import static tech.picnic.errorprone.utils.MoreTypes.type;
-
-import com.google.auto.service.AutoService;
-import com.google.errorprone.BugPattern;
-import com.google.errorprone.VisitorState;
-import com.google.errorprone.bugpatterns.BugChecker;
-import com.google.errorprone.bugpatterns.BugChecker.MethodInvocationTreeMatcher;
-import com.google.errorprone.matchers.Description;
-import com.google.errorprone.matchers.Matcher;
-import com.google.errorprone.suppliers.Supplier;
-import com.google.errorprone.suppliers.Suppliers;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.tools.javac.code.Type;
-import reactor.core.publisher.Mono;
-
-/**
- * A {@link BugChecker} that flags {@link Mono#zip} and {@link Mono#zipWith} invocations with a
- * {@code Mono<Void>} or {@link Mono#empty()} argument or receiver.
- *
- * <p>When a zipped reactive stream completes empty, then the other zipped streams will be cancelled
- * (or not subscribed to), and the operation as a whole will complete empty as well. This is
- * generally not what was intended.
- */
-// XXX: Generalize this check to also cover `Flux` zip operations.
-@AutoService(BugChecker.class)
-@BugPattern(
-    summary = "Don't pass a `Mono<Void>` or `Mono.empty()` argument to `Mono#{zip,With}`",
-    link = BUG_PATTERNS_BASE_URL + "EmptyMonoZip",
-    linkType = CUSTOM,
-    severity = ERROR,
-    tags = LIKELY_ERROR)
-public final class EmptyMonoZip extends BugChecker implements MethodInvocationTreeMatcher {
-  private static final long serialVersionUID = 1L;
-  private static final Supplier<Type> MONO =
-      Suppliers.typeFromString("reactor.core.publisher.Mono");
-  private static final Matcher<ExpressionTree> MONO_ZIP_OR_ZIP_WITH =
-      anyOf(
-          instanceMethod().onDescendantOf(MONO).named("zipWith"),
-          staticMethod().onClass(MONO).named("zip"));
-  private static final Matcher<ExpressionTree> EMPTY_MONO =
-      anyOf(
-          staticMethod().onDescendantOf(MONO).named("empty"),
-          typePredicateMatcher(isSubTypeOf(generic(MONO, type(Void.class.getCanonicalName())))));
-
-  /** Instantiates a new {@link EmptyMonoZip} instance. */
-  public EmptyMonoZip() {}
-
-  @Override
-  public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
-    if (!MONO_ZIP_OR_ZIP_WITH.matches(tree, state)) {
-      return Description.NO_MATCH;
-    }
-
-    if (hasEmptyReceiver(tree, state)) {
-      return buildDescription(tree)
-          .setMessage("Invoking `Mono#zipWith` on `Mono#empty()` or a `Mono<Void>` is a no-op")
-          .build();
-    }
-
-    if (hasEmptyArguments(tree, state)) {
-      return describeMatch(tree);
-    }
-
-    return Description.NO_MATCH;
-  }
-
-  private static boolean hasEmptyReceiver(MethodInvocationTree tree, VisitorState state) {
-    return tree.getMethodSelect() instanceof MemberSelectTree memberSelect
-        && EMPTY_MONO.matches(memberSelect.getExpression(), state);
-  }
-
-  private static boolean hasEmptyArguments(MethodInvocationTree tree, VisitorState state) {
-    return tree.getArguments().stream().anyMatch(arg -> EMPTY_MONO.matches(arg, state));
-  }
-}
--- a/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/ErrorProneRuntimeClasspath.java
+++ b/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/ErrorProneRuntimeClasspath.java
@@ -1,11 +1,11 @@
-package tech.picnic.errorprone.guidelines.bugpatterns;
+package tech.picnic.errorprone.bugpatterns;

 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.FRAGILE_CODE;
 import static com.google.errorprone.matchers.Matchers.instanceMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableSet;
@@ -26,9 +26,9 @@ import com.sun.source.tree.LiteralTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.ClassSymbol;
+import com.sun.tools.javac.util.Constants;
 import java.util.regex.Pattern;
-import tech.picnic.errorprone.utils.SourceCode;
-import tech.picnic.errorprone.utils.ThirdPartyLibrary;
+import tech.picnic.errorprone.bugpatterns.util.ThirdPartyLibrary;

 /**
 * A {@link BugChecker} that flags literal strings in Error Prone Support code that represent the
@@ -50,9 +50,8 @@ import tech.picnic.errorprone.utils.ThirdPartyLibrary;
@AutoService(BugChecker.class)
@BugPattern(
    summary =
-        """
-        Prefer `Class#getCanonicalName()` over an equivalent string literal if and only if the \
-        type will be on the runtime classpath""",
+        "Prefer `Class#getCanonicalName()` over an equivalent string literal if and only if the "
+            + "type will be on the runtime classpath",
    link = BUG_PATTERNS_BASE_URL + "ErrorProneRuntimeClasspath",
    linkType = CUSTOM,
    severity = SUGGESTION,
@@ -123,8 +122,7 @@ public final class ErrorProneRuntimeClasspath extends BugChecker
        .setMessage("This type may not be on the runtime classpath; use a string literal instead")
        .addFix(
            SuggestedFix.replace(
-                tree,
-                SourceCode.toStringConstantExpression(receiver.owner.getQualifiedName(), state)))
+                tree, Constants.format(receiver.owner.getQualifiedName().toString())))
        .build();
  }

@@ -151,9 +149,7 @@ public final class ErrorProneRuntimeClasspath extends BugChecker
            original,
            identifier
                + ".class.getCanonicalName()"
-                + (suffix.isEmpty()
-                    ? ""
-                    : (" + " + SourceCode.toStringConstantExpression(suffix, state))))
+                + (suffix.isEmpty() ? "" : (" + " + Constants.format(suffix))))
        .build();
  }

--- a/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/ErrorProneTestHelperSourceFormat.java
+++ b/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/ErrorProneTestHelperSourceFormat.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.guidelines.bugpatterns;
+package tech.picnic.errorprone.bugpatterns;

 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
@@ -7,7 +7,7 @@ import static com.google.errorprone.matchers.Matchers.anyOf;
 import static com.google.errorprone.matchers.Matchers.instanceMethod;
 import static com.google.errorprone.matchers.Matchers.staticMethod;
 import static java.util.stream.Collectors.joining;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.base.Splitter;
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ExplicitArgumentEnumeration.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ExplicitArgumentEnumeration.java
@@ -1,233 +0,0 @@
-package tech.picnic.errorprone.bugpatterns;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
-import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
-import static com.google.errorprone.BugPattern.StandardTags.PERFORMANCE;
-import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
-import static com.google.errorprone.matchers.Matchers.allOf;
-import static com.google.errorprone.matchers.Matchers.anyOf;
-import static com.google.errorprone.matchers.Matchers.instanceMethod;
-import static com.google.errorprone.matchers.Matchers.staticMethod;
-import static com.google.errorprone.matchers.Matchers.symbolMatcher;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-
-import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableCollection;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMultiset;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableTable;
-import com.google.errorprone.BugPattern;
-import com.google.errorprone.VisitorState;
-import com.google.errorprone.bugpatterns.BugChecker;
-import com.google.errorprone.bugpatterns.BugChecker.MethodInvocationTreeMatcher;
-import com.google.errorprone.fixes.SuggestedFix;
-import com.google.errorprone.fixes.SuggestedFixes;
-import com.google.errorprone.matchers.Description;
-import com.google.errorprone.matchers.Matcher;
-import com.google.errorprone.util.ASTHelpers;
-import com.google.errorprone.util.Visibility;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.tools.javac.code.Symbol.MethodSymbol;
-import com.sun.tools.javac.code.Symbol.VarSymbol;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import javax.lang.model.element.Element;
-import tech.picnic.errorprone.utils.SourceCode;
-
-/**
- * A {@link BugChecker} that flags single-argument method invocations with an iterable of explicitly
- * enumerated values, for which a semantically equivalent varargs variant (appears to) exists as
- * well.
- *
- * <p>This check drops selected {@link ImmutableSet#of} and {@link Set#of} invocations, with the
- * assumption that these operations do not deduplicate the collection of explicitly enumerated
- * values. It also drops {@link ImmutableMultiset#of} and {@link Set#of} invocations, with the
- * assumption that these do not materially impact iteration order.
- *
- * <p>This checker attempts to identify {@link Iterable}-accepting methods for which a varargs
- * overload exists, and suggests calling the varargs overload instead. This is an imperfect
- * heuristic, but it e.g. allows invocations of <a
- * href="https://immutables.github.io/immutable.html#copy-methods">Immutables-generated {@code
- * with*}</a> methods to be simplified.
- */
-@AutoService(BugChecker.class)
-@BugPattern(
-    summary = "Iterable creation can be avoided by using a varargs alternative method",
-    link = BUG_PATTERNS_BASE_URL + "ExplicitArgumentEnumeration",
-    linkType = CUSTOM,
-    severity = SUGGESTION,
-    tags = {PERFORMANCE, SIMPLIFICATION})
-public final class ExplicitArgumentEnumeration extends BugChecker
-    implements MethodInvocationTreeMatcher {
-  private static final long serialVersionUID = 1L;
-  private static final Matcher<ExpressionTree> EXPLICIT_ITERABLE_CREATOR =
-      anyOf(
-          staticMethod()
-              .onClassAny(
-                  ImmutableList.class.getCanonicalName(),
-                  ImmutableMultiset.class.getCanonicalName(),
-                  ImmutableSet.class.getCanonicalName(),
-                  List.class.getCanonicalName(),
-                  Set.class.getCanonicalName())
-              .named("of"),
-          allOf(
-              staticMethod()
-                  .onClassAny(
-                      ImmutableList.class.getCanonicalName(),
-                      ImmutableMultiset.class.getCanonicalName(),
-                      ImmutableSet.class.getCanonicalName())
-                  .named("copyOf"),
-              symbolMatcher(
-                  (symbol, state) ->
-                      state
-                          .getSymtab()
-                          .arrayClass
-                          .equals(((MethodSymbol) symbol).params().get(0).type.tsym))),
-          staticMethod().onClass(Arrays.class.getCanonicalName()).named("asList"));
-  private static final Matcher<ExpressionTree> IMMUTABLE_COLLECTION_BUILDER =
-      instanceMethod().onDescendantOf(ImmutableCollection.Builder.class.getCanonicalName());
-  private static final Matcher<ExpressionTree> OBJECT_ENUMERABLE_ASSERT =
-      instanceMethod().onDescendantOf("org.assertj.core.api.ObjectEnumerableAssert");
-  private static final Matcher<ExpressionTree> STEP_VERIFIER_STEP =
-      instanceMethod().onDescendantOf("reactor.test.StepVerifier.Step");
-  private static final ImmutableTable<Matcher<ExpressionTree>, String, String> ALTERNATIVE_METHODS =
-      ImmutableTable.<Matcher<ExpressionTree>, String, String>builder()
-          .put(IMMUTABLE_COLLECTION_BUILDER, "addAll", "add")
-          .put(OBJECT_ENUMERABLE_ASSERT, "containsAnyElementsOf", "containsAnyOf")
-          .put(OBJECT_ENUMERABLE_ASSERT, "containsAll", "contains")
-          .put(OBJECT_ENUMERABLE_ASSERT, "containsExactlyElementsOf", "containsExactly")
-          .put(
-              OBJECT_ENUMERABLE_ASSERT,
-              "containsExactlyInAnyOrderElementsOf",
-              "containsExactlyInAnyOrder")
-          .put(OBJECT_ENUMERABLE_ASSERT, "containsOnlyElementsOf", "containsOnly")
-          .put(OBJECT_ENUMERABLE_ASSERT, "containsOnlyOnceElementsOf", "containsOnlyOnce")
-          .put(OBJECT_ENUMERABLE_ASSERT, "doesNotContainAnyElementsOf", "doesNotContain")
-          .put(OBJECT_ENUMERABLE_ASSERT, "hasSameElementsAs", "containsOnly")
-          .put(STEP_VERIFIER_STEP, "expectNextSequence", "expectNext")
-          .build();
-
-  /** Instantiates a new {@link ExplicitArgumentEnumeration} instance. */
-  public ExplicitArgumentEnumeration() {}
-
-  @Override
-  public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
-    if (tree.getArguments().size() != 1) {
-      /* Performance optimization: non-unary method invocations cannot be simplified. */
-      return Description.NO_MATCH;
-    }
-
-    MethodSymbol method = ASTHelpers.getSymbol(tree);
-    if (!isUnaryIterableAcceptingMethod(method, state) || isLocalOverload(method, state)) {
-      /*
-       * This isn't a method invocation we can simplify, or it's an invocation of a local overload.
-       * The latter type of invocation we do not suggest replacing, as this is fairly likely to
-       * introduce an unbounded recursive call chain.
-       */
-      return Description.NO_MATCH;
-    }
-
-    ExpressionTree argument = tree.getArguments().get(0);
-    if (!EXPLICIT_ITERABLE_CREATOR.matches(argument, state)) {
-      return Description.NO_MATCH;
-    }
-
-    return trySuggestCallingVarargsOverload(method, (MethodInvocationTree) argument, state)
-        .or(() -> trySuggestCallingCustomAlternative(tree, (MethodInvocationTree) argument, state))
-        .map(fix -> describeMatch(tree, fix))
-        .orElse(Description.NO_MATCH);
-  }
-
-  private static boolean isUnaryIterableAcceptingMethod(MethodSymbol method, VisitorState state) {
-    List<VarSymbol> params = method.params();
-    return !method.isVarArgs()
-        && params.size() == 1
-        && ASTHelpers.isSubtype(params.get(0).type, state.getSymtab().iterableType, state);
-  }
-
-  private static boolean isLocalOverload(MethodSymbol calledMethod, VisitorState state) {
-    MethodTree enclosingMethod = state.findEnclosing(MethodTree.class);
-    if (enclosingMethod == null) {
-      return false;
-    }
-
-    MethodSymbol callingMethod = ASTHelpers.getSymbol(enclosingMethod);
-    return Objects.equals(callingMethod.getEnclosingElement(), calledMethod.getEnclosingElement())
-        && callingMethod.getSimpleName().equals(calledMethod.getSimpleName());
-  }
-
-  private static Optional<SuggestedFix> trySuggestCallingVarargsOverload(
-      MethodSymbol method, MethodInvocationTree argument, VisitorState state) {
-    /*
-     * Collect all overloads of the given method that we are sure to be able to call. Note that the
-     * `isAtLeastAsVisible` check is conservative heuristic.
-     */
-    ImmutableList<MethodSymbol> overloads =
-        ASTHelpers.matchingMethods(
-                method.getSimpleName(),
-                m -> isAtLeastAsVisible(m, method),
-                method.enclClass().type,
-                state.getTypes())
-            .collect(toImmutableList());
-
-    /*
-     * If all overloads have a single parameter, and at least one of them is a varargs method, then
-     * we assume that unwrapping the iterable argument will cause a suitable overload to be invoked.
-     * (Note that there may be multiple varargs overloads, either with different parameter types, or
-     * due to method overriding; this check does not attempt to determine which exact method or
-     * overload will be invoked as a result of the suggested simplification.)
-     *
-     * Note that this is a (highly!) imperfect heuristic, but it is sufficient to prevent e.g.
-     * unwrapping of arguments to `org.jooq.impl.DSL#row`, which can cause the expression's return
-     * type to change from `RowN` to (e.g.) `Row2`.
-     */
-    // XXX: There are certainly cases where it _would_ be nice to unwrap the arguments to
-    // `org.jooq.impl.DSL#row(Collection<?>)`. Look into this.
-    // XXX: Ideally we do check that one of the overloads accepts the unwrapped arguments.
-    // XXX: Ideally we validate that eligible overloads have compatible return types.
-    boolean hasLikelySuitableVarargsOverload =
-        overloads.stream().allMatch(m -> m.params().size() == 1)
-            && overloads.stream().anyMatch(MethodSymbol::isVarArgs);
-
-    return hasLikelySuitableVarargsOverload
-        ? Optional.of(SourceCode.unwrapMethodInvocation(argument, state))
-        : Optional.empty();
-  }
-
-  private static Optional<SuggestedFix> trySuggestCallingCustomAlternative(
-      MethodInvocationTree tree, MethodInvocationTree argument, VisitorState state) {
-    return ALTERNATIVE_METHODS.rowMap().entrySet().stream()
-        .filter(e -> e.getKey().matches(tree, state))
-        .findFirst()
-        .flatMap(e -> trySuggestCallingCustomAlternative(tree, argument, state, e.getValue()));
-  }
-
-  private static Optional<SuggestedFix> trySuggestCallingCustomAlternative(
-      MethodInvocationTree tree,
-      MethodInvocationTree argument,
-      VisitorState state,
-      Map<String, String> alternatives) {
-    return Optional.ofNullable(
-            alternatives.get(ASTHelpers.getSymbol(tree).getSimpleName().toString()))
-        .map(
-            replacement ->
-                SuggestedFix.builder()
-                    .merge(SuggestedFixes.renameMethodInvocation(tree, replacement, state))
-                    .merge(SourceCode.unwrapMethodInvocation(argument, state))
-                    .build());
-  }
-
-  private static boolean isAtLeastAsVisible(Element symbol, Element reference) {
-    return Visibility.fromModifiers(symbol.getModifiers())
-            .compareTo(Visibility.fromModifiers(reference.getModifiers()))
-        >= 0;
-  }
-}
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ExplicitEnumOrdering.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ExplicitEnumOrdering.java
@@ -7,7 +7,7 @@ import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.google.errorprone.BugPattern.StandardTags.FRAGILE_CODE;
 import static com.google.errorprone.matchers.method.MethodMatchers.staticMethod;
 import static java.util.stream.Collectors.collectingAndThen;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableSet;
@@ -72,7 +72,7 @@ public final class ExplicitEnumOrdering extends BugChecker implements MethodInvo
      List<? extends ExpressionTree> expressions) {
    return expressions.stream()
        .map(ASTHelpers::getSymbol)
-        .filter(s -> s != null && s.isEnum())
+        .filter(Symbol::isEnum)
        .collect(
            collectingAndThen(
                toImmutableSetMultimap(Symbol::asType, Symbol::toString),
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/FluxFlatMapUsage.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/FluxFlatMapUsage.java
@@ -4,11 +4,11 @@ import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.ERROR;
 import static com.google.errorprone.BugPattern.StandardTags.LIKELY_ERROR;
 import static com.google.errorprone.matchers.method.MethodMatchers.instanceMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-import static tech.picnic.errorprone.utils.MoreTypes.generic;
-import static tech.picnic.errorprone.utils.MoreTypes.subOf;
-import static tech.picnic.errorprone.utils.MoreTypes.type;
-import static tech.picnic.errorprone.utils.MoreTypes.unbound;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.generic;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.subOf;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.type;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.unbound;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.Iterables;
@@ -50,9 +50,8 @@ import reactor.core.publisher.Flux;
@AutoService(BugChecker.class)
@BugPattern(
    summary =
-        """
-        `Flux#flatMap` and `Flux#flatMapSequential` have subtle semantics; please use \
-        `Flux#concatMap` or explicitly specify the desired amount of concurrency""",
+        "`Flux#flatMap` and `Flux#flatMapSequential` have subtle semantics; "
+            + "please use `Flux#concatMap` or explicitly specify the desired amount of concurrency",
    link = BUG_PATTERNS_BASE_URL + "FluxFlatMapUsage",
    linkType = CUSTOM,
    severity = ERROR,
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/FluxImplicitBlock.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/FluxImplicitBlock.java
@@ -6,7 +6,7 @@ import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.google.errorprone.BugPattern.StandardTags.CONCURRENCY;
 import static com.google.errorprone.BugPattern.StandardTags.PERFORMANCE;
 import static com.google.errorprone.matchers.method.MethodMatchers.instanceMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;
@@ -27,7 +27,7 @@ import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.util.Position;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import tech.picnic.errorprone.utils.ThirdPartyLibrary;
+import tech.picnic.errorprone.bugpatterns.util.ThirdPartyLibrary;

 /**
 * A {@link BugChecker} that flags {@link reactor.core.publisher.Flux} operator usages that may
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/FormatStringConcatenation.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/FormatStringConcatenation.java
@@ -10,7 +10,7 @@ import static com.google.errorprone.matchers.Matchers.instanceMethod;
 import static com.google.errorprone.matchers.Matchers.not;
 import static com.google.errorprone.matchers.Matchers.staticMethod;
 import static java.util.stream.Collectors.joining;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.base.Preconditions;
@@ -36,8 +36,7 @@ import java.util.Formatter;
 import java.util.List;
 import java.util.Optional;
 import org.jspecify.annotations.Nullable;
-import tech.picnic.errorprone.utils.MoreASTHelpers;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags string concatenations that produce a format string; in such cases
@@ -204,10 +203,14 @@ public final class FormatStringConcatenation extends BugChecker

    ExpressionTree argument = ASTHelpers.stripParentheses(arguments.get(argPosition));
    return argument instanceof BinaryTree
-        && MoreASTHelpers.isStringTyped(argument, state)
+        && isStringTyped(argument, state)
        && ASTHelpers.constValue(argument, String.class) == null;
  }

+  private static boolean isStringTyped(ExpressionTree tree, VisitorState state) {
+    return ASTHelpers.isSameType(ASTHelpers.getType(tree), state.getSymtab().stringType, state);
+  }
+
  private static class ReplacementArgumentsConstructor
      extends SimpleTreeVisitor<@Nullable Void, VisitorState> {
    private final StringBuilder formatString = new StringBuilder();
@@ -220,7 +223,7 @@ public final class FormatStringConcatenation extends BugChecker

    @Override
    public @Nullable Void visitBinary(BinaryTree tree, VisitorState state) {
-      if (tree.getKind() == Kind.PLUS && MoreASTHelpers.isStringTyped(tree, state)) {
+      if (tree.getKind() == Kind.PLUS && isStringTyped(tree, state)) {
        tree.getLeftOperand().accept(this, state);
        tree.getRightOperand().accept(this, state);
      } else {
@@ -242,8 +245,8 @@ public final class FormatStringConcatenation extends BugChecker
    }

    private void appendExpression(Tree tree) {
-      if (tree instanceof LiteralTree literal) {
-        formatString.append(literal.getValue());
+      if (tree instanceof LiteralTree) {
+        formatString.append(((LiteralTree) tree).getValue());
      } else {
        formatString.append(formatSpecifier);
        formatArguments.add(tree);
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/IdentityConversion.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/IdentityConversion.java
@@ -7,7 +7,7 @@ import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
 import static com.google.errorprone.matchers.Matchers.anyOf;
 import static com.google.errorprone.matchers.Matchers.staticMethod;
 import static com.google.errorprone.suppliers.Suppliers.OBJECT_TYPE;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableBiMap;
@@ -39,10 +39,9 @@ import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Types;
-import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /** A {@link BugChecker} that flags redundant identity conversions. */
 // XXX: Consider detecting cases where a flagged expression is passed to a method, and where removal
@@ -52,7 +51,6 @@ import tech.picnic.errorprone.utils.SourceCode;
 // is effectively the identity operation.
 // XXX: Also flag nullary instance method invocations that represent an identity conversion, such as
 // `Boolean#booleanValue()`, `Byte#byteValue()` and friends.
-// XXX: Also flag redundant round-trip conversions such as `path.toFile().toPath()`.
@AutoService(BugChecker.class)
@BugPattern(
    summary = "Avoid or clarify identity conversions",
@@ -85,7 +83,6 @@ public final class IdentityConversion extends BugChecker implements MethodInvoca
                  ImmutableSetMultimap.class.getCanonicalName(),
                  ImmutableTable.class.getCanonicalName())
              .named("copyOf"),
-          staticMethod().onClass(Instant.class.getCanonicalName()).namedAnyOf("from"),
          staticMethod().onClass(Matchers.class.getCanonicalName()).namedAnyOf("allOf", "anyOf"),
          staticMethod().onClass("reactor.adapter.rxjava.RxJava2Adapter"),
          staticMethod()
@@ -127,9 +124,8 @@ public final class IdentityConversion extends BugChecker implements MethodInvoca

    return buildDescription(tree)
        .setMessage(
-            """
-            This method invocation appears redundant; remove it or suppress this warning and add a \
-            comment explaining its purpose""")
+            "This method invocation appears redundant; remove it or suppress this warning and "
+                + "add a comment explaining its purpose")
        .addFix(SuggestedFix.replace(tree, SourceCode.treeToString(sourceTree, state)))
        .addFix(SuggestedFixes.addSuppressWarnings(state, canonicalName()))
        .build();
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ImmutablesSortedSetComparator.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ImmutablesSortedSetComparator.java
@@ -11,7 +11,7 @@ import static com.google.errorprone.matchers.Matchers.hasModifier;
 import static com.google.errorprone.matchers.Matchers.isSubtypeOf;
 import static com.google.errorprone.matchers.Matchers.methodReturns;
 import static com.google.errorprone.matchers.Matchers.not;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -43,9 +43,8 @@ import javax.lang.model.element.Modifier;
@AutoService(BugChecker.class)
@BugPattern(
    summary =
-        """
-        `SortedSet` properties of a `@Value.Immutable` or `@Value.Modifiable` type must be \
-        annotated with `@Value.NaturalOrder` or `@Value.ReverseOrder`""",
+        "`SortedSet` properties of a `@Value.Immutable` or `@Value.Modifiable` type must be "
+            + "annotated with `@Value.NaturalOrder` or `@Value.ReverseOrder`",
    link = BUG_PATTERNS_BASE_URL + "ImmutablesSortedSetComparator",
    linkType = CUSTOM,
    severity = ERROR,
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/IsInstanceLambdaUsage.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/IsInstanceLambdaUsage.java
@@ -3,7 +3,7 @@ package tech.picnic.errorprone.bugpatterns;
 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.Iterables;
@@ -16,17 +16,17 @@ import com.google.errorprone.matchers.Description;
 import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.InstanceOfTree;
 import com.sun.source.tree.LambdaExpressionTree;
+import com.sun.source.tree.Tree.Kind;
 import com.sun.source.tree.VariableTree;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags lambda expressions that can be replaced with a method reference
 * of the form {@code T.class::isInstance}.
+ *
+ * @see MethodReferenceUsage
 */
-// XXX: Consider folding this logic into the `MethodReferenceUsage` check of the
-// `error-prone-experimental` module.
-// XXX: This check and its tests are structurally nearly identical to `ClassCastLambdaUsage`. Unless
-// folded into `MethodReferenceUsage`, consider merging the two.
+// XXX: Consider folding this logic into the `MethodReferenceUsage` check.
@AutoService(BugChecker.class)
@BugPattern(
    summary = "Prefer `Class::isInstance` method reference over equivalent lambda expression",
@@ -42,12 +42,12 @@ public final class IsInstanceLambdaUsage extends BugChecker implements LambdaExp

  @Override
  public Description matchLambdaExpression(LambdaExpressionTree tree, VisitorState state) {
-    if (tree.getParameters().size() != 1
-        || !(tree.getBody() instanceof InstanceOfTree instanceOf)) {
+    if (tree.getParameters().size() != 1 || tree.getBody().getKind() != Kind.INSTANCE_OF) {
      return Description.NO_MATCH;
    }

    VariableTree param = Iterables.getOnlyElement(tree.getParameters());
+    InstanceOfTree instanceOf = (InstanceOfTree) tree.getBody();
    if (!ASTHelpers.getSymbol(param).equals(ASTHelpers.getSymbol(instanceOf.getExpression()))) {
      return Description.NO_MATCH;
    }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitClassModifiers.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitClassModifiers.java
@@ -11,12 +11,12 @@ import static com.google.errorprone.matchers.Matchers.hasMethod;
 import static com.google.errorprone.matchers.Matchers.hasModifier;
 import static com.google.errorprone.matchers.Matchers.isType;
 import static com.google.errorprone.matchers.Matchers.not;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-import static tech.picnic.errorprone.utils.MoreJUnitMatchers.TEST_METHOD;
-import static tech.picnic.errorprone.utils.MoreMatchers.hasMetaAnnotation;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.MoreJUnitMatchers.TEST_METHOD;
+import static tech.picnic.errorprone.bugpatterns.util.MoreMatchers.hasMetaAnnotation;

 import com.google.auto.service.AutoService;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker;
@@ -70,7 +70,7 @@ public final class JUnitClassModifiers extends BugChecker implements ClassTreeMa
    SuggestedFixes.removeModifiers(
            tree.getModifiers(),
            state,
-            Sets.immutableEnumSet(Modifier.PRIVATE, Modifier.PROTECTED, Modifier.PUBLIC))
+            ImmutableSet.of(Modifier.PRIVATE, Modifier.PROTECTED, Modifier.PUBLIC))
        .ifPresent(fixBuilder::merge);

    if (!HAS_SPRING_CONFIGURATION_ANNOTATION.matches(tree, state)) {
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitMethodDeclaration.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitMethodDeclaration.java
@@ -8,9 +8,9 @@ import static com.google.errorprone.matchers.Matchers.enclosingClass;
 import static com.google.errorprone.matchers.Matchers.hasModifier;
 import static com.google.errorprone.matchers.Matchers.not;
 import static java.util.function.Predicate.not;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-import static tech.picnic.errorprone.utils.MoreJUnitMatchers.SETUP_OR_TEARDOWN_METHOD;
-import static tech.picnic.errorprone.utils.MoreJUnitMatchers.TEST_METHOD;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.MoreJUnitMatchers.SETUP_OR_TEARDOWN_METHOD;
+import static tech.picnic.errorprone.bugpatterns.util.MoreJUnitMatchers.TEST_METHOD;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableSet;
@@ -28,7 +28,7 @@ import com.sun.source.tree.MethodTree;
 import com.sun.tools.javac.code.Symbol.MethodSymbol;
 import java.util.Optional;
 import javax.lang.model.element.Modifier;
-import tech.picnic.errorprone.utils.ConflictDetection;
+import tech.picnic.errorprone.bugpatterns.util.ConflictDetection;

 /** A {@link BugChecker} that flags non-canonical JUnit method declarations. */
 // XXX: Consider introducing a class-level check that enforces that test classes:
@@ -101,8 +101,6 @@ public final class JUnitMethodDeclaration extends BugChecker implements MethodTr
            .build());
  }

-  // XXX: Consider dropping leading underscores that otherwise result when canonicalizing
-  // `test_some_method_name`.
  private static Optional<String> tryCanonicalizeMethodName(MethodSymbol symbol) {
    return Optional.of(symbol.getQualifiedName().toString())
        .filter(name -> name.startsWith(TEST_PREFIX))
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitNullaryParameterizedTestDeclaration.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitNullaryParameterizedTestDeclaration.java
@@ -7,8 +7,8 @@ import static com.google.errorprone.matchers.ChildMultiMatcher.MatchType.AT_LEAS
 import static com.google.errorprone.matchers.Matchers.annotations;
 import static com.google.errorprone.matchers.Matchers.anyOf;
 import static com.google.errorprone.matchers.Matchers.isType;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-import static tech.picnic.errorprone.utils.MoreMatchers.hasMetaAnnotation;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.MoreMatchers.hasMetaAnnotation;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -23,7 +23,7 @@ import com.google.errorprone.matchers.MultiMatcher;
 import com.google.errorprone.matchers.MultiMatcher.MultiMatchResult;
 import com.sun.source.tree.AnnotationTree;
 import com.sun.source.tree.MethodTree;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags nullary {@link
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitValueSource.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitValueSource.java
@@ -19,9 +19,9 @@ import static com.google.errorprone.matchers.Matchers.staticMethod;
 import static com.google.errorprone.matchers.Matchers.toType;
 import static java.util.function.Predicate.not;
 import static java.util.stream.Collectors.joining;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-import static tech.picnic.errorprone.utils.MoreJUnitMatchers.HAS_METHOD_SOURCE;
-import static tech.picnic.errorprone.utils.MoreJUnitMatchers.getMethodSourceFactoryNames;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.MoreJUnitMatchers.HAS_METHOD_SOURCE;
+import static tech.picnic.errorprone.bugpatterns.util.MoreJUnitMatchers.getMethodSourceFactoryNames;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;
@@ -58,7 +58,7 @@ import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
 import org.jspecify.annotations.Nullable;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags JUnit tests with a {@link
@@ -232,7 +232,7 @@ public final class JUnitValueSource extends BugChecker implements MethodTreeMatc
      @Override
      public @Nullable Void visitReturn(ReturnTree node, @Nullable Void unused) {
        returnExpressions.add(node.getExpression());
-        return super.visitReturn(node, null);
+        return super.visitReturn(node, unused);
      }

      @Override
@@ -265,8 +265,8 @@ public final class JUnitValueSource extends BugChecker implements MethodTreeMatc
            arguments.stream()
                .map(
                    arg ->
-                        arg instanceof MethodInvocationTree methodInvocation
-                            ? Iterables.getOnlyElement(methodInvocation.getArguments())
+                        arg instanceof MethodInvocationTree
+                            ? Iterables.getOnlyElement(((MethodInvocationTree) arg).getArguments())
                            : arg)
                .map(argument -> SourceCode.treeToString(argument, state))
                .collect(joining(", ")))
@@ -276,12 +276,16 @@ public final class JUnitValueSource extends BugChecker implements MethodTreeMatc
  private static String toValueSourceAttributeName(Type type) {
    String typeString = type.tsym.name.toString();

-    return switch (typeString) {
-      case "Class" -> "classes";
-      case "Character" -> "chars";
-      case "Integer" -> "ints";
-      default -> typeString.toLowerCase(Locale.ROOT) + 's';
-    };
+    switch (typeString) {
+      case "Class":
+        return "classes";
+      case "Character":
+        return "chars";
+      case "Integer":
+        return "ints";
+      default:
+        return typeString.toLowerCase(Locale.ROOT) + 's';
+    }
  }

  private static <T> Optional<T> getElementIfSingleton(Collection<T> collection) {
@@ -293,10 +297,11 @@ public final class JUnitValueSource extends BugChecker implements MethodTreeMatc
  private static Matcher<ExpressionTree> isSingleDimensionArrayCreationWithAllElementsMatching(
      Matcher<? super ExpressionTree> elementMatcher) {
    return (tree, state) -> {
-      if (!(tree instanceof NewArrayTree newArray)) {
+      if (!(tree instanceof NewArrayTree)) {
        return false;
      }

+      NewArrayTree newArray = (NewArrayTree) tree;
      return newArray.getDimensions().isEmpty()
          && !newArray.getInitializers().isEmpty()
          && newArray.getInitializers().stream()
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java
@@ -7,14 +7,13 @@ import static com.google.errorprone.BugPattern.StandardTags.STYLE;
 import static java.util.Comparator.comparing;
 import static java.util.Comparator.naturalOrder;
 import static java.util.stream.Collectors.joining;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Comparators;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
@@ -32,17 +31,20 @@ import com.sun.source.tree.LiteralTree;
 import com.sun.source.tree.NewArrayTree;
 import com.sun.source.tree.PrimitiveTypeTree;
 import com.sun.source.tree.Tree;
+import com.sun.source.tree.Tree.Kind;
 import com.sun.source.util.TreeScanner;
 import com.sun.tools.javac.code.Symtab;
 import com.sun.tools.javac.code.Type;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 import javax.inject.Inject;
 import org.jspecify.annotations.Nullable;
-import tech.picnic.errorprone.utils.AnnotationAttributeMatcher;
-import tech.picnic.errorprone.utils.Flags;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.AnnotationAttributeMatcher;
+import tech.picnic.errorprone.bugpatterns.util.Flags;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags annotation array listings which aren't sorted lexicographically.
@@ -50,9 +52,6 @@ import tech.picnic.errorprone.utils.SourceCode;
 * <p>The idea behind this checker is that maintaining a sorted sequence simplifies conflict
 * resolution, and can even avoid it if two branches add the same entry.
 */
-// XXX: In some places we declare a `@SuppressWarnings` annotation with a final value of
-// `key-to-resolve-AnnotationUseStyle-and-TrailingComment-check-conflict`. That entry must stay
-// last. Consider adding (generic?) support for such cases.
@AutoService(BugChecker.class)
@BugPattern(
    summary = "Where possible, sort annotation array attributes lexicographically",
@@ -66,15 +65,14 @@ public final class LexicographicalAnnotationAttributeListing extends BugChecker
  private static final long serialVersionUID = 1L;
  private static final ImmutableSet<String> BLACKLISTED_ANNOTATIONS =
      ImmutableSet.of(
-          // XXX: Unless `JsonPropertyOrder#alphabetic` is true...
+          // XXX: unless JsonPropertyOrder#alphabetic is true...
          "com.fasterxml.jackson.annotation.JsonPropertyOrder#value",
          "io.swagger.annotations.ApiImplicitParams#value",
          "io.swagger.v3.oas.annotations.Parameters#value",
          "javax.xml.bind.annotation.XmlType#propOrder",
          "org.springframework.context.annotation.PropertySource#value",
          "org.springframework.test.context.TestPropertySource#locations",
-          "org.springframework.test.context.TestPropertySource#value",
-          "picocli.CommandLine.Option#names");
+          "org.springframework.test.context.TestPropertySource#value");
  private static final String FLAG_PREFIX = "LexicographicalAnnotationAttributeListing:";
  private static final String INCLUDED_ANNOTATIONS_FLAG = FLAG_PREFIX + "Includes";
  private static final String EXCLUDED_ANNOTATIONS_FLAG = FLAG_PREFIX + "Excludes";
@@ -124,9 +122,13 @@ public final class LexicographicalAnnotationAttributeListing extends BugChecker
  }

  private static Optional<NewArrayTree> extractArray(ExpressionTree expr) {
-    return expr instanceof AssignmentTree assignment
-        ? extractArray(assignment.getExpression())
-        : Optional.of(expr).filter(NewArrayTree.class::isInstance).map(NewArrayTree.class::cast);
+    if (expr.getKind() == Kind.ASSIGNMENT) {
+      return extractArray(((AssignmentTree) expr).getExpression());
+    }
+
+    return Optional.of(expr)
+        .filter(e -> e.getKind() == Kind.NEW_ARRAY)
+        .map(NewArrayTree.class::cast);
  }

  private static Optional<SuggestedFix.Builder> suggestSorting(
@@ -162,12 +164,7 @@ public final class LexicographicalAnnotationAttributeListing extends BugChecker

    /* For now we don't force sorting on numeric types. */
    return Stream.of(
-            symtab.annotationType,
-            symtab.booleanType,
-            symtab.charType,
-            symtab.classType,
-            symtab.enumSym.type,
-            symtab.stringType)
+            symtab.annotationType, symtab.classType, symtab.enumSym.type, symtab.stringType)
        .anyMatch(t -> ASTHelpers.isSubtype(elemType, t, state));
  }

@@ -196,24 +193,24 @@ public final class LexicographicalAnnotationAttributeListing extends BugChecker
      @Override
      public @Nullable Void visitIdentifier(IdentifierTree node, @Nullable Void unused) {
        nodes.add(ImmutableList.of(node.getName().toString()));
-        return super.visitIdentifier(node, null);
+        return super.visitIdentifier(node, unused);
      }

      @Override
      public @Nullable Void visitLiteral(LiteralTree node, @Nullable Void unused) {
        Object value = ASTHelpers.constValue(node);
        nodes.add(
-            value instanceof String str
-                ? STRING_ARGUMENT_SPLITTER.splitToStream(str).collect(toImmutableList())
+            value instanceof String
+                ? STRING_ARGUMENT_SPLITTER.splitToStream((String) value).collect(toImmutableList())
                : ImmutableList.of(String.valueOf(value)));

-        return super.visitLiteral(node, null);
+        return super.visitLiteral(node, unused);
      }

      @Override
      public @Nullable Void visitPrimitiveType(PrimitiveTypeTree node, @Nullable Void unused) {
        nodes.add(ImmutableList.of(node.getPrimitiveTypeKind().toString()));
-        return super.visitPrimitiveType(node, null);
+        return super.visitPrimitiveType(node, unused);
      }
    }.scan(array, null);

@@ -229,8 +226,10 @@ public final class LexicographicalAnnotationAttributeListing extends BugChecker
        excludedAnnotations(flags));
  }

-  private static ImmutableSet<String> excludedAnnotations(ErrorProneFlags flags) {
-    return Sets.union(BLACKLISTED_ANNOTATIONS, Flags.getSet(flags, EXCLUDED_ANNOTATIONS_FLAG))
-        .immutableCopy();
+  private static ImmutableList<String> excludedAnnotations(ErrorProneFlags flags) {
+    Set<String> exclusions = new HashSet<>();
+    exclusions.addAll(Flags.getList(flags, EXCLUDED_ANNOTATIONS_FLAG));
+    exclusions.addAll(BLACKLISTED_ANNOTATIONS);
+    return ImmutableList.copyOf(exclusions);
  }
 }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationListing.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationListing.java
@@ -7,7 +7,7 @@ import static com.google.errorprone.BugPattern.StandardTags.STYLE;
 import static com.sun.tools.javac.code.TypeAnnotations.AnnotationType.DECLARATION;
 import static com.sun.tools.javac.code.TypeAnnotations.AnnotationType.TYPE;
 import static java.util.Comparator.comparing;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.base.VerifyException;
@@ -28,7 +28,7 @@ import com.sun.tools.javac.code.TypeAnnotations.AnnotationType;
 import java.util.Comparator;
 import java.util.List;
 import org.jspecify.annotations.Nullable;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags annotations that are not lexicographically sorted.
@@ -36,10 +36,6 @@ import tech.picnic.errorprone.utils.SourceCode;
 * <p>The idea behind this checker is that maintaining a sorted sequence simplifies conflict
 * resolution, and can even avoid it if two branches add the same annotation.
 */
-// XXX: Currently this checker only flags method-level annotations. It should likely also flag
-// type-, field- and parameter-level annotations.
-// XXX: Duplicate entries are often a mistake. Consider introducing a similar `BugChecker` that
-// flags duplicates.
@AutoService(BugChecker.class)
@BugPattern(
    summary = "Sort annotations lexicographically where possible",
--- a/error-prone-experimental/src/main/java/tech/picnic/errorprone/experimental/bugpatterns/MethodReferenceUsage.java
+++ b/error-prone-experimental/src/main/java/tech/picnic/errorprone/experimental/bugpatterns/MethodReferenceUsage.java
@@ -1,10 +1,10 @@
-package tech.picnic.errorprone.experimental.bugpatterns;
+package tech.picnic.errorprone.bugpatterns;

 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.STYLE;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.base.VerifyException;
@@ -27,6 +27,7 @@ import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.ParenthesizedTree;
 import com.sun.source.tree.ReturnTree;
 import com.sun.source.tree.Tree;
+import com.sun.source.tree.Tree.Kind;
 import com.sun.source.tree.VariableTree;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
@@ -36,6 +37,8 @@ import javax.lang.model.element.Name;

 /**
 * A {@link BugChecker} that flags lambda expressions that can be replaced with method references.
+ *
+ * @see IsInstanceLambdaUsage
 */
 // XXX: Other custom expressions we could rewrite:
 // - `a -> "str" + a` to `"str"::concat`. But only if `str` is provably non-null.
@@ -51,8 +54,7 @@ import javax.lang.model.element.Name;
 // Palantir's `LambdaMethodReference` check seems to suffer a similar issue at this time.
 // XXX: Expressions of the form `i -> SomeType.class.isInstance(i)` are not replaced; fix that using
 // a suitable generalization.
-// XXX: Consider folding the `IsInstanceLambdaUsage` check of the `error-prone-contrib` module into
-// this class.
+// XXX: Consider folding the `IsInstanceLambdaUsage` check into this class.
@AutoService(BugChecker.class)
@BugPattern(
    summary = "Prefer method references over lambda expressions",
@@ -83,19 +85,22 @@ public final class MethodReferenceUsage extends BugChecker implements LambdaExpr
        .orElse(Description.NO_MATCH);
  }

-  // XXX: Use switch pattern matching once the targeted JDK supports this.
  private static Optional<SuggestedFix.Builder> constructMethodRef(
      LambdaExpressionTree lambdaExpr, Tree subTree) {
-    return switch (subTree.getKind()) {
-      case BLOCK -> constructMethodRef(lambdaExpr, (BlockTree) subTree);
-      case EXPRESSION_STATEMENT ->
-          constructMethodRef(lambdaExpr, ((ExpressionStatementTree) subTree).getExpression());
-      case METHOD_INVOCATION -> constructMethodRef(lambdaExpr, (MethodInvocationTree) subTree);
-      case PARENTHESIZED ->
-          constructMethodRef(lambdaExpr, ((ParenthesizedTree) subTree).getExpression());
-      case RETURN -> constructMethodRef(lambdaExpr, ((ReturnTree) subTree).getExpression());
-      default -> Optional.empty();
-    };
+    switch (subTree.getKind()) {
+      case BLOCK:
+        return constructMethodRef(lambdaExpr, (BlockTree) subTree);
+      case EXPRESSION_STATEMENT:
+        return constructMethodRef(lambdaExpr, ((ExpressionStatementTree) subTree).getExpression());
+      case METHOD_INVOCATION:
+        return constructMethodRef(lambdaExpr, (MethodInvocationTree) subTree);
+      case PARENTHESIZED:
+        return constructMethodRef(lambdaExpr, ((ParenthesizedTree) subTree).getExpression());
+      case RETURN:
+        return constructMethodRef(lambdaExpr, ((ReturnTree) subTree).getExpression());
+      default:
+        return Optional.empty();
+    }
  }

  private static Optional<SuggestedFix.Builder> constructMethodRef(
@@ -113,35 +118,33 @@ public final class MethodReferenceUsage extends BugChecker implements LambdaExpr
        .flatMap(expectedInstance -> constructMethodRef(lambdaExpr, subTree, expectedInstance));
  }

-  // XXX: Review whether to use switch pattern matching once the targeted JDK supports this.
+  @SuppressWarnings(
+      "java:S1151" /* Extracting `IDENTIFIER` case block to separate method does not improve readability. */)
  private static Optional<SuggestedFix.Builder> constructMethodRef(
      LambdaExpressionTree lambdaExpr,
      MethodInvocationTree subTree,
      Optional<Name> expectedInstance) {
    ExpressionTree methodSelect = subTree.getMethodSelect();
-
-    if (methodSelect instanceof IdentifierTree) {
-      if (expectedInstance.isPresent()) {
-        /* Direct method call; there is no matching "implicit parameter". */
-        return Optional.empty();
-      }
-
-      Symbol sym = ASTHelpers.getSymbol(methodSelect);
-      return ASTHelpers.isStatic(sym)
-          ? constructFix(lambdaExpr, sym.owner, methodSelect)
-          : constructFix(lambdaExpr, "this", methodSelect);
+    switch (methodSelect.getKind()) {
+      case IDENTIFIER:
+        if (expectedInstance.isPresent()) {
+          /* Direct method call; there is no matching "implicit parameter". */
+          return Optional.empty();
+        }
+        Symbol sym = ASTHelpers.getSymbol(methodSelect);
+        return ASTHelpers.isStatic(sym)
+            ? constructFix(lambdaExpr, sym.owner, methodSelect)
+            : constructFix(lambdaExpr, "this", methodSelect);
+      case MEMBER_SELECT:
+        return constructMethodRef(lambdaExpr, (MemberSelectTree) methodSelect, expectedInstance);
+      default:
+        throw new VerifyException("Unexpected type of expression: " + methodSelect.getKind());
    }
-
-    if (methodSelect instanceof MemberSelectTree memberSelect) {
-      return constructMethodRef(lambdaExpr, memberSelect, expectedInstance);
-    }
-
-    throw new VerifyException("Unexpected type of expression: " + methodSelect.getKind());
  }

  private static Optional<SuggestedFix.Builder> constructMethodRef(
      LambdaExpressionTree lambdaExpr, MemberSelectTree subTree, Optional<Name> expectedInstance) {
-    if (!(subTree.getExpression() instanceof IdentifierTree identifier)) {
+    if (subTree.getExpression().getKind() != Kind.IDENTIFIER) {
      // XXX: Could be parenthesized. Handle. Also in other classes.
      /*
       * Only suggest a replacement if the method select's expression provably doesn't have
@@ -150,12 +153,12 @@ public final class MethodReferenceUsage extends BugChecker implements LambdaExpr
      return Optional.empty();
    }

-    Name lhs = identifier.getName();
+    Name lhs = ((IdentifierTree) subTree.getExpression()).getName();
    if (expectedInstance.isEmpty()) {
      return constructFix(lambdaExpr, lhs, subTree.getIdentifier());
    }

-    Type lhsType = ASTHelpers.getType(identifier);
+    Type lhsType = ASTHelpers.getType(subTree.getExpression());
    if (lhsType == null || !expectedInstance.orElseThrow().equals(lhs)) {
      return Optional.empty();
    }
@@ -180,8 +183,8 @@ public final class MethodReferenceUsage extends BugChecker implements LambdaExpr

    for (int i = 0; i < args.size(); i++) {
      ExpressionTree arg = args.get(i);
-      if (!(arg instanceof IdentifierTree identifier)
-          || !identifier.getName().equals(expectedArguments.get(i + diff))) {
+      if (arg.getKind() != Kind.IDENTIFIER
+          || !((IdentifierTree) arg).getName().equals(expectedArguments.get(i + diff))) {
        return Optional.empty();
      }
    }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/MockitoMockClassReference.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/MockitoMockClassReference.java
@@ -9,7 +9,7 @@ import static com.google.errorprone.matchers.Matchers.isSameType;
 import static com.google.errorprone.matchers.Matchers.isVariable;
 import static com.google.errorprone.matchers.Matchers.not;
 import static com.google.errorprone.matchers.Matchers.staticMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -25,7 +25,7 @@ import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.Tree;
 import com.sun.source.tree.VariableTree;
 import java.util.List;
-import tech.picnic.errorprone.utils.MoreASTHelpers;
+import tech.picnic.errorprone.bugpatterns.util.MoreASTHelpers;

 /**
 * A {@link BugChecker} that flags the use of {@link org.mockito.Mockito#mock(Class)} and {@link
@@ -67,19 +67,20 @@ public final class MockitoMockClassReference extends BugChecker
    return describeMatch(tree, SuggestedFixes.removeElement(arguments.get(0), arguments, state));
  }

-  // XXX: Use switch pattern matching once the targeted JDK supports this.
  private static boolean isTypeDerivableFromContext(MethodInvocationTree tree, VisitorState state) {
    Tree parent = state.getPath().getParentPath().getLeaf();
-    return switch (parent.getKind()) {
-      case VARIABLE ->
-          !ASTHelpers.hasImplicitType((VariableTree) parent, state)
-              && MoreASTHelpers.areSameType(tree, parent, state);
-      case ASSIGNMENT -> MoreASTHelpers.areSameType(tree, parent, state);
-      case RETURN ->
-          MoreASTHelpers.findMethodExitedOnReturn(state)
-              .filter(m -> MoreASTHelpers.areSameType(tree, m.getReturnType(), state))
-              .isPresent();
-      default -> false;
-    };
+    switch (parent.getKind()) {
+      case VARIABLE:
+        return !ASTHelpers.hasImplicitType((VariableTree) parent, state)
+            && MoreASTHelpers.areSameType(tree, parent, state);
+      case ASSIGNMENT:
+        return MoreASTHelpers.areSameType(tree, parent, state);
+      case RETURN:
+        return MoreASTHelpers.findMethodExitedOnReturn(state)
+            .filter(m -> MoreASTHelpers.areSameType(tree, m.getReturnType(), state))
+            .isPresent();
+      default:
+        return false;
+    }
  }
 }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/MockitoStubbing.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/MockitoStubbing.java
@@ -4,7 +4,7 @@ import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
 import static com.google.errorprone.matchers.Matchers.staticMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.Iterables;
@@ -18,7 +18,7 @@ import com.google.errorprone.matchers.Matcher;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.MethodInvocationTree;
 import java.util.List;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags method invocations for which all arguments are wrapped using
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/MongoDBTextFilterUsage.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/MongoDBTextFilterUsage.java
@@ -4,7 +4,7 @@ import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.PERFORMANCE;
 import static com.google.errorprone.matchers.method.MethodMatchers.staticMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -24,9 +24,7 @@ import com.sun.source.tree.MethodInvocationTree;
@AutoService(BugChecker.class)
@BugPattern(
    summary =
-        """
-        Avoid MongoDB's `$text` filter operator, as it can trigger heavy queries and even cause \
-        the server to run out of memory""",
+        "Avoid MongoDB's `$text` filter operator, as it can trigger heavy queries and even cause the server to run out of memory",
    link = BUG_PATTERNS_BASE_URL + "MongoDBTextFilterUsage",
    linkType = CUSTOM,
    severity = SUGGESTION,
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NestedOptionals.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NestedOptionals.java
@@ -3,11 +3,11 @@ package tech.picnic.errorprone.bugpatterns;
 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.google.errorprone.BugPattern.StandardTags.FRAGILE_CODE;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-import static tech.picnic.errorprone.utils.MoreMatchers.isSubTypeOf;
-import static tech.picnic.errorprone.utils.MoreTypes.generic;
-import static tech.picnic.errorprone.utils.MoreTypes.raw;
-import static tech.picnic.errorprone.utils.MoreTypes.subOf;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.MoreMatchers.isSubTypeOf;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.generic;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.raw;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.subOf;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NestedPublishers.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NestedPublishers.java
@@ -6,13 +6,13 @@ import static com.google.errorprone.BugPattern.StandardTags.FRAGILE_CODE;
 import static com.google.errorprone.matchers.Matchers.typePredicateMatcher;
 import static com.google.errorprone.predicates.TypePredicates.allOf;
 import static com.google.errorprone.predicates.TypePredicates.not;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-import static tech.picnic.errorprone.utils.MoreTypePredicates.hasTypeParameter;
-import static tech.picnic.errorprone.utils.MoreTypePredicates.isSubTypeOf;
-import static tech.picnic.errorprone.utils.MoreTypes.generic;
-import static tech.picnic.errorprone.utils.MoreTypes.raw;
-import static tech.picnic.errorprone.utils.MoreTypes.subOf;
-import static tech.picnic.errorprone.utils.MoreTypes.type;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypePredicates.hasTypeParameter;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypePredicates.isSubTypeOf;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.generic;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.raw;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.subOf;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.type;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -34,9 +34,8 @@ import com.sun.tools.javac.code.Type;
@AutoService(BugChecker.class)
@BugPattern(
    summary =
-        """
-        Avoid `Publisher`s that emit other `Publishers`s; the resultant code is hard to reason \
-        about""",
+        "Avoid `Publisher`s that emit other `Publishers`s; "
+            + "the resultant code is hard to reason about",
    link = BUG_PATTERNS_BASE_URL + "NestedPublishers",
    linkType = CUSTOM,
    severity = WARNING,
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NonEmptyMono.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NonEmptyMono.java
@@ -5,7 +5,7 @@ import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
 import static com.google.errorprone.matchers.Matchers.anyOf;
 import static com.google.errorprone.matchers.Matchers.instanceMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -20,7 +20,7 @@ import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.MethodInvocationTree;
 import java.util.function.BiFunction;
 import reactor.core.publisher.Mono;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags {@link Mono} operations that are known to be vacuous, given that
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NonStaticImport.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NonStaticImport.java
@@ -4,7 +4,7 @@ import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.STYLE;
 import static tech.picnic.errorprone.bugpatterns.StaticImport.STATIC_IMPORT_CANDIDATE_MEMBERS;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.auto.value.AutoValue;
@@ -33,10 +33,9 @@ import java.time.Clock;
 import java.time.ZoneOffset;
 import java.util.Collections;
 import java.util.Locale;
-import java.util.Optional;
 import java.util.regex.Pattern;
 import org.jspecify.annotations.Nullable;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags static imports of type members that should *not* be statically
@@ -72,9 +71,7 @@ public final class NonStaticImport extends BugChecker implements CompilationUnit
          Strings.class.getCanonicalName(),
          VisitorState.class.getCanonicalName(),
          ZoneOffset.class.getCanonicalName(),
-          "com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode",
-          "reactor.core.publisher.Flux",
-          "reactor.core.publisher.Mono");
+          "com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode");

  /**
   * Type members that should never be statically imported.
@@ -106,7 +103,6 @@ public final class NonStaticImport extends BugChecker implements CompilationUnit
              "sort",
              "swap")
          .put(Locale.class.getCanonicalName(), "ROOT")
-          .put(Optional.class.getCanonicalName(), "empty")
          .putAll(Pattern.class.getCanonicalName(), "compile", "matches", "quote")
          .put(Predicates.class.getCanonicalName(), "contains")
          .put("org.springframework.http.MediaType", "ALL")
@@ -129,6 +125,7 @@ public final class NonStaticImport extends BugChecker implements CompilationUnit
          "builder",
          "copyOf",
          "create",
+          "empty",
          "from",
          "getDefaultInstance",
          "INSTANCE",
@@ -139,8 +136,10 @@ public final class NonStaticImport extends BugChecker implements CompilationUnit
          "newBuilder",
          "newInstance",
          "of",
+          "ONE",
          "parse",
-          "valueOf");
+          "valueOf",
+          "ZERO");

  /** Instantiates a new {@link NonStaticImport} instance. */
  public NonStaticImport() {}
@@ -169,9 +168,10 @@ public final class NonStaticImport extends BugChecker implements CompilationUnit
        ImmutableTable.builder();
    for (ImportTree importTree : tree.getImports()) {
      Tree qualifiedIdentifier = importTree.getQualifiedIdentifier();
-      if (importTree.isStatic() && qualifiedIdentifier instanceof MemberSelectTree memberSelect) {
-        String type = SourceCode.treeToString(memberSelect.getExpression(), state);
-        String member = memberSelect.getIdentifier().toString();
+      if (importTree.isStatic() && qualifiedIdentifier instanceof MemberSelectTree) {
+        MemberSelectTree memberSelectTree = (MemberSelectTree) qualifiedIdentifier;
+        String type = SourceCode.treeToString(memberSelectTree.getExpression(), state);
+        String member = memberSelectTree.getIdentifier().toString();
        if (shouldNotBeStaticallyImported(type, member)) {
          imports.put(
              type,
@@ -210,7 +210,7 @@ public final class NonStaticImport extends BugChecker implements CompilationUnit
          }
        }

-        return super.visitIdentifier(node, null);
+        return super.visitIdentifier(node, unused);
      }
    }.scan(tree, null);
  }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/OptionalOrElseGet.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/OptionalOrElseGet.java
@@ -1,123 +0,0 @@
-package tech.picnic.errorprone.bugpatterns;
-
-import static com.google.errorprone.BugPattern.LinkType.NONE;
-import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
-import static com.google.errorprone.BugPattern.StandardTags.PERFORMANCE;
-import static com.google.errorprone.matchers.Matchers.instanceMethod;
-import static com.google.errorprone.matchers.Matchers.staticMethod;
-import static java.util.stream.Collectors.joining;
-
-import com.google.auto.service.AutoService;
-import com.google.common.collect.Iterables;
-import com.google.errorprone.BugPattern;
-import com.google.errorprone.VisitorState;
-import com.google.errorprone.bugpatterns.BugChecker;
-import com.google.errorprone.bugpatterns.BugChecker.MethodInvocationTreeMatcher;
-import com.google.errorprone.fixes.SuggestedFix;
-import com.google.errorprone.fixes.SuggestedFixes;
-import com.google.errorprone.matchers.Description;
-import com.google.errorprone.matchers.Matcher;
-import com.google.errorprone.refaster.Refaster;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import java.util.Optional;
-import java.util.function.Supplier;
-import tech.picnic.errorprone.refaster.matchers.RequiresComputation;
-import tech.picnic.errorprone.utils.SourceCode;
-
-/**
- * A {@link BugChecker} that flags arguments to {@link Optional#orElse(Object)} that should be
- * deferred using {@link Optional#orElseGet(Supplier)}.
- *
- * <p>The suggested fix assumes that the argument to {@code orElse} does not have side effects. If
- * it does, the suggested fix changes the program's semantics. Such fragile code must instead be
- * refactored such that the side-effectful code does not appear accidental.
- */
-// XXX: This rule may introduce a compilation error: the `value` expression may reference a
-// non-effectively final variable, which is not allowed in the replacement lambda expression.
-// Review whether a `@Matcher` can be used to avoid this.
-// XXX: Once the `MethodReferenceUsageCheck` bug checker becomes generally usable, consider leaving
-// the method reference cleanup to that check, and express the remainder of the logic in this class
-// using a Refaster template, i.c.w. a `@NotMatches(RequiresComputation.class)` constraint.
-@AutoService(BugChecker.class)
-@BugPattern(
-    summary =
-        """
-        Prefer `Optional#orElseGet` over `Optional#orElse` if the fallback requires additional \
-        computation""",
-    linkType = NONE,
-    severity = WARNING,
-    tags = PERFORMANCE)
-public final class OptionalOrElseGet extends BugChecker implements MethodInvocationTreeMatcher {
-  private static final long serialVersionUID = 1L;
-  private static final Matcher<ExpressionTree> REQUIRES_COMPUTATION = new RequiresComputation();
-  private static final Matcher<ExpressionTree> OPTIONAL_OR_ELSE_METHOD =
-      instanceMethod().onExactClass(Optional.class.getCanonicalName()).namedAnyOf("orElse");
-  // XXX: Also exclude invocations of `@Placeholder`-annotated methods.
-  private static final Matcher<ExpressionTree> REFASTER_METHOD =
-      staticMethod().onClass(Refaster.class.getCanonicalName());
-
-  /** Instantiates a new {@link OptionalOrElseGet} instance. */
-  public OptionalOrElseGet() {}
-
-  @Override
-  public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
-    if (!OPTIONAL_OR_ELSE_METHOD.matches(tree, state)) {
-      return Description.NO_MATCH;
-    }
-
-    ExpressionTree argument = Iterables.getOnlyElement(tree.getArguments());
-    if (!REQUIRES_COMPUTATION.matches(argument, state)
-        || REFASTER_METHOD.matches(argument, state)) {
-      return Description.NO_MATCH;
-    }
-
-    /*
-     * We have a match. Construct the method reference or lambda expression to be passed to the
-     * replacement `#orElseGet` invocation.
-     */
-    String newArgument =
-        tryMethodReferenceConversion(argument, state)
-            .orElseGet(() -> "() -> " + SourceCode.treeToString(argument, state));
-
-    /* Construct the suggested fix, replacing the method invocation and its argument. */
-    SuggestedFix fix =
-        SuggestedFix.builder()
-            .merge(SuggestedFixes.renameMethodInvocation(tree, "orElseGet", state))
-            .replace(argument, newArgument)
-            .build();
-
-    return describeMatch(tree, fix);
-  }
-
-  /** Returns the nullary method reference matching the given expression, if any. */
-  private static Optional<String> tryMethodReferenceConversion(
-      ExpressionTree tree, VisitorState state) {
-    if (!(tree instanceof MethodInvocationTree methodInvocation)) {
-      return Optional.empty();
-    }
-
-    if (!methodInvocation.getArguments().isEmpty()) {
-      return Optional.empty();
-    }
-
-    if (!(methodInvocation.getMethodSelect() instanceof MemberSelectTree memberSelect)) {
-      return Optional.empty();
-    }
-
-    if (REQUIRES_COMPUTATION.matches(memberSelect.getExpression(), state)) {
-      return Optional.empty();
-    }
-
-    return Optional.of(
-        SourceCode.treeToString(memberSelect.getExpression(), state)
-            + "::"
-            + (methodInvocation.getTypeArguments().isEmpty()
-                ? ""
-                : methodInvocation.getTypeArguments().stream()
-                    .map(arg -> SourceCode.treeToString(arg, state))
-                    .collect(joining(",", "<", ">")))
-            + memberSelect.getIdentifier());
-  }
-}
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/PrimitiveComparison.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/PrimitiveComparison.java
@@ -7,7 +7,7 @@ import static com.google.errorprone.matchers.Matchers.anyOf;
 import static com.google.errorprone.matchers.method.MethodMatchers.instanceMethod;
 import static com.google.errorprone.matchers.method.MethodMatchers.staticMethod;
 import static java.util.stream.Collectors.joining;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.base.VerifyException;
@@ -22,7 +22,6 @@ import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Matcher;
 import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.IdentifierTree;
 import com.sun.source.tree.LambdaExpressionTree;
 import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.MethodInvocationTree;
@@ -34,7 +33,7 @@ import java.util.Comparator;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Stream;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags {@code Comparator#comparing*} invocations that can be replaced
@@ -45,9 +44,8 @@ import tech.picnic.errorprone.utils.SourceCode;
@AutoService(BugChecker.class)
@BugPattern(
    summary =
-        """
-        Ensure invocations of `Comparator#comparing{,Double,Int,Long}` match the return type of \
-        the provided function""",
+        "Ensure invocations of `Comparator#comparing{,Double,Int,Long}` match the return type"
+            + " of the provided function",
    link = BUG_PATTERNS_BASE_URL + "PrimitiveComparison",
    linkType = CUSTOM,
    severity = WARNING,
@@ -149,44 +147,38 @@ public final class PrimitiveComparison extends BugChecker implements MethodInvoc
    return isStatic ? "comparing" : "thenComparing";
  }

-  // XXX: Use switch pattern matching once the targeted JDK supports this.
  private static Optional<Type> getPotentiallyBoxedReturnType(ExpressionTree tree) {
-    if (tree instanceof LambdaExpressionTree lambdaExpression) {
-      /* Return the lambda expression's actual return type. */
-      return Optional.ofNullable(ASTHelpers.getType(lambdaExpression.getBody()));
+    switch (tree.getKind()) {
+      case LAMBDA_EXPRESSION:
+        /* Return the lambda expression's actual return type. */
+        return Optional.ofNullable(ASTHelpers.getType(((LambdaExpressionTree) tree).getBody()));
+      case MEMBER_REFERENCE:
+        /* Return the method's declared return type. */
+        // XXX: Very fragile. Do better.
+        Type subType2 = ((JCMemberReference) tree).referentType;
+        return Optional.of(subType2.getReturnType());
+      default:
+        /* This appears to be a genuine `{,ToInt,ToLong,ToDouble}Function`. */
+        return Optional.empty();
    }
-
-    // XXX: The match against a concrete type and reference to one of its fields is fragile. Do
-    // better.
-    if (tree instanceof JCMemberReference memberReference) {
-      /* Return the method's declared return type. */
-      Type subType = memberReference.referentType;
-      return Optional.of(subType.getReturnType());
-    }
-
-    /* This appears to be a genuine `{,ToInt,ToLong,ToDouble}Function`. */
-    return Optional.empty();
  }

-  // XXX: Use switch pattern matching once the targeted JDK supports this.
  private static Fix suggestFix(
      MethodInvocationTree tree, String preferredMethodName, VisitorState state) {
    ExpressionTree expr = tree.getMethodSelect();
-
-    if (expr instanceof IdentifierTree) {
-      SuggestedFix.Builder fix = SuggestedFix.builder();
-      String replacement =
-          SuggestedFixes.qualifyStaticImport(
-              Comparator.class.getCanonicalName() + '.' + preferredMethodName, fix, state);
-      return fix.replace(expr, replacement).build();
+    switch (expr.getKind()) {
+      case IDENTIFIER:
+        SuggestedFix.Builder fix = SuggestedFix.builder();
+        String replacement =
+            SuggestedFixes.qualifyStaticImport(
+                Comparator.class.getCanonicalName() + '.' + preferredMethodName, fix, state);
+        return fix.replace(expr, replacement).build();
+      case MEMBER_SELECT:
+        MemberSelectTree ms = (MemberSelectTree) tree.getMethodSelect();
+        return SuggestedFix.replace(
+            ms, SourceCode.treeToString(ms.getExpression(), state) + '.' + preferredMethodName);
+      default:
+        throw new VerifyException("Unexpected type of expression: " + expr.getKind());
    }
-
-    if (expr instanceof MemberSelectTree memberSelect) {
-      return SuggestedFix.replace(
-          memberSelect,
-          SourceCode.treeToString(memberSelect.getExpression(), state) + '.' + preferredMethodName);
-    }
-
-    throw new VerifyException("Unexpected type of expression: " + expr.getKind());
  }
 }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/RedundantStringConversion.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/RedundantStringConversion.java
@@ -15,7 +15,7 @@ import static com.google.errorprone.matchers.Matchers.isSubtypeOf;
 import static com.google.errorprone.matchers.Matchers.not;
 import static com.google.errorprone.matchers.method.MethodMatchers.instanceMethod;
 import static com.google.errorprone.matchers.method.MethodMatchers.staticMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.base.Preconditions;
@@ -53,9 +53,9 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
 import javax.inject.Inject;
-import tech.picnic.errorprone.utils.Flags;
-import tech.picnic.errorprone.utils.MethodMatcherFactory;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.Flags;
+import tech.picnic.errorprone.bugpatterns.util.MethodMatcherFactory;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /** A {@link BugChecker} that flags redundant explicit string conversions. */
@AutoService(BugChecker.class)
@@ -147,6 +147,9 @@ public final class RedundantStringConversion extends BugChecker
      instanceMethod()
          .onDescendantOf("org.slf4j.Logger")
          .namedAnyOf("trace", "debug", "info", "warn", "error");
+  // XXX: Also add support for:
+  // org.springframework.web.util.UriBuilder#queryParam(String name, Object... values)
+  // org.springframework.web.util.UriBuilder#replaceQueryParam(String name, Object... values)

  private final Matcher<MethodInvocationTree> conversionMethodMatcher;

@@ -331,32 +334,36 @@ public final class RedundantStringConversion extends BugChecker
  }

  private Optional<ExpressionTree> trySimplify(ExpressionTree tree, VisitorState state) {
-    if (!(tree instanceof MethodInvocationTree methodInvocation)) {
+    if (tree.getKind() != Kind.METHOD_INVOCATION) {
      return Optional.empty();
    }

+    MethodInvocationTree methodInvocation = (MethodInvocationTree) tree;
    if (!conversionMethodMatcher.matches(methodInvocation, state)) {
      return Optional.empty();
    }

-    return switch (methodInvocation.getArguments().size()) {
-      case 0 -> trySimplifyNullaryMethod(methodInvocation, state);
-      case 1 -> trySimplifyUnaryMethod(methodInvocation, state);
-      default ->
-          throw new IllegalStateException(
-              "Cannot simplify method call with two or more arguments: "
-                  + SourceCode.treeToString(tree, state));
-    };
+    switch (methodInvocation.getArguments().size()) {
+      case 0:
+        return trySimplifyNullaryMethod(methodInvocation, state);
+      case 1:
+        return trySimplifyUnaryMethod(methodInvocation, state);
+      default:
+        throw new IllegalStateException(
+            "Cannot simplify method call with two or more arguments: "
+                + SourceCode.treeToString(tree, state));
+    }
  }

  private static Optional<ExpressionTree> trySimplifyNullaryMethod(
      MethodInvocationTree methodInvocation, VisitorState state) {
-    if (!instanceMethod().matches(methodInvocation, state)
-        || !(methodInvocation.getMethodSelect() instanceof MemberSelectTree memberSelect)) {
+    if (!instanceMethod().matches(methodInvocation, state)) {
      return Optional.empty();
    }

-    return Optional.of(memberSelect.getExpression())
+    return Optional.of(methodInvocation.getMethodSelect())
+        .filter(methodSelect -> methodSelect.getKind() == Kind.MEMBER_SELECT)
+        .map(methodSelect -> ((MemberSelectTree) methodSelect).getExpression())
        .filter(expr -> !"super".equals(SourceCode.treeToString(expr, state)));
  }

@@ -378,11 +385,11 @@ public final class RedundantStringConversion extends BugChecker

  private static Matcher<MethodInvocationTree> createConversionMethodMatcher(
      ErrorProneFlags flags) {
-    // XXX: `Flags#getSet` splits by comma, but method signatures may also contain commas. For this
-    // class methods accepting more than one argument are not valid, but still: not nice.
+    // XXX: ErrorProneFlags#getList splits by comma, but method signatures may also contain commas.
+    // For this class methods accepting more than one argument are not valid, but still: not nice.
    return anyOf(
        WELL_KNOWN_STRING_CONVERSION_METHODS,
        new MethodMatcherFactory()
-            .create(Flags.getSet(flags, EXTRA_STRING_CONVERSION_METHODS_FLAG)));
+            .create(Flags.getList(flags, EXTRA_STRING_CONVERSION_METHODS_FLAG)));
  }
 }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/RedundantStringEscape.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/RedundantStringEscape.java
@@ -1,95 +0,0 @@
-package tech.picnic.errorprone.bugpatterns;
-
-import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
-import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
-import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-
-import com.google.auto.service.AutoService;
-import com.google.errorprone.BugPattern;
-import com.google.errorprone.VisitorState;
-import com.google.errorprone.bugpatterns.BugChecker;
-import com.google.errorprone.bugpatterns.BugChecker.LiteralTreeMatcher;
-import com.google.errorprone.fixes.SuggestedFix;
-import com.google.errorprone.matchers.Description;
-import com.google.errorprone.util.ASTHelpers;
-import com.sun.source.tree.LiteralTree;
-import tech.picnic.errorprone.utils.SourceCode;
-
-/** A {@link BugChecker} that flags string constants with extraneous escaping. */
-// XXX: Also cover `\"` sequences inside text blocks. Note that this requires a more subtle
-// approach, as double-quote characters will need to remain escaped if removing the backslash would
-// create a new sequence of three or more double-quotes. (TBD whether we'd like to enforce a
-// "preferred" approach to escaping, e.g. by always escaping the last of a triplet, such that the
-// over-all number of escaped characters is minimized.)
-// XXX: Also flag `'\"'` char literals.
-@AutoService(BugChecker.class)
-@BugPattern(
-    summary = "Inside string expressions single quotes do not need to be escaped",
-    link = BUG_PATTERNS_BASE_URL + "RedundantStringEscape",
-    linkType = CUSTOM,
-    severity = SUGGESTION,
-    tags = SIMPLIFICATION)
-public final class RedundantStringEscape extends BugChecker implements LiteralTreeMatcher {
-  private static final long serialVersionUID = 1L;
-
-  /** Instantiates a new {@link RedundantStringEscape} instance. */
-  public RedundantStringEscape() {}
-
-  @Override
-  public Description matchLiteral(LiteralTree tree, VisitorState state) {
-    String constant = ASTHelpers.constValue(tree, String.class);
-    if (constant == null || constant.indexOf('\'') < 0) {
-      /* Fast path: this isn't a string constant with a single quote. */
-      return Description.NO_MATCH;
-    }
-
-    String source = SourceCode.treeToString(tree, state);
-    if (!containsBannedEscapeSequence(source)) {
-      /* Semi-fast path: this expression doesn't contain an escaped single quote. */
-      return Description.NO_MATCH;
-    }
-
-    /* Slow path: suggest dropping the escape characters. */
-    return describeMatch(tree, SuggestedFix.replace(tree, dropRedundantEscapeSequences(source)));
-  }
-
-  /**
-   * Tells whether the given string constant source expression contains an escaped single quote.
-   *
-   * @implNote As the input is a literal Java string expression, it will start and end with a double
-   *     quote; as such any found backslash will not be the string's final character.
-   */
-  private static boolean containsBannedEscapeSequence(String source) {
-    for (int p = source.indexOf('\\'); p != -1; p = source.indexOf('\\', p + 2)) {
-      if (source.charAt(p + 1) == '\'') {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Simplifies the given string constant source expression by dropping the backslash preceding an
-   * escaped single quote.
-   *
-   * @implNote Note that this method does not delegate to {@link
-   *     SourceCode#toStringConstantExpression}, as that operation may replace other Unicode
-   *     characters with their associated escape sequence.
-   * @implNote As the input is a literal Java string expression, it will start and end with a double
-   *     quote; as such any found backslash will not be the string's final character.
-   */
-  private static String dropRedundantEscapeSequences(String source) {
-    StringBuilder result = new StringBuilder();
-
-    for (int p = 0; p < source.length(); p++) {
-      char c = source.charAt(p);
-      if (c != '\\' || source.charAt(p + 1) != '\'') {
-        result.append(c);
-      }
-    }
-
-    return result.toString();
-  }
-}
--- a/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/RefasterAnyOfUsage.java
+++ b/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/RefasterAnyOfUsage.java
@@ -1,10 +1,10 @@
-package tech.picnic.errorprone.guidelines.bugpatterns;
+package tech.picnic.errorprone.bugpatterns;

 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
 import static com.google.errorprone.matchers.method.MethodMatchers.staticMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -17,7 +17,7 @@ import com.google.errorprone.matchers.Matcher;
 import com.google.errorprone.refaster.Refaster;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.MethodInvocationTree;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags unnecessary {@link Refaster#anyOf(Object[])} usages.
@@ -42,18 +42,21 @@ public final class RefasterAnyOfUsage extends BugChecker implements MethodInvoca

  @Override
  public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
-    int argumentCount = tree.getArguments().size();
-    if (argumentCount > 1 || !REFASTER_ANY_OF.matches(tree, state)) {
-      return Description.NO_MATCH;
+    if (REFASTER_ANY_OF.matches(tree, state)) {
+      switch (tree.getArguments().size()) {
+        case 0:
+          // We can't safely fix this case; dropping the expression may produce non-compilable code.
+          return describeMatch(tree);
+        case 1:
+          return describeMatch(
+              tree,
+              SuggestedFix.replace(
+                  tree, SourceCode.treeToString(tree.getArguments().get(0), state)));
+        default:
+          /* Handled below. */
+      }
    }

-    if (argumentCount == 0) {
-      /* We can't safely fix this case; dropping the expression may produce non-compilable code. */
-      return describeMatch(tree);
-    }
-
-    return describeMatch(
-        tree,
-        SuggestedFix.replace(tree, SourceCode.treeToString(tree.getArguments().get(0), state)));
+    return Description.NO_MATCH;
  }
 }
--- a/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/RefasterMethodParameterOrder.java
+++ b/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/RefasterMethodParameterOrder.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.guidelines.bugpatterns;
+package tech.picnic.errorprone.bugpatterns;

 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
@@ -8,7 +8,7 @@ import static com.google.errorprone.matchers.Matchers.anyOf;
 import static com.google.errorprone.matchers.Matchers.hasAnnotation;
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.toCollection;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;
@@ -38,7 +38,7 @@ import java.util.Set;
 import java.util.stream.Stream;
 import javax.lang.model.element.Name;
 import org.jspecify.annotations.Nullable;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags Refaster methods with a non-canonical parameter order.
--- a/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/RefasterRuleModifiers.java
+++ b/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/RefasterRuleModifiers.java
@@ -1,11 +1,11 @@
-package tech.picnic.errorprone.guidelines.bugpatterns;
+package tech.picnic.errorprone.bugpatterns;

 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.STYLE;
 import static com.google.errorprone.matchers.Matchers.anyOf;
 import static com.google.errorprone.matchers.Matchers.hasAnnotation;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/RequestMappingAnnotation.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/RequestMappingAnnotation.java
@@ -11,7 +11,7 @@ import static com.google.errorprone.matchers.Matchers.isSameType;
 import static com.google.errorprone.matchers.Matchers.isType;
 import static com.google.errorprone.matchers.Matchers.methodHasParameters;
 import static com.google.errorprone.matchers.Matchers.not;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -73,9 +73,7 @@ public final class RequestMappingAnnotation extends BugChecker implements Method
                          isType(ANN_PACKAGE_PREFIX + "RequestBody"),
                          isType(ANN_PACKAGE_PREFIX + "RequestHeader"),
                          isType(ANN_PACKAGE_PREFIX + "RequestParam"),
-                          isType(ANN_PACKAGE_PREFIX + "RequestPart"),
-                          isType(
-                              "org.springframework.security.core.annotation.CurrentSecurityContext"))),
+                          isType(ANN_PACKAGE_PREFIX + "RequestPart"))),
                  isSameType(InputStream.class.getCanonicalName()),
                  isSameType(Locale.class.getCanonicalName()),
                  isSameType(TimeZone.class.getCanonicalName()),
@@ -105,10 +103,9 @@ public final class RequestMappingAnnotation extends BugChecker implements Method
            && LACKS_PARAMETER_ANNOTATION.matches(tree, state)
        ? buildDescription(tree)
            .setMessage(
-                """
-                Not all parameters of this request mapping method are annotated; this may be a \
-                mistake. If the unannotated parameters represent query string parameters, annotate \
-                them with `@RequestParam`.""")
+                "Not all parameters of this request mapping method are annotated; this may be a "
+                    + "mistake. If the unannotated parameters represent query string parameters, "
+                    + "annotate them with `@RequestParam`.")
            .build()
        : Description.NO_MATCH;
  }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/RequestParamType.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/RequestParamType.java
@@ -11,12 +11,12 @@ import static com.google.errorprone.matchers.Matchers.anyOf;
 import static com.google.errorprone.matchers.Matchers.isSubtypeOf;
 import static com.google.errorprone.matchers.Matchers.isType;
 import static com.google.errorprone.matchers.Matchers.not;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableCollection;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
@@ -28,15 +28,13 @@ import com.google.errorprone.suppliers.Suppliers;
 import com.sun.source.tree.Tree;
 import com.sun.source.tree.VariableTree;
 import javax.inject.Inject;
-import tech.picnic.errorprone.utils.Flags;
+import tech.picnic.errorprone.bugpatterns.util.Flags;

 /** A {@link BugChecker} that flags {@code @RequestParam} parameters with an unsupported type. */
@AutoService(BugChecker.class)
@BugPattern(
    summary =
-        """
-        By default, `@RequestParam` does not support `ImmutableCollection` and `ImmutableMap` \
-        subtypes""",
+        "By default, `@RequestParam` does not support `ImmutableCollection` and `ImmutableMap` subtypes",
    link = BUG_PATTERNS_BASE_URL + "RequestParamType",
    linkType = CUSTOM,
    severity = ERROR,
@@ -74,10 +72,10 @@ public final class RequestParamType extends BugChecker implements VariableTreeMa
    return allOf(
        annotations(AT_LEAST_ONE, isType("org.springframework.web.bind.annotation.RequestParam")),
        anyOf(isSubtypeOf(ImmutableCollection.class), isSubtypeOf(ImmutableMap.class)),
-        not(isSubtypeOfAny(Flags.getSet(flags, SUPPORTED_CUSTOM_TYPES_FLAG))));
+        not(isSubtypeOfAny(Flags.getList(flags, SUPPORTED_CUSTOM_TYPES_FLAG))));
  }

-  private static Matcher<Tree> isSubtypeOfAny(ImmutableSet<String> inclusions) {
+  private static Matcher<Tree> isSubtypeOfAny(ImmutableList<String> inclusions) {
    return anyOf(
        inclusions.stream()
            .map(inclusion -> isSubtypeOf(Suppliers.typeFromString(inclusion)))
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/Slf4jLogStatement.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/Slf4jLogStatement.java
@@ -6,7 +6,7 @@ import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.google.errorprone.BugPattern.StandardTags.LIKELY_ERROR;
 import static com.google.errorprone.matchers.Matchers.isSubtypeOf;
 import static com.google.errorprone.matchers.method.MethodMatchers.instanceMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.base.Splitter;
@@ -23,7 +23,7 @@ import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.Tree.Kind;
 import java.util.List;
 import java.util.Optional;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /** A {@link BugChecker} that flags SLF4J usages that are likely to be in error. */
 // XXX: The special-casing of Throwable applies only to SLF4J 1.6.0+; see
@@ -41,7 +41,7 @@ import tech.picnic.errorprone.utils.SourceCode;
    tags = LIKELY_ERROR)
 public final class Slf4jLogStatement extends BugChecker implements MethodInvocationTreeMatcher {
  private static final long serialVersionUID = 1L;
-  private static final Matcher<ExpressionTree> SLF4J_MARKER = isSubtypeOf("org.slf4j.Marker");
+  private static final Matcher<ExpressionTree> MARKER = isSubtypeOf("org.slf4j.Marker");
  private static final Matcher<ExpressionTree> THROWABLE = isSubtypeOf(Throwable.class);
  private static final Matcher<ExpressionTree> SLF4J_LOGGER_INVOCATION =
      instanceMethod()
@@ -71,7 +71,7 @@ public final class Slf4jLogStatement extends BugChecker implements MethodInvocat
     * SLF4J log statements may accept a "marker" as a first argument, before the format string.
     * We ignore such markers.
     */
-    int lTrim = SLF4J_MARKER.matches(args.get(0), state) ? 1 : 0;
+    int lTrim = MARKER.matches(args.get(0), state) ? 1 : 0;
    /*
     * SLF4J treats the final argument to a log statement specially if it is a `Throwabe`: it
     * will always choose to render the associated stacktrace, even if the argument has a
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/Slf4jLoggerDeclaration.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/Slf4jLoggerDeclaration.java
@@ -1,185 +0,0 @@
-package tech.picnic.errorprone.bugpatterns;
-
-import static com.google.common.base.Verify.verify;
-import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
-import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
-import static com.google.errorprone.BugPattern.StandardTags.STYLE;
-import static com.google.errorprone.matchers.Matchers.allOf;
-import static com.google.errorprone.matchers.Matchers.classLiteral;
-import static com.google.errorprone.matchers.Matchers.instanceMethod;
-import static com.google.errorprone.matchers.Matchers.staticMethod;
-import static com.google.errorprone.matchers.Matchers.toType;
-import static java.util.Objects.requireNonNull;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
-
-import com.google.auto.service.AutoService;
-import com.google.common.base.CaseFormat;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-import com.google.errorprone.BugPattern;
-import com.google.errorprone.ErrorProneFlags;
-import com.google.errorprone.VisitorState;
-import com.google.errorprone.bugpatterns.BugChecker;
-import com.google.errorprone.bugpatterns.BugChecker.VariableTreeMatcher;
-import com.google.errorprone.fixes.SuggestedFix;
-import com.google.errorprone.fixes.SuggestedFixes;
-import com.google.errorprone.matchers.Description;
-import com.google.errorprone.matchers.Matcher;
-import com.google.errorprone.util.ASTHelpers;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.ModifiersTree;
-import com.sun.source.tree.Tree.Kind;
-import com.sun.source.tree.VariableTree;
-import com.sun.tools.javac.code.Symbol;
-import java.util.EnumSet;
-import javax.inject.Inject;
-import javax.lang.model.element.Modifier;
-import tech.picnic.errorprone.utils.MoreASTHelpers;
-
-/** A {@link BugChecker} that flags non-canonical SLF4J logger declarations. */
-@AutoService(BugChecker.class)
-@BugPattern(
-    summary = "SLF4J logger declarations should follow established best-practices",
-    link = BUG_PATTERNS_BASE_URL + "Slf4jLoggerDeclaration",
-    linkType = CUSTOM,
-    severity = WARNING,
-    tags = STYLE)
-@SuppressWarnings("java:S2160" /* Super class equality definition suffices. */)
-public final class Slf4jLoggerDeclaration extends BugChecker implements VariableTreeMatcher {
-  private static final long serialVersionUID = 1L;
-  private static final Matcher<ExpressionTree> IS_GET_LOGGER =
-      staticMethod().onDescendantOf("org.slf4j.LoggerFactory").named("getLogger");
-  private static final String CANONICAL_STATIC_LOGGER_NAME_FLAG =
-      "Slf4jLoggerDeclaration:CanonicalStaticLoggerName";
-  private static final String DEFAULT_CANONICAL_LOGGER_NAME = "LOG";
-  private static final Matcher<ExpressionTree> IS_STATIC_ENCLOSING_CLASS_REFERENCE =
-      classLiteral(Slf4jLoggerDeclaration::isEnclosingClassReference);
-  private static final Matcher<ExpressionTree> IS_DYNAMIC_ENCLOSING_CLASS_REFERENCE =
-      toType(
-          MethodInvocationTree.class,
-          allOf(
-              instanceMethod().anyClass().named("getClass").withNoParameters(),
-              Slf4jLoggerDeclaration::getClassReceiverIsEnclosingClassInstance));
-  private static final ImmutableSet<Modifier> INSTANCE_DECLARATION_MODIFIERS =
-      Sets.immutableEnumSet(Modifier.PRIVATE, Modifier.FINAL);
-  private static final ImmutableSet<Modifier> STATIC_DECLARATION_MODIFIERS =
-      Sets.immutableEnumSet(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
-
-  private final String canonicalStaticFieldName;
-  private final String canonicalInstanceFieldName;
-
-  /** Instantiates a default {@link Slf4jLoggerDeclaration} instance. */
-  public Slf4jLoggerDeclaration() {
-    this(ErrorProneFlags.empty());
-  }
-
-  /**
-   * Instantiates a customized {@link Slf4jLoggerDeclaration}.
-   *
-   * @param flags Any provided command line flags.
-   */
-  @Inject
-  Slf4jLoggerDeclaration(ErrorProneFlags flags) {
-    canonicalStaticFieldName =
-        flags.get(CANONICAL_STATIC_LOGGER_NAME_FLAG).orElse(DEFAULT_CANONICAL_LOGGER_NAME);
-    canonicalInstanceFieldName =
-        CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, canonicalStaticFieldName);
-  }
-
-  @Override
-  public Description matchVariable(VariableTree tree, VisitorState state) {
-    ExpressionTree initializer = tree.getInitializer();
-    if (!IS_GET_LOGGER.matches(initializer, state)) {
-      return Description.NO_MATCH;
-    }
-
-    ClassTree clazz = getEnclosingClass(state);
-    ExpressionTree factoryArg =
-        Iterables.getOnlyElement(((MethodInvocationTree) initializer).getArguments());
-
-    SuggestedFix.Builder fix = SuggestedFix.builder();
-
-    if (clazz.getModifiers().getFlags().contains(Modifier.ABSTRACT)
-        && IS_DYNAMIC_ENCLOSING_CLASS_REFERENCE.matches(factoryArg, state)) {
-      /*
-       * While generally we prefer `Logger` declarations to be static and named after their
-       * enclosing class, we allow one exception: loggers in abstract classes with a name derived
-       * from `getClass()`.
-       */
-      suggestModifiers(tree, INSTANCE_DECLARATION_MODIFIERS, fix, state);
-      suggestRename(tree, canonicalInstanceFieldName, fix, state);
-    } else {
-      suggestModifiers(
-          tree,
-          clazz.getKind() == Kind.INTERFACE ? ImmutableSet.of() : STATIC_DECLARATION_MODIFIERS,
-          fix,
-          state);
-      suggestRename(tree, canonicalStaticFieldName, fix, state);
-
-      if (!MoreASTHelpers.isStringTyped(factoryArg, state)
-          && !IS_STATIC_ENCLOSING_CLASS_REFERENCE.matches(factoryArg, state)) {
-        /*
-         * Loggers with a custom string name are generally "special", but those with a name derived
-         * from a class other than the one that encloses it are likely in error.
-         */
-        fix.merge(SuggestedFix.replace(factoryArg, clazz.getSimpleName() + ".class"));
-      }
-    }
-
-    return fix.isEmpty() ? Description.NO_MATCH : describeMatch(tree, fix.build());
-  }
-
-  private static void suggestModifiers(
-      VariableTree tree,
-      ImmutableSet<Modifier> modifiers,
-      SuggestedFix.Builder fixBuilder,
-      VisitorState state) {
-    ModifiersTree modifiersTree =
-        requireNonNull(ASTHelpers.getModifiers(tree), "`VariableTree` must have modifiers");
-    SuggestedFixes.addModifiers(tree, modifiersTree, state, modifiers).ifPresent(fixBuilder::merge);
-    SuggestedFixes.removeModifiers(
-            modifiersTree, state, Sets.difference(EnumSet.allOf(Modifier.class), modifiers))
-        .ifPresent(fixBuilder::merge);
-  }
-
-  private static void suggestRename(
-      VariableTree variableTree, String name, SuggestedFix.Builder fixBuilder, VisitorState state) {
-    if (!variableTree.getName().contentEquals(name)) {
-      fixBuilder.merge(SuggestedFixes.renameVariable(variableTree, name, state));
-    }
-  }
-
-  private static boolean isEnclosingClassReference(ExpressionTree tree, VisitorState state) {
-    return ASTHelpers.getSymbol(getEnclosingClass(state)).equals(ASTHelpers.getSymbol(tree));
-  }
-
-  private static boolean getClassReceiverIsEnclosingClassInstance(
-      MethodInvocationTree getClassInvocationTree, VisitorState state) {
-    ExpressionTree receiver = ASTHelpers.getReceiver(getClassInvocationTree);
-    if (receiver == null) {
-      /*
-       * Method invocations without an explicit receiver either involve static methods (possibly
-       * statically imported), or instance methods invoked on the enclosing class. As the given
-       * `getClassInvocationTree` is guaranteed to be a nullary `#getClass()` invocation, the latter
-       * must be the case.
-       */
-      return true;
-    }
-
-    Symbol symbol = ASTHelpers.getSymbol(receiver);
-    return symbol != null
-        && symbol.asType().tsym.equals(ASTHelpers.getSymbol(getEnclosingClass(state)));
-  }
-
-  private static ClassTree getEnclosingClass(VisitorState state) {
-    ClassTree clazz = state.findEnclosing(ClassTree.class);
-    // XXX: Review whether we should relax this constraint in the face of so-called anonymous
-    // classes. See
-    // https://docs.oracle.com/en/java/javase/23/language/implicitly-declared-classes-and-instance-main-methods.html
-    verify(clazz != null, "Variable not defined inside class");
-    return clazz;
-  }
-}
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/SpringMvcAnnotation.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/SpringMvcAnnotation.java
@@ -1,11 +1,12 @@
 package tech.picnic.errorprone.bugpatterns;

+import static com.google.common.base.Verify.verify;
 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
 import static java.util.function.Predicate.not;
 import static java.util.stream.Collectors.joining;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.base.VerifyException;
@@ -24,9 +25,10 @@ import com.sun.source.tree.AssignmentTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.NewArrayTree;
+import com.sun.source.tree.Tree.Kind;
 import java.util.Optional;
-import tech.picnic.errorprone.utils.AnnotationAttributeMatcher;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.AnnotationAttributeMatcher;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags {@code @RequestMapping} annotations that can be written more
@@ -78,25 +80,31 @@ public final class SpringMvcAnnotation extends BugChecker implements AnnotationT
  }

  private static Optional<String> extractUniqueMethod(ExpressionTree arg, VisitorState state) {
-    if (!(arg instanceof AssignmentTree assignment)) {
-      throw new VerifyException("Annotation attribute is not an assignment:" + arg.getKind());
+    verify(
+        arg.getKind() == Kind.ASSIGNMENT,
+        "Annotation attribute is not an assignment: %s",
+        arg.getKind());
+
+    ExpressionTree expr = ((AssignmentTree) arg).getExpression();
+    if (expr.getKind() != Kind.NEW_ARRAY) {
+      return Optional.of(extractMethod(expr, state));
    }

-    ExpressionTree expr = assignment.getExpression();
-    return expr instanceof NewArrayTree newArray
-        ? Optional.of(newArray.getInitializers())
-            .filter(args -> args.size() == 1)
-            .map(args -> extractMethod(args.get(0), state))
-        : Optional.of(extractMethod(expr, state));
+    NewArrayTree newArray = (NewArrayTree) expr;
+    return Optional.of(newArray.getInitializers())
+        .filter(args -> args.size() == 1)
+        .map(args -> extractMethod(args.get(0), state));
  }

-  // XXX: Use switch pattern matching once the targeted JDK supports this.
  private static String extractMethod(ExpressionTree expr, VisitorState state) {
-    return switch (expr.getKind()) {
-      case IDENTIFIER -> SourceCode.treeToString(expr, state);
-      case MEMBER_SELECT -> ((MemberSelectTree) expr).getIdentifier().toString();
-      default -> throw new VerifyException("Unexpected type of expression: " + expr.getKind());
-    };
+    switch (expr.getKind()) {
+      case IDENTIFIER:
+        return SourceCode.treeToString(expr, state);
+      case MEMBER_SELECT:
+        return ((MemberSelectTree) expr).getIdentifier().toString();
+      default:
+        throw new VerifyException("Unexpected type of expression: " + expr.getKind());
+    }
  }

  private static Fix replaceAnnotation(
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StaticImport.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StaticImport.java
@@ -6,7 +6,7 @@ import static com.google.errorprone.BugPattern.StandardTags.STYLE;
 import static java.util.Objects.requireNonNull;
 import static tech.picnic.errorprone.bugpatterns.NonStaticImport.NON_STATIC_IMPORT_CANDIDATE_IDENTIFIERS;
 import static tech.picnic.errorprone.bugpatterns.NonStaticImport.NON_STATIC_IMPORT_CANDIDATE_MEMBERS;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.annotations.VisibleForTesting;
@@ -39,13 +39,11 @@ import com.google.errorprone.fixes.SuggestedFix;
 import com.google.errorprone.fixes.SuggestedFixes;
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Matchers;
-import com.google.errorprone.predicates.TypePredicates;
 import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.Tree;
-import com.sun.source.tree.Tree.Kind;
 import com.sun.tools.javac.code.Type;
 import java.nio.charset.StandardCharsets;
 import java.time.ZoneOffset;
@@ -102,7 +100,6 @@ public final class StaticImport extends BugChecker implements MemberSelectTreeMa
          Preconditions.class.getCanonicalName(),
          Predicates.class.getCanonicalName(),
          StandardCharsets.class.getCanonicalName(),
-          TypePredicates.class.getCanonicalName(),
          Verify.class.getCanonicalName(),
          "com.fasterxml.jackson.annotation.JsonCreator.Mode",
          "com.fasterxml.jackson.annotation.JsonFormat.Shape",
@@ -135,7 +132,7 @@ public final class StaticImport extends BugChecker implements MemberSelectTreeMa
          "org.springframework.http.MediaType",
          "org.testng.Assert",
          "reactor.function.TupleUtils",
-          "tech.picnic.errorprone.utils.MoreTypes");
+          "tech.picnic.errorprone.bugpatterns.util.MoreTypes");

  /**
   * Type members that should be statically imported.
@@ -212,10 +209,15 @@ public final class StaticImport extends BugChecker implements MemberSelectTreeMa
    Tree parentTree =
        requireNonNull(state.getPath().getParentPath(), "MemberSelectTree lacks enclosing node")
            .getLeaf();
-
-    return parentTree instanceof MethodInvocationTree methodInvocation
-        ? methodInvocation.getTypeArguments().isEmpty()
-        : (parentTree.getKind() != Kind.IMPORT && parentTree.getKind() != Kind.MEMBER_SELECT);
+    switch (parentTree.getKind()) {
+      case IMPORT:
+      case MEMBER_SELECT:
+        return false;
+      case METHOD_INVOCATION:
+        return ((MethodInvocationTree) parentTree).getTypeArguments().isEmpty();
+      default:
+        return true;
+    }
  }

  private static boolean isCandidate(MemberSelectTree tree) {
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StringJoin.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StringJoin.java
@@ -4,7 +4,7 @@ import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION;
 import static com.google.errorprone.BugPattern.StandardTags.SIMPLIFICATION;
 import static com.google.errorprone.matchers.method.MethodMatchers.staticMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.common.base.Splitter;
@@ -23,11 +23,12 @@ import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.util.Constants;
 import java.util.Formattable;
 import java.util.Iterator;
 import java.util.List;
 import org.jspecify.annotations.Nullable;
-import tech.picnic.errorprone.utils.SourceCode;
+import tech.picnic.errorprone.bugpatterns.util.SourceCode;

 /**
 * A {@link BugChecker} that flags {@link String#format(String, Object...)} invocations which can be
@@ -36,9 +37,7 @@ import tech.picnic.errorprone.utils.SourceCode;
 */
 // XXX: What about `v1 + "sep" + v2` and similar expressions? Do we want to rewrite those to
 // `String.join`, or should some `String.join` invocations be rewritten to use the `+` operator?
-// (The latter suggestion would conflict with the `FormatStringConcatenation` check, but does make
-// more sense when `"sep"` is a long string. Similarly for `String.format("%s some long text %s",
-// arg1, arg2)`.)
+// (The latter suggestion would conflict with the `FormatStringConcatenation` check.)
@AutoService(BugChecker.class)
@BugPattern(
    summary = "Prefer `String#join` over `String#format`",
@@ -151,7 +150,7 @@ public final class StringJoin extends BugChecker implements MethodInvocationTree
    SuggestedFix.Builder fix =
        SuggestedFix.builder()
            .replace(tree.getMethodSelect(), "String.join")
-            .replace(arguments.next(), SourceCode.toStringConstantExpression(separator, state));
+            .replace(arguments.next(), Constants.format(separator));

    while (arguments.hasNext()) {
      ExpressionTree argument = arguments.next();
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/TimeZoneUsage.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/TimeZoneUsage.java
@@ -10,7 +10,7 @@ import static com.google.errorprone.matchers.Matchers.instanceMethod;
 import static com.google.errorprone.matchers.Matchers.isSubtypeOf;
 import static com.google.errorprone.matchers.Matchers.not;
 import static com.google.errorprone.matchers.Matchers.staticMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -34,9 +34,7 @@ import java.time.ZonedDateTime;
@AutoService(BugChecker.class)
@BugPattern(
    summary =
-        """
-        Derive the current time from an existing `Clock` Spring bean, and don't rely on a \
-        `Clock`'s time zone""",
+        "Derive the current time from an existing `Clock` Spring bean, and don't rely on a `Clock`'s time zone",
    link = BUG_PATTERNS_BASE_URL + "TimeZoneUsage",
    linkType = CUSTOM,
    severity = WARNING,
--- a/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/UnqualifiedSuggestedFixImport.java
+++ b/error-prone-guidelines/src/main/java/tech/picnic/errorprone/guidelines/bugpatterns/UnqualifiedSuggestedFixImport.java
@@ -1,10 +1,10 @@
-package tech.picnic.errorprone.guidelines.bugpatterns;
+package tech.picnic.errorprone.bugpatterns;

 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.google.errorprone.BugPattern.StandardTags.FRAGILE_CODE;
 import static com.google.errorprone.matchers.Matchers.instanceMethod;
-import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
+import static tech.picnic.errorprone.bugpatterns.util.Documentation.BUG_PATTERNS_BASE_URL;

 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
@@ -45,14 +45,16 @@ public final class UnqualifiedSuggestedFixImport extends BugChecker
      return Description.NO_MATCH;
    }

-    return switch (ASTHelpers.getSymbol(tree).getSimpleName().toString()) {
-      case "addImport" ->
-          createDescription(tree, "SuggestedFix.Builder#addImport", "SuggestedFixes#qualifyType");
-      case "addStaticImport" ->
-          createDescription(
-              tree, "SuggestedFix.Builder#addStaticImport", "SuggestedFixes#qualifyStaticImport");
-      default -> Description.NO_MATCH;
-    };
+    switch (ASTHelpers.getSymbol(tree).getSimpleName().toString()) {
+      case "addImport":
+        return createDescription(
+            tree, "SuggestedFix.Builder#addImport", "SuggestedFixes#qualifyType");
+      case "addStaticImport":
+        return createDescription(
+            tree, "SuggestedFix.Builder#addStaticImport", "SuggestedFixes#qualifyStaticImport");
+      default:
+        return Description.NO_MATCH;
+    }
  }

  private Description createDescription(
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/AnnotationAttributeMatcher.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/AnnotationAttributeMatcher.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;

 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.HashMultimap;
@@ -9,6 +9,7 @@ import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.AnnotationTree;
 import com.sun.source.tree.AssignmentTree;
 import com.sun.source.tree.ExpressionTree;
+import com.sun.source.tree.Tree.Kind;
 import com.sun.tools.javac.code.Type;
 import java.io.Serializable;
 import java.util.HashSet;
@@ -115,8 +116,8 @@ public final class AnnotationAttributeMatcher implements Serializable {
  }

  private static String extractAttributeName(ExpressionTree expr) {
-    return (expr instanceof AssignmentTree assignment)
-        ? ASTHelpers.getSymbol(assignment.getVariable()).getSimpleName().toString()
+    return (expr.getKind() == Kind.ASSIGNMENT)
+        ? ASTHelpers.getSymbol(((AssignmentTree) expr).getVariable()).getSimpleName().toString()
        : "value";
  }

--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/ConflictDetection.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/ConflictDetection.java
@@ -0,0 +1,75 @@
+package tech.picnic.errorprone.bugpatterns.util;
+
+import static tech.picnic.errorprone.bugpatterns.util.JavaKeywords.isValidIdentifier;
+
+import com.google.errorprone.VisitorState;
+import com.google.errorprone.util.ASTHelpers;
+import com.sun.source.tree.ImportTree;
+import com.sun.source.tree.Tree;
+import com.sun.tools.javac.code.Symbol.MethodSymbol;
+import com.sun.tools.javac.code.Type;
+import java.util.Optional;
+
+/** A set of helper methods for detecting conflicts that would be caused when applying fixes. */
+public final class ConflictDetection {
+  private ConflictDetection() {}
+
+  /**
+   * If applicable, returns a human-readable argument against assigning the given name to an
+   * existing method.
+   *
+   * <p>This method implements imperfect heuristics. Things it currently does not consider include
+   * the following:
+   *
+   * <ul>
+   *   <li>Whether the rename would merely introduce a method overload, rather than clashing with an
+   *       existing method declaration in its class or a supertype.
+   *   <li>Whether the rename would in fact clash with a static import. (It could be that a static
+   *       import of the same name is only referenced from lexical scopes in which the method under
+   *       consideration cannot be referenced directly.)
+   * </ul>
+   *
+   * @param method The method considered for renaming.
+   * @param newName The newly proposed name for the method.
+   * @param state The {@link VisitorState} to use when searching for blockers.
+   * @return A human-readable argument against assigning the proposed name to the given method, or
+   *     {@link Optional#empty()} if no blocker was found.
+   */
+  public static Optional<String> findMethodRenameBlocker(
+      MethodSymbol method, String newName, VisitorState state) {
+    if (isExistingMethodName(method.owner.type, newName, state)) {
+      return Optional.of(
+          String.format(
+              "a method named `%s` is already defined in this class or a supertype", newName));
+    }
+
+    if (isSimpleNameStaticallyImported(newName, state)) {
+      return Optional.of(String.format("`%s` is already statically imported", newName));
+    }
+
+    if (!isValidIdentifier(newName)) {
+      return Optional.of(String.format("`%s` is not a valid identifier", newName));
+    }
+
+    return Optional.empty();
+  }
+
+  private static boolean isExistingMethodName(Type clazz, String name, VisitorState state) {
+    return ASTHelpers.matchingMethods(state.getName(name), method -> true, clazz, state.getTypes())
+        .findAny()
+        .isPresent();
+  }
+
+  private static boolean isSimpleNameStaticallyImported(String simpleName, VisitorState state) {
+    return state.getPath().getCompilationUnit().getImports().stream()
+        .filter(ImportTree::isStatic)
+        .map(ImportTree::getQualifiedIdentifier)
+        .map(tree -> getStaticImportSimpleName(tree, state))
+        .anyMatch(simpleName::contentEquals);
+  }
+
+  private static CharSequence getStaticImportSimpleName(Tree tree, VisitorState state) {
+    String source = SourceCode.treeToString(tree, state);
+    return source.subSequence(source.lastIndexOf('.') + 1, source.length());
+  }
+}
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/Documentation.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/Documentation.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;

 /** Utility class providing documentation-related code. */
 public final class Documentation {
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/Flags.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/Flags.java
@@ -0,0 +1,22 @@
+package tech.picnic.errorprone.bugpatterns.util;
+
+import com.google.common.collect.ImmutableList;
+import com.google.errorprone.ErrorProneFlags;
+
+/** Helper methods for working with {@link ErrorProneFlags}. */
+public final class Flags {
+  private Flags() {}
+
+  /**
+   * Returns the list of (comma-separated) arguments passed using the given Error Prone flag.
+   *
+   * @param errorProneFlags The full set of flags provided.
+   * @param name The name of the flag of interest.
+   * @return A non-{@code null} list of provided arguments; this list is empty if the flag was not
+   *     provided, or if the flag's value is the empty string.
+   */
+  public static ImmutableList<String> getList(ErrorProneFlags errorProneFlags, String name) {
+    ImmutableList<String> list = errorProneFlags.getListOrEmpty(name);
+    return list.equals(ImmutableList.of("")) ? ImmutableList.of() : list;
+  }
+}
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/JavaKeywords.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/JavaKeywords.java
@@ -0,0 +1,159 @@
+package tech.picnic.errorprone.bugpatterns.util;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+
+/** Utility class that can be used to identify reserved keywords of the Java language. */
+// XXX: This class is no longer only about keywords. Consider changing its name and class-level
+// documentation.
+public final class JavaKeywords {
+  /**
+   * Enumeration of boolean and null literals.
+   *
+   * @see <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-3.html#jls-3.10.3">JDK 17
+   *     JLS section 3.10.3: Boolean Literals</a>
+   * @see <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-3.html#jls-3.10.8">JDK 17
+   *     JLS section 3.10.8: The Null Literal</a>
+   */
+  private static final ImmutableSet<String> BOOLEAN_AND_NULL_LITERALS =
+      ImmutableSet.of("true", "false", "null");
+
+  /**
+   * List of all reserved keywords in the Java language.
+   *
+   * @see <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-3.html#jls-3.9">JDK 17 JLS
+   *     section 3.9: Keywords</a>
+   */
+  private static final ImmutableSet<String> RESERVED_KEYWORDS =
+      ImmutableSet.of(
+          "_",
+          "abstract",
+          "assert",
+          "boolean",
+          "break",
+          "byte",
+          "case",
+          "catch",
+          "char",
+          "class",
+          "const",
+          "continue",
+          "default",
+          "do",
+          "double",
+          "else",
+          "enum",
+          "extends",
+          "final",
+          "finally",
+          "float",
+          "for",
+          "goto",
+          "if",
+          "implements",
+          "import",
+          "instanceof",
+          "int",
+          "interface",
+          "long",
+          "native",
+          "new",
+          "package",
+          "private",
+          "protected",
+          "public",
+          "return",
+          "short",
+          "static",
+          "strictfp",
+          "super",
+          "switch",
+          "synchronized",
+          "this",
+          "throw",
+          "throws",
+          "transient",
+          "try",
+          "void",
+          "volatile",
+          "while");
+
+  /**
+   * List of all contextual keywords in the Java language.
+   *
+   * @see <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-3.html#jls-3.9">JDK 17 JLS
+   *     section 3.9: Keywords</a>
+   */
+  private static final ImmutableSet<String> CONTEXTUAL_KEYWORDS =
+      ImmutableSet.of(
+          "exports",
+          "module",
+          "non-sealed",
+          "open",
+          "opens",
+          "permits",
+          "provides",
+          "record",
+          "requires",
+          "sealed",
+          "to",
+          "transitive",
+          "uses",
+          "var",
+          "with",
+          "yield");
+
+  /** List of all keywords in the Java language. */
+  private static final ImmutableSet<String> ALL_KEYWORDS =
+      Sets.union(RESERVED_KEYWORDS, CONTEXTUAL_KEYWORDS).immutableCopy();
+
+  private JavaKeywords() {}
+
+  /**
+   * Tells whether the given string is a valid identifier in the Java language.
+   *
+   * @param str The string of interest.
+   * @return {@code true} if the given string is a valid identifier in the Java language.
+   * @see <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-3.html#jls-3.8">JDK 17 JLS
+   *     section 3.8: Identifiers</a>
+   */
+  @SuppressWarnings("java:S1067" /* Chaining conjunctions like this does not impact readability. */)
+  public static boolean isValidIdentifier(String str) {
+    return !str.isEmpty()
+        && !isReservedKeyword(str)
+        && !BOOLEAN_AND_NULL_LITERALS.contains(str)
+        && Character.isJavaIdentifierStart(str.codePointAt(0))
+        && str.codePoints().skip(1).allMatch(Character::isUnicodeIdentifierPart);
+  }
+
+  /**
+   * Tells whether the given string is a reserved keyword in the Java language.
+   *
+   * @param str The string of interest.
+   * @return {@code true} if the given string is a reserved keyword in the Java language.
+   */
+  public static boolean isReservedKeyword(String str) {
+    return RESERVED_KEYWORDS.contains(str);
+  }
+
+  /**
+   * Tells whether the given string is a contextual keyword in the Java language.
+   *
+   * @param str The string of interest.
+   * @return {@code true} if the given string is a contextual keyword in the Java language.
+   */
+  public static boolean isContextualKeyword(String str) {
+    return CONTEXTUAL_KEYWORDS.contains(str);
+  }
+
+  /**
+   * Tells whether the given string is a reserved or contextual keyword in the Java language.
+   *
+   * @param str The string of interest.
+   * @return {@code true} if the given string is a reserved or contextual keyword in the Java
+   *     language.
+   */
+  public static boolean isKeyword(String str) {
+    return ALL_KEYWORDS.contains(str);
+  }
+}
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MethodMatcherFactory.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MethodMatcherFactory.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;

 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreASTHelpers.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreASTHelpers.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;

 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -15,7 +15,8 @@ import java.util.Optional;
 /**
 * A collection of helper methods for working with the AST.
 *
- * <p>These methods are additions to the ones found in {@link ASTHelpers}.
+ * <p>These methods are additions to the ones found in {@link
+ * com.google.errorprone.util.ASTHelpers}.
 */
 public final class MoreASTHelpers {
  private MoreASTHelpers() {}
@@ -78,16 +79,4 @@ public final class MoreASTHelpers {
  public static boolean areSameType(Tree treeA, Tree treeB, VisitorState state) {
    return ASTHelpers.isSameType(ASTHelpers.getType(treeA), ASTHelpers.getType(treeB), state);
  }
-
-  /**
-   * Tells whether the given tree is of type {@link String}.
-   *
-   * @param tree The tree of interest.
-   * @param state The {@link VisitorState} describing the context in which the given tree was found.
-   * @return Whether the specified tree has the same type as {@link
-   *     com.sun.tools.javac.code.Symtab#stringType}.
-   */
-  public static boolean isStringTyped(Tree tree, VisitorState state) {
-    return ASTHelpers.isSameType(ASTHelpers.getType(tree), state.getSymtab().stringType, state);
-  }
 }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreJUnitMatchers.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreJUnitMatchers.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;

 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.errorprone.matchers.ChildMultiMatcher.MatchType.AT_LEAST_ONE;
@@ -6,7 +6,7 @@ import static com.google.errorprone.matchers.Matchers.annotations;
 import static com.google.errorprone.matchers.Matchers.anyOf;
 import static com.google.errorprone.matchers.Matchers.isType;
 import static java.util.Objects.requireNonNullElse;
-import static tech.picnic.errorprone.utils.MoreMatchers.hasMetaAnnotation;
+import static tech.picnic.errorprone.bugpatterns.util.MoreMatchers.hasMetaAnnotation;

 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
@@ -99,13 +99,14 @@ public final class MoreJUnitMatchers {
    String methodName = method.getName().toString();
    ExpressionTree value = AnnotationMatcherUtils.getArgument(methodSourceAnnotation, "value");

-    if (!(value instanceof NewArrayTree newArray)) {
+    if (!(value instanceof NewArrayTree)) {
      return ImmutableList.of(toMethodSourceFactoryDescriptor(value, methodName));
    }

-    return newArray.getInitializers().stream()
-        .map(name -> toMethodSourceFactoryDescriptor(name, methodName))
-        .collect(toImmutableList());
+    return ((NewArrayTree) value)
+        .getInitializers().stream()
+            .map(name -> toMethodSourceFactoryDescriptor(name, methodName))
+            .collect(toImmutableList());
  }

  private static String toMethodSourceFactoryDescriptor(
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreMatchers.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreMatchers.java
@@ -1,7 +1,7 @@
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;

 import static com.google.errorprone.matchers.Matchers.typePredicateMatcher;
-import static tech.picnic.errorprone.utils.MoreTypePredicates.hasAnnotation;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypePredicates.hasAnnotation;

 import com.google.errorprone.matchers.Matcher;
 import com.google.errorprone.matchers.Matchers;
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreTypePredicates.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreTypePredicates.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;

 import com.google.errorprone.VisitorState;
 import com.google.errorprone.predicates.TypePredicate;
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreTypes.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreTypes.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;

 import static java.util.stream.Collectors.toCollection;

--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/SourceCode.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/SourceCode.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;

 import static com.sun.tools.javac.parser.Tokens.TokenKind.RPAREN;
 import static com.sun.tools.javac.util.Position.NOPOS;
@@ -17,7 +17,6 @@ import com.sun.source.tree.Tree;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.Position;
 import java.util.Optional;
-import javax.lang.model.SourceVersion;

 /**
 * A collection of Error Prone utility methods for dealing with the source code representation of
@@ -29,18 +28,6 @@ public final class SourceCode {

  private SourceCode() {}

-  /**
-   * Tells whether the given string is a valid identifier in the Java language.
-   *
-   * @param str The string of interest.
-   * @return {@code true} if the given string is a valid identifier in the Java language.
-   * @see <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-3.html#jls-3.8">JDK 17 JLS
-   *     section 3.8: Identifiers</a>
-   */
-  public static boolean isValidIdentifier(String str) {
-    return str.indexOf('.') < 0 && SourceVersion.isName(str);
-  }
-
  /**
   * Returns a string representation of the given {@link Tree}, preferring the original source code
   * (if available) over its prettified representation.
@@ -55,24 +42,6 @@ public final class SourceCode {
    return src != null ? src : tree.toString();
  }

-  /**
-   * Returns a Java string constant expression (i.e., a quoted string) representing the given input.
-   *
-   * @param value The value of interest.
-   * @param state A {@link VisitorState} describing the context in which the given {@link Tree} is
-   *     found.
-   * @return A non-{@code null} string.
-   * @apiNote This method differs from {@link com.sun.tools.javac.util.Constants#format(Object)} in
-   *     that it does not superfluously escape single quote characters. It is different from {@link
-   *     VisitorState#getConstantExpression(Object)} in that it is more performant and accepts any
-   *     {@link CharSequence} instance.
-   */
-  // XXX: Drop this method if https://github.com/google/error-prone/pull/4586 is merged and released
-  // with the proposed `CharSequence` compatibility change.
-  public static String toStringConstantExpression(Object value, VisitorState state) {
-    return state.getConstantExpression(value instanceof CharSequence ? value.toString() : value);
-  }
-
  /**
   * Creates a {@link SuggestedFix} for the deletion of the given {@link Tree}, including any
   * whitespace that follows it.
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/ThirdPartyLibrary.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/ThirdPartyLibrary.java
@@ -1,4 +1,4 @@
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;

 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.VisitorState;
@@ -6,13 +6,10 @@ import com.google.errorprone.bugpatterns.BugChecker;
 import com.google.errorprone.suppliers.Supplier;
 import com.sun.tools.javac.code.ClassFinder;
 import com.sun.tools.javac.code.Source;
-import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.CompletionFailure;
 import com.sun.tools.javac.code.Symbol.ModuleSymbol;
 import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.util.Name;
-import javax.lang.model.element.Modifier;

 /**
 * Utility class that helps decide whether it is appropriate to introduce references to (well-known)
@@ -73,12 +70,12 @@ public enum ThirdPartyLibrary {
  /**
   * Tells whether the given fully qualified type is available on the current class path.
   *
-   * @param typeName The type of interest.
+   * @param className The type of interest.
   * @param state The context under consideration.
   * @return {@code true} iff it is okay to assume or create a dependency on this type.
   */
-  public static boolean canIntroduceUsage(String typeName, VisitorState state) {
-    return shouldIgnoreClasspath(state) || isKnownClass(typeName, state);
+  public static boolean canIntroduceUsage(String className, VisitorState state) {
+    return shouldIgnoreClasspath(state) || isKnownClass(className, state);
  }

  /**
@@ -87,16 +84,11 @@ public enum ThirdPartyLibrary {
   * <p>The {@link VisitorState}'s symbol table is consulted first. If the type has not yet been
   * loaded, then an attempt is made to do so.
   */
-  private static boolean isKnownClass(String typeName, VisitorState state) {
-    return isPublicClassInSymbolTable(typeName, state) || canLoadPublicClass(typeName, state);
+  private static boolean isKnownClass(String className, VisitorState state) {
+    return state.getTypeFromString(className) != null || canLoadClass(className, state);
  }

-  private static boolean isPublicClassInSymbolTable(String typeName, VisitorState state) {
-    Type type = state.getTypeFromString(typeName);
-    return type != null && isPublic(type.tsym);
-  }
-
-  private static boolean canLoadPublicClass(String typeName, VisitorState state) {
+  private static boolean canLoadClass(String className, VisitorState state) {
    ClassFinder classFinder = ClassFinder.instance(state.context);
    Symtab symtab = state.getSymtab();
    // XXX: Drop support for targeting Java 8 once the oldest supported JDK drops such support.
@@ -104,9 +96,10 @@ public enum ThirdPartyLibrary {
        Source.instance(state.context).compareTo(Source.JDK9) < 0
            ? symtab.noModule
            : symtab.unnamedModule;
-    Name binaryName = state.binaryNameFromClassname(typeName);
+    Name binaryName = state.binaryNameFromClassname(className);
    try {
-      return isPublic(classFinder.loadClass(module, binaryName));
+      classFinder.loadClass(module, binaryName);
+      return true;
    } catch (
        @SuppressWarnings("java:S1166" /* Not exceptional. */)
        CompletionFailure e) {
@@ -114,11 +107,6 @@ public enum ThirdPartyLibrary {
    }
  }

-  // XXX: Once we target JDK 14+, drop this method in favour of `Symbol#isPublic()`.
-  private static boolean isPublic(Symbol symbol) {
-    return symbol.getModifiers().contains(Modifier.PUBLIC);
-  }
-
  private static boolean shouldIgnoreClasspath(VisitorState state) {
    return state
        .errorProneOptions()
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/package-info.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/package-info.java
@@ -1,4 +1,4 @@
 /** Auxiliary utilities for use by Error Prone checks. */
@com.google.errorprone.annotations.CheckReturnValue
@org.jspecify.annotations.NullMarked
-package tech.picnic.errorprone.utils;
+package tech.picnic.errorprone.bugpatterns.util;
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJObjectRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJObjectRules.java
@@ -2,11 +2,14 @@ package tech.picnic.errorprone.refasterrules;

 import static com.google.errorprone.refaster.ImportPolicy.STATIC_IMPORT_ALWAYS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.type;

 import com.google.errorprone.refaster.Refaster;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.Placeholder;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
+import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.AbstractBooleanAssert;
 import org.assertj.core.api.AbstractStringAssert;
 import org.assertj.core.api.ObjectAssert;
@@ -80,4 +83,28 @@ final class AssertJObjectRules {
      return assertThat(object).hasToString(str);
    }
  }
+
+  // XXX: This rule could produce non-compilable code. Possible improvements:
+  // Instead of `type(clazz)` suggest a more suitable `InstanceOfAssertFactory`. (Perhaps have
+  // separate rules which e.g. replace `.asInstanceOf(type(clazz))` with
+  // `.asInstanceOf(throwable(clazz))`.)
+  // Next to `matches(Predicate)`, this rule applies to several other functional interface-accepting
+  // assertion methods.
+  // Arguably this rule should be split in two.
+  @SuppressWarnings("unchecked")
+  abstract static class AbstractAssertAsInstanceOfMatches<R, S, T extends S> {
+    @Placeholder
+    abstract boolean test(S value);
+
+    @BeforeTemplate
+    AbstractAssert<?, R> before(AbstractAssert<?, R> abstractAssert, Class<T> clazz) {
+      return abstractAssert.isInstanceOf(clazz).matches(v -> test((S) v));
+    }
+
+    @AfterTemplate
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
+    AbstractAssert<?, S> after(AbstractAssert<?, R> abstractAssert, Class<S> clazz) {
+      return abstractAssert.asInstanceOf(type(clazz)).matches(v -> test(v));
+    }
+  }
 }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJRules.java
@@ -3,6 +3,9 @@ package tech.picnic.errorprone.refasterrules;
 import static com.google.errorprone.refaster.ImportPolicy.STATIC_IMPORT_ALWAYS;
 import static org.assertj.core.api.Assertions.assertThat;

+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMultiset;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Multiset;
 import com.google.errorprone.refaster.Refaster;
@@ -12,6 +15,7 @@ import com.google.errorprone.refaster.annotation.Matches;
 import com.google.errorprone.refaster.annotation.NotMatches;
 import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -200,8 +204,32 @@ final class AssertJRules {
    @SuppressWarnings("unchecked")
    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T element) {
      return Refaster.anyOf(
+          iterAssert.containsAnyElementsOf(
+              Refaster.anyOf(
+                  ImmutableList.of(element),
+                  Arrays.asList(element),
+                  ImmutableSet.of(element),
+                  ImmutableMultiset.of(element))),
          iterAssert.containsAnyOf(element),
+          iterAssert.containsAll(
+              Refaster.anyOf(
+                  ImmutableList.of(element),
+                  Arrays.asList(element),
+                  ImmutableSet.of(element),
+                  ImmutableMultiset.of(element))),
+          iterAssert.containsSequence(
+              Refaster.anyOf(
+                  ImmutableList.of(element),
+                  Arrays.asList(element),
+                  ImmutableSet.of(element),
+                  ImmutableMultiset.of(element))),
          iterAssert.containsSequence(element),
+          iterAssert.containsSubsequence(
+              Refaster.anyOf(
+                  ImmutableList.of(element),
+                  Arrays.asList(element),
+                  ImmutableSet.of(element),
+                  ImmutableMultiset.of(element))),
          iterAssert.containsSubsequence(element));
    }

@@ -216,7 +244,20 @@ final class AssertJRules {
    @BeforeTemplate
    @SuppressWarnings("unchecked")
    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T element) {
-      return iterAssert.doesNotContainSequence(element);
+      return Refaster.anyOf(
+          iterAssert.doesNotContainAnyElementsOf(
+              Refaster.anyOf(
+                  ImmutableList.of(element),
+                  Arrays.asList(element),
+                  ImmutableSet.of(element),
+                  ImmutableMultiset.of(element))),
+          iterAssert.doesNotContainSequence(
+              Refaster.anyOf(
+                  ImmutableList.of(element),
+                  Arrays.asList(element),
+                  ImmutableSet.of(element),
+                  ImmutableMultiset.of(element))),
+          iterAssert.doesNotContainSequence(element));
    }

    @AfterTemplate
@@ -229,7 +270,25 @@ final class AssertJRules {
  static final class ObjectEnumerableContainsExactlyOneElement<S, T extends S> {
    @BeforeTemplate
    @SuppressWarnings("unchecked")
-    ObjectEnumerableAssert<?, S> before(
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T element) {
+      return Refaster.anyOf(
+          iterAssert.containsExactlyElementsOf(
+              Refaster.anyOf(
+                  ImmutableList.of(element),
+                  Arrays.asList(element),
+                  ImmutableSet.of(element),
+                  ImmutableMultiset.of(element))),
+          iterAssert.containsExactlyInAnyOrderElementsOf(
+              Refaster.anyOf(
+                  ImmutableList.of(element),
+                  Arrays.asList(element),
+                  ImmutableSet.of(element),
+                  ImmutableMultiset.of(element))));
+    }
+
+    @BeforeTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> before2(
        ObjectEnumerableAssert<?, S> iterAssert, @NotMatches(IsArray.class) T element) {
      return iterAssert.containsExactlyInAnyOrder(element);
    }
@@ -254,6 +313,42 @@ final class AssertJRules {
    }
  }

+  static final class ObjectEnumerableContainsOneDistinctElement<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T element) {
+      return iterAssert.hasSameElementsAs(
+          Refaster.anyOf(
+              ImmutableList.of(element),
+              Arrays.asList(element),
+              ImmutableSet.of(element),
+              ImmutableMultiset.of(element)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T element) {
+      return iterAssert.containsOnly(element);
+    }
+  }
+
+  static final class ObjectEnumerableIsSubsetOfOneElement<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T element) {
+      return iterAssert.isSubsetOf(
+          Refaster.anyOf(
+              ImmutableList.of(element),
+              Arrays.asList(element),
+              ImmutableSet.of(element),
+              ImmutableMultiset.of(element)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T element) {
+      return iterAssert.isSubsetOf(element);
+    }
+  }
+
  //
  // Iterable
  //
@@ -264,7 +359,6 @@ final class AssertJRules {
      Refaster.anyOf(
          assertThat(iterable).hasSize(0),
          assertThat(iterable.iterator().hasNext()).isFalse(),
-          assertThat(iterable.iterator()).isExhausted(),
          assertThat(Iterables.size(iterable)).isEqualTo(0L),
          assertThat(Iterables.size(iterable)).isNotPositive());
    }
@@ -1061,6 +1155,824 @@ final class AssertJRules {
    }
  }

+  ////////////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////////////
+  // BELOW: Generated code.
+
+  //
+  // ObjectEnumerableAssert: containsAnyOf
+  //
+
+  static final class ObjectEnumerableContainsAnyOfTwoElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsAnyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2),
+              Arrays.asList(e1, e2),
+              ImmutableSet.of(e1, e2),
+              ImmutableMultiset.of(e1, e2)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsAnyOf(e1, e2);
+    }
+  }
+
+  static final class ObjectEnumerableContainsAnyOfThreeElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsAnyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3),
+              Arrays.asList(e1, e2, e3),
+              ImmutableSet.of(e1, e2, e3),
+              ImmutableMultiset.of(e1, e2, e3)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsAnyOf(e1, e2, e3);
+    }
+  }
+
+  static final class ObjectEnumerableContainsAnyOfFourElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsAnyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4),
+              Arrays.asList(e1, e2, e3, e4),
+              ImmutableSet.of(e1, e2, e3, e4),
+              ImmutableMultiset.of(e1, e2, e3, e4)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsAnyOf(e1, e2, e3, e4);
+    }
+  }
+
+  // XXX: Add variants for 6+ elements?
+  static final class ObjectEnumerableContainsAnyOfFiveElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsAnyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4, e5),
+              Arrays.asList(e1, e2, e3, e4, e5),
+              ImmutableSet.of(e1, e2, e3, e4, e5),
+              ImmutableMultiset.of(e1, e2, e3, e4, e5)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsAnyOf(e1, e2, e3, e4, e5);
+    }
+  }
+
+  //
+  // ObjectEnumerableAssert: contains
+  //
+
+  static final class ObjectEnumerableContainsTwoElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsAll(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2),
+              Arrays.asList(e1, e2),
+              ImmutableSet.of(e1, e2),
+              ImmutableMultiset.of(e1, e2)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.contains(e1, e2);
+    }
+  }
+
+  static final class ObjectEnumerableContainsThreeElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsAll(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3),
+              Arrays.asList(e1, e2, e3),
+              ImmutableSet.of(e1, e2, e3),
+              ImmutableMultiset.of(e1, e2, e3)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.contains(e1, e2, e3);
+    }
+  }
+
+  static final class ObjectEnumerableContainsFourElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsAll(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4),
+              Arrays.asList(e1, e2, e3, e4),
+              ImmutableSet.of(e1, e2, e3, e4),
+              ImmutableMultiset.of(e1, e2, e3, e4)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.contains(e1, e2, e3, e4);
+    }
+  }
+
+  // XXX: Add variants for 6+ elements?
+  static final class ObjectEnumerableContainsFiveElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsAll(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4, e5),
+              Arrays.asList(e1, e2, e3, e4, e5),
+              ImmutableSet.of(e1, e2, e3, e4, e5),
+              ImmutableMultiset.of(e1, e2, e3, e4, e5)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.contains(e1, e2, e3, e4, e5);
+    }
+  }
+
+  //
+  // ObjectEnumerableAssert: containsExactly
+  //
+
+  static final class ObjectEnumerableContainsExactlyTwoElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsExactlyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2),
+              Arrays.asList(e1, e2),
+              ImmutableSet.of(e1, e2),
+              ImmutableMultiset.of(e1, e2)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsExactly(e1, e2);
+    }
+  }
+
+  static final class ObjectEnumerableContainsExactlyThreeElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsExactlyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3),
+              Arrays.asList(e1, e2, e3),
+              ImmutableSet.of(e1, e2, e3),
+              ImmutableMultiset.of(e1, e2, e3)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsExactly(e1, e2, e3);
+    }
+  }
+
+  static final class ObjectEnumerableContainsExactlyFourElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsExactlyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4),
+              Arrays.asList(e1, e2, e3, e4),
+              ImmutableSet.of(e1, e2, e3, e4),
+              ImmutableMultiset.of(e1, e2, e3, e4)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsExactly(e1, e2, e3, e4);
+    }
+  }
+
+  // XXX: Add variants for 6+ elements?
+  static final class ObjectEnumerableContainsExactlyFiveElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsExactlyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4, e5),
+              Arrays.asList(e1, e2, e3, e4, e5),
+              ImmutableSet.of(e1, e2, e3, e4, e5),
+              ImmutableMultiset.of(e1, e2, e3, e4, e5)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsExactly(e1, e2, e3, e4, e5);
+    }
+  }
+
+  //
+  // ObjectEnumerableAssert: containsExactlyInAnyOrder
+  //
+
+  static final class ObjectEnumerableContainsExactlyInAnyOrderTwoElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsExactlyInAnyOrderElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2),
+              Arrays.asList(e1, e2),
+              ImmutableSet.of(e1, e2),
+              ImmutableMultiset.of(e1, e2)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsExactlyInAnyOrder(e1, e2);
+    }
+  }
+
+  static final class ObjectEnumerableContainsExactlyInAnyOrderThreeElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsExactlyInAnyOrderElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3),
+              Arrays.asList(e1, e2, e3),
+              ImmutableSet.of(e1, e2, e3),
+              ImmutableMultiset.of(e1, e2, e3)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsExactlyInAnyOrder(e1, e2, e3);
+    }
+  }
+
+  static final class ObjectEnumerableContainsExactlyInAnyOrderFourElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsExactlyInAnyOrderElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4),
+              Arrays.asList(e1, e2, e3, e4),
+              ImmutableSet.of(e1, e2, e3, e4),
+              ImmutableMultiset.of(e1, e2, e3, e4)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsExactlyInAnyOrder(e1, e2, e3, e4);
+    }
+  }
+
+  // XXX: Add variants for 6+ elements?
+  static final class ObjectEnumerableContainsExactlyInAnyOrderFiveElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsExactlyInAnyOrderElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4, e5),
+              Arrays.asList(e1, e2, e3, e4, e5),
+              ImmutableSet.of(e1, e2, e3, e4, e5),
+              ImmutableMultiset.of(e1, e2, e3, e4, e5)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsExactlyInAnyOrder(e1, e2, e3, e4, e5);
+    }
+  }
+
+  //
+  // ObjectEnumerableAssert: containsSequence
+  //
+
+  static final class ObjectEnumerableContainsSequenceTwoElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsSequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2),
+              Arrays.asList(e1, e2),
+              ImmutableSet.of(e1, e2),
+              ImmutableMultiset.of(e1, e2)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsSequence(e1, e2);
+    }
+  }
+
+  static final class ObjectEnumerableContainsSequenceThreeElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsSequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3),
+              Arrays.asList(e1, e2, e3),
+              ImmutableSet.of(e1, e2, e3),
+              ImmutableMultiset.of(e1, e2, e3)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsSequence(e1, e2, e3);
+    }
+  }
+
+  static final class ObjectEnumerableContainsSequenceFourElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsSequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4),
+              Arrays.asList(e1, e2, e3, e4),
+              ImmutableSet.of(e1, e2, e3, e4),
+              ImmutableMultiset.of(e1, e2, e3, e4)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsSequence(e1, e2, e3, e4);
+    }
+  }
+
+  // XXX: Add variants for 6+ elements?
+  static final class ObjectEnumerableContainsSequenceFiveElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsSequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4, e5),
+              Arrays.asList(e1, e2, e3, e4, e5),
+              ImmutableSet.of(e1, e2, e3, e4, e5),
+              ImmutableMultiset.of(e1, e2, e3, e4, e5)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsSequence(e1, e2, e3, e4, e5);
+    }
+  }
+
+  //
+  // ObjectEnumerableAssert: containsSubsequence
+  //
+
+  static final class ObjectEnumerableContainsSubsequenceTwoElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsSubsequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2),
+              Arrays.asList(e1, e2),
+              ImmutableSet.of(e1, e2),
+              ImmutableMultiset.of(e1, e2)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsSubsequence(e1, e2);
+    }
+  }
+
+  static final class ObjectEnumerableContainsSubsequenceThreeElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsSubsequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3),
+              Arrays.asList(e1, e2, e3),
+              ImmutableSet.of(e1, e2, e3),
+              ImmutableMultiset.of(e1, e2, e3)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsSubsequence(e1, e2, e3);
+    }
+  }
+
+  static final class ObjectEnumerableContainsSubsequenceFourElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsSubsequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4),
+              Arrays.asList(e1, e2, e3, e4),
+              ImmutableSet.of(e1, e2, e3, e4),
+              ImmutableMultiset.of(e1, e2, e3, e4)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsSubsequence(e1, e2, e3, e4);
+    }
+  }
+
+  // XXX: Add variants for 6+ elements?
+  static final class ObjectEnumerableContainsSubsequenceFiveElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsSubsequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4, e5),
+              Arrays.asList(e1, e2, e3, e4, e5),
+              ImmutableSet.of(e1, e2, e3, e4, e5),
+              ImmutableMultiset.of(e1, e2, e3, e4, e5)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsSubsequence(e1, e2, e3, e4, e5);
+    }
+  }
+
+  //
+  // ObjectEnumerableAssert: doesNotContain
+  //
+
+  static final class ObjectEnumerableDoesNotContainTwoElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.doesNotContainAnyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2),
+              Arrays.asList(e1, e2),
+              ImmutableSet.of(e1, e2),
+              ImmutableMultiset.of(e1, e2)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.doesNotContain(e1, e2);
+    }
+  }
+
+  static final class ObjectEnumerableDoesNotContainThreeElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.doesNotContainAnyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3),
+              Arrays.asList(e1, e2, e3),
+              ImmutableSet.of(e1, e2, e3),
+              ImmutableMultiset.of(e1, e2, e3)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.doesNotContain(e1, e2, e3);
+    }
+  }
+
+  static final class ObjectEnumerableDoesNotContainFourElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.doesNotContainAnyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4),
+              Arrays.asList(e1, e2, e3, e4),
+              ImmutableSet.of(e1, e2, e3, e4),
+              ImmutableMultiset.of(e1, e2, e3, e4)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.doesNotContain(e1, e2, e3, e4);
+    }
+  }
+
+  // XXX: Add variants for 6+ elements?
+  static final class ObjectEnumerableDoesNotContainFiveElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.doesNotContainAnyElementsOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4, e5),
+              Arrays.asList(e1, e2, e3, e4, e5),
+              ImmutableSet.of(e1, e2, e3, e4, e5),
+              ImmutableMultiset.of(e1, e2, e3, e4, e5)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.doesNotContain(e1, e2, e3, e4, e5);
+    }
+  }
+
+  //
+  // ObjectEnumerableAssert: doesNotContainSequence
+  //
+
+  static final class ObjectEnumerableDoesNotContainSequenceTwoElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.doesNotContainSequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2),
+              Arrays.asList(e1, e2),
+              ImmutableSet.of(e1, e2),
+              ImmutableMultiset.of(e1, e2)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.doesNotContainSequence(e1, e2);
+    }
+  }
+
+  static final class ObjectEnumerableDoesNotContainSequenceThreeElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.doesNotContainSequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3),
+              Arrays.asList(e1, e2, e3),
+              ImmutableSet.of(e1, e2, e3),
+              ImmutableMultiset.of(e1, e2, e3)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.doesNotContainSequence(e1, e2, e3);
+    }
+  }
+
+  static final class ObjectEnumerableDoesNotContainSequenceFourElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.doesNotContainSequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4),
+              Arrays.asList(e1, e2, e3, e4),
+              ImmutableSet.of(e1, e2, e3, e4),
+              ImmutableMultiset.of(e1, e2, e3, e4)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.doesNotContainSequence(e1, e2, e3, e4);
+    }
+  }
+
+  // XXX: Add variants for 6+ elements?
+  static final class ObjectEnumerableDoesNotContainSequenceFiveElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.doesNotContainSequence(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4, e5),
+              Arrays.asList(e1, e2, e3, e4, e5),
+              ImmutableSet.of(e1, e2, e3, e4, e5),
+              ImmutableMultiset.of(e1, e2, e3, e4, e5)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.doesNotContainSequence(e1, e2, e3, e4, e5);
+    }
+  }
+
+  //
+  // ObjectEnumerableAssert: containsOnly
+  //
+
+  static final class ObjectEnumerableContainsOnlyTwoElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.hasSameElementsAs(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2),
+              Arrays.asList(e1, e2),
+              ImmutableSet.of(e1, e2),
+              ImmutableMultiset.of(e1, e2)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.containsOnly(e1, e2);
+    }
+  }
+
+  static final class ObjectEnumerableContainsOnlyThreeElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.hasSameElementsAs(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3),
+              Arrays.asList(e1, e2, e3),
+              ImmutableSet.of(e1, e2, e3),
+              ImmutableMultiset.of(e1, e2, e3)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.containsOnly(e1, e2, e3);
+    }
+  }
+
+  static final class ObjectEnumerableContainsOnlyFourElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.hasSameElementsAs(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4),
+              Arrays.asList(e1, e2, e3, e4),
+              ImmutableSet.of(e1, e2, e3, e4),
+              ImmutableMultiset.of(e1, e2, e3, e4)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.containsOnly(e1, e2, e3, e4);
+    }
+  }
+
+  // XXX: Add variants for 6+ elements?
+  static final class ObjectEnumerableContainsOnlyFiveElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.hasSameElementsAs(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4, e5),
+              Arrays.asList(e1, e2, e3, e4, e5),
+              ImmutableSet.of(e1, e2, e3, e4, e5),
+              ImmutableMultiset.of(e1, e2, e3, e4, e5)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.containsOnly(e1, e2, e3, e4, e5);
+    }
+  }
+
+  //
+  // ObjectEnumerableAssert: isSubsetOf
+  //
+
+  static final class ObjectEnumerableIsSubsetOfTwoElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.isSubsetOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2),
+              Arrays.asList(e1, e2),
+              ImmutableSet.of(e1, e2),
+              ImmutableMultiset.of(e1, e2)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2) {
+      return iterAssert.isSubsetOf(e1, e2);
+    }
+  }
+
+  static final class ObjectEnumerableIsSubsetOfThreeElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.isSubsetOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3),
+              Arrays.asList(e1, e2, e3),
+              ImmutableSet.of(e1, e2, e3),
+              ImmutableMultiset.of(e1, e2, e3)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3) {
+      return iterAssert.isSubsetOf(e1, e2, e3);
+    }
+  }
+
+  static final class ObjectEnumerableIsSubsetOfFourElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.isSubsetOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4),
+              Arrays.asList(e1, e2, e3, e4),
+              ImmutableSet.of(e1, e2, e3, e4),
+              ImmutableMultiset.of(e1, e2, e3, e4)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4) {
+      return iterAssert.isSubsetOf(e1, e2, e3, e4);
+    }
+  }
+
+  // XXX: Add variants for 6+ elements?
+  static final class ObjectEnumerableIsSubsetOfFiveElements<S, T extends S> {
+    @BeforeTemplate
+    ObjectEnumerableAssert<?, S> before(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.isSubsetOf(
+          Refaster.anyOf(
+              ImmutableList.of(e1, e2, e3, e4, e5),
+              Arrays.asList(e1, e2, e3, e4, e5),
+              ImmutableSet.of(e1, e2, e3, e4, e5),
+              ImmutableMultiset.of(e1, e2, e3, e4, e5)));
+    }
+
+    @AfterTemplate
+    @SuppressWarnings("unchecked")
+    ObjectEnumerableAssert<?, S> after(
+        ObjectEnumerableAssert<?, S> iterAssert, T e1, T e2, T e3, T e4, T e5) {
+      return iterAssert.isSubsetOf(e1, e2, e3, e4, e5);
+    }
+  }
+
+  ////////////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////////////
+  // Above: Generated code.
+
  ////////////////////////////////////////////////////////////////////////////
  ////////////////////////////////////////////////////////////////////////////
  // Organize the code below.
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJStringRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJStringRules.java
@@ -12,7 +12,6 @@ import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import org.assertj.core.api.AbstractAssert;
-import org.assertj.core.api.AbstractBooleanAssert;
 import org.assertj.core.api.AbstractStringAssert;
 import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation;

@@ -70,32 +69,6 @@ final class AssertJStringRules {
    }
  }

-  static final class AssertThatStringContains {
-    @BeforeTemplate
-    AbstractBooleanAssert<?> before(String string, String substring) {
-      return assertThat(string.contains(substring)).isTrue();
-    }
-
-    @AfterTemplate
-    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
-    AbstractStringAssert<?> after(String string, String substring) {
-      return assertThat(string).contains(substring);
-    }
-  }
-
-  static final class AssertThatStringDoesNotContain {
-    @BeforeTemplate
-    AbstractBooleanAssert<?> before(String string, String substring) {
-      return assertThat(string.contains(substring)).isFalse();
-    }
-
-    @AfterTemplate
-    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
-    AbstractStringAssert<?> after(String string, String substring) {
-      return assertThat(string).doesNotContain(substring);
-    }
-  }
-
  static final class AssertThatMatches {
    @BeforeTemplate
    AbstractAssert<?, ?> before(String string, String regex) {
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRules.java
@@ -7,10 +7,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.assertj.core.api.Assertions.assertThatNullPointerException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.InstanceOfAssertFactories.throwable;
-import static org.assertj.core.api.InstanceOfAssertFactories.type;

-import com.google.errorprone.refaster.Refaster;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
 import com.google.errorprone.refaster.annotation.Repeated;
@@ -19,7 +16,6 @@ import java.io.IOException;
 import org.assertj.core.api.AbstractObjectAssert;
 import org.assertj.core.api.AbstractThrowableAssert;
 import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
-import org.assertj.core.api.ThrowableAssertAlternative;
 import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation;

 /**
@@ -35,21 +31,6 @@ import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation;
 final class AssertJThrowingCallableRules {
  private AssertJThrowingCallableRules() {}

-  static final class AssertThatThrownByIsInstanceOf<T extends Throwable> {
-    @BeforeTemplate
-    void before(ThrowingCallable throwingCallable, Class<T> exceptionType) {
-      Refaster.anyOf(
-          assertThatThrownBy(throwingCallable).asInstanceOf(throwable(exceptionType)),
-          assertThatThrownBy(throwingCallable).asInstanceOf(type(exceptionType)));
-    }
-
-    @AfterTemplate
-    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
-    void after(ThrowingCallable throwingCallable, Class<T> exceptionType) {
-      assertThatThrownBy(throwingCallable).isInstanceOf(exceptionType);
-    }
-  }
-
  static final class AssertThatThrownByIllegalArgumentException {
    @BeforeTemplate
    AbstractObjectAssert<?, ?> before(ThrowingCallable throwingCallable) {
@@ -80,27 +61,6 @@ final class AssertJThrowingCallableRules {
    }
  }

-  static final class AssertThatThrownByIllegalArgumentExceptionRootCauseHasMessage {
-    @BeforeTemplate
-    @SuppressWarnings(
-        "AssertThatThrownByIllegalArgumentException" /* This is a more specific template. */)
-    AbstractObjectAssert<?, ?> before(ThrowingCallable throwingCallable, String message) {
-      return assertThatIllegalArgumentException()
-          .isThrownBy(throwingCallable)
-          .havingRootCause()
-          .withMessage(message);
-    }
-
-    @AfterTemplate
-    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
-    AbstractObjectAssert<?, ?> after(ThrowingCallable throwingCallable, String message) {
-      return assertThatThrownBy(throwingCallable)
-          .isInstanceOf(IllegalArgumentException.class)
-          .rootCause()
-          .hasMessage(message);
-    }
-  }
-
  static final class AssertThatThrownByIllegalArgumentExceptionHasMessageParameters {
    @BeforeTemplate
    @SuppressWarnings(
@@ -211,27 +171,6 @@ final class AssertJThrowingCallableRules {
    }
  }

-  static final class AssertThatThrownByIllegalStateExceptionRootCauseHasMessage {
-    @BeforeTemplate
-    @SuppressWarnings(
-        "AssertThatThrownByIllegalStateException" /* This is a more specific template. */)
-    AbstractObjectAssert<?, ?> before(ThrowingCallable throwingCallable, String message) {
-      return assertThatIllegalStateException()
-          .isThrownBy(throwingCallable)
-          .havingRootCause()
-          .withMessage(message);
-    }
-
-    @AfterTemplate
-    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
-    AbstractObjectAssert<?, ?> after(ThrowingCallable throwingCallable, String message) {
-      return assertThatThrownBy(throwingCallable)
-          .isInstanceOf(IllegalStateException.class)
-          .rootCause()
-          .hasMessage(message);
-    }
-  }
-
  static final class AssertThatThrownByIllegalStateExceptionHasMessageParameters {
    @BeforeTemplate
    @SuppressWarnings(
@@ -340,27 +279,6 @@ final class AssertJThrowingCallableRules {
    }
  }

-  static final class AssertThatThrownByNullPointerExceptionRootCauseHasMessage {
-    @BeforeTemplate
-    @SuppressWarnings(
-        "AssertThatThrownByNullPointerException" /* This is a more specific template. */)
-    AbstractObjectAssert<?, ?> before(ThrowingCallable throwingCallable, String message) {
-      return assertThatNullPointerException()
-          .isThrownBy(throwingCallable)
-          .havingRootCause()
-          .withMessage(message);
-    }
-
-    @AfterTemplate
-    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
-    AbstractObjectAssert<?, ?> after(ThrowingCallable throwingCallable, String message) {
-      return assertThatThrownBy(throwingCallable)
-          .isInstanceOf(NullPointerException.class)
-          .rootCause()
-          .hasMessage(message);
-    }
-  }
-
  static final class AssertThatThrownByNullPointerExceptionHasMessageParameters {
    @BeforeTemplate
    @SuppressWarnings(
@@ -468,26 +386,6 @@ final class AssertJThrowingCallableRules {
    }
  }

-  static final class AssertThatThrownByIOExceptionRootCauseHasMessage {
-    @BeforeTemplate
-    @SuppressWarnings("AssertThatThrownByIOException" /* This is a more specific template. */)
-    AbstractObjectAssert<?, ?> before(ThrowingCallable throwingCallable, String message) {
-      return assertThatIOException()
-          .isThrownBy(throwingCallable)
-          .havingRootCause()
-          .withMessage(message);
-    }
-
-    @AfterTemplate
-    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
-    AbstractObjectAssert<?, ?> after(ThrowingCallable throwingCallable, String message) {
-      return assertThatThrownBy(throwingCallable)
-          .isInstanceOf(IOException.class)
-          .rootCause()
-          .hasMessage(message);
-    }
-  }
-
  static final class AssertThatThrownByIOExceptionHasMessageParameters {
    @BeforeTemplate
    @SuppressWarnings("AssertThatThrownByIOException" /* This is a more specific template. */)
@@ -554,24 +452,24 @@ final class AssertJThrowingCallableRules {
    }
  }

-  static final class AssertThatThrownByAsInstanceOfThrowable<T extends Throwable> {
+  static final class AssertThatThrownBy {
    @BeforeTemplate
-    ThrowableAssertAlternative<T> before(
-        ThrowingCallable throwingCallable, Class<T> exceptionType) {
+    AbstractObjectAssert<?, ?> before(
+        ThrowingCallable throwingCallable, Class<? extends Throwable> exceptionType) {
      return assertThatExceptionOfType(exceptionType).isThrownBy(throwingCallable);
    }

    @AfterTemplate
    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
-    AbstractThrowableAssert<?, T> after(ThrowingCallable throwingCallable, Class<T> exceptionType) {
-      return assertThatThrownBy(throwingCallable).asInstanceOf(throwable(exceptionType));
+    AbstractObjectAssert<?, ?> after(
+        ThrowingCallable throwingCallable, Class<? extends Throwable> exceptionType) {
+      return assertThatThrownBy(throwingCallable).isInstanceOf(exceptionType);
    }
  }

  static final class AssertThatThrownByHasMessage {
    @BeforeTemplate
-    @SuppressWarnings(
-        "AssertThatThrownByAsInstanceOfThrowable" /* This is a more specific template. */)
+    @SuppressWarnings("AssertThatThrownBy" /* This is a more specific template. */)
    AbstractObjectAssert<?, ?> before(
        ThrowingCallable throwingCallable,
        Class<? extends Throwable> exceptionType,
@@ -591,37 +489,9 @@ final class AssertJThrowingCallableRules {
    }
  }

-  static final class AssertThatThrownByRootCauseHasMessage {
-    @BeforeTemplate
-    @SuppressWarnings(
-        "AssertThatThrownByAsInstanceOfThrowable" /* This is a more specific template. */)
-    AbstractObjectAssert<?, ?> before(
-        ThrowingCallable throwingCallable,
-        Class<? extends Throwable> exceptionType,
-        String message) {
-      return assertThatExceptionOfType(exceptionType)
-          .isThrownBy(throwingCallable)
-          .havingRootCause()
-          .withMessage(message);
-    }
-
-    @AfterTemplate
-    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
-    AbstractObjectAssert<?, ?> after(
-        ThrowingCallable throwingCallable,
-        Class<? extends Throwable> exceptionType,
-        String message) {
-      return assertThatThrownBy(throwingCallable)
-          .isInstanceOf(exceptionType)
-          .rootCause()
-          .hasMessage(message);
-    }
-  }
-
  static final class AssertThatThrownByHasMessageParameters {
    @BeforeTemplate
-    @SuppressWarnings(
-        "AssertThatThrownByAsInstanceOfThrowable" /* This is a more specific template. */)
+    @SuppressWarnings("AssertThatThrownBy" /* This is a more specific template. */)
    AbstractObjectAssert<?, ?> before(
        ThrowingCallable throwingCallable,
        Class<? extends Throwable> exceptionType,
@@ -647,8 +517,7 @@ final class AssertJThrowingCallableRules {

  static final class AssertThatThrownByHasMessageStartingWith {
    @BeforeTemplate
-    @SuppressWarnings(
-        "AssertThatThrownByAsInstanceOfThrowable" /* This is a more specific template. */)
+    @SuppressWarnings("AssertThatThrownBy" /* This is a more specific template. */)
    AbstractObjectAssert<?, ?> before(
        ThrowingCallable throwingCallable,
        Class<? extends Throwable> exceptionType,
@@ -672,8 +541,7 @@ final class AssertJThrowingCallableRules {

  static final class AssertThatThrownByHasMessageContaining {
    @BeforeTemplate
-    @SuppressWarnings(
-        "AssertThatThrownByAsInstanceOfThrowable" /* This is a more specific template. */)
+    @SuppressWarnings("AssertThatThrownBy" /* This is a more specific template. */)
    AbstractObjectAssert<?, ?> before(
        ThrowingCallable throwingCallable,
        Class<? extends Throwable> exceptionType,
@@ -697,8 +565,7 @@ final class AssertJThrowingCallableRules {

  static final class AssertThatThrownByHasMessageNotContaining {
    @BeforeTemplate
-    @SuppressWarnings(
-        "AssertThatThrownByAsInstanceOfThrowable" /* This is a more specific template. */)
+    @SuppressWarnings("AssertThatThrownBy" /* This is a more specific template. */)
    AbstractObjectAssert<?, ?> before(
        ThrowingCallable throwingCallable,
        Class<? extends Throwable> exceptionType,
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssortedRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssortedRules.java
@@ -1,6 +1,8 @@
 package tech.picnic.errorprone.refasterrules;

 import static com.google.common.base.Preconditions.checkElementIndex;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.Sets.toImmutableEnumSet;
 import static com.google.errorprone.refaster.ImportPolicy.STATIC_IMPORT_ALWAYS;
 import static java.util.Collections.disjoint;
 import static java.util.Objects.checkIndex;
@@ -68,6 +70,28 @@ final class AssortedRules {
    }
  }

+  /**
+   * Use {@link Sets#toImmutableEnumSet()} when possible, as it is more efficient than {@link
+   * ImmutableSet#toImmutableSet()} and produces a more compact object.
+   *
+   * <p><strong>Warning:</strong> this rewrite rule is not completely behavior preserving: while the
+   * original code produces a set that iterates over the elements in encounter order, the
+   * replacement code iterates over the elements in enum definition order.
+   */
+  // XXX: ^ Consider emitting a comment warning about this fact?
+  static final class StreamToImmutableEnumSet<T extends Enum<T>> {
+    @BeforeTemplate
+    ImmutableSet<T> before(Stream<T> stream) {
+      return stream.collect(toImmutableSet());
+    }
+
+    @AfterTemplate
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
+    ImmutableSet<T> after(Stream<T> stream) {
+      return stream.collect(toImmutableEnumSet());
+    }
+  }
+
  /** Prefer {@link Iterators#getNext(Iterator, Object)} over more contrived alternatives. */
  static final class IteratorGetNextOrDefault<T> {
    @BeforeTemplate
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/BugCheckerRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/BugCheckerRules.java
@@ -9,9 +9,7 @@ import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
 import com.sun.tools.javac.util.Constants;
 import com.sun.tools.javac.util.Convert;
-import javax.lang.model.element.Name;
 import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation;
-import tech.picnic.errorprone.utils.SourceCode;

 /** Refaster rules related to {@link com.google.errorprone.bugpatterns.BugChecker} classes. */
@OnlineDocumentation
@@ -57,44 +55,16 @@ final class BugCheckerRules {
    }
  }

-  /**
-   * Prefer {@link SourceCode#toStringConstantExpression(Object,
-   * com.google.errorprone.VisitorState)} over alternatives that unnecessarily escape single quote
-   * characters.
-   */
+  /** Prefer using the {@link Constants} API over more verbose alternatives. */
  static final class ConstantsFormat {
-    @BeforeTemplate
-    String before(CharSequence value) {
-      return Constants.format(value);
-    }
-
    @BeforeTemplate
    String before(String value) {
      return String.format("\"%s\"", Convert.quote(value));
    }

    @AfterTemplate
-    String after(CharSequence value) {
-      return SourceCode.toStringConstantExpression(
-          value, Refaster.emitCommentBefore("REPLACEME", null));
-    }
-  }
-
-  /** Prefer {@link Name#contentEquals(CharSequence)} over more verbose alternatives. */
-  static final class NameContentEquals {
-    @BeforeTemplate
-    boolean before(Name name, CharSequence string) {
-      return name.toString().equals(string.toString());
-    }
-
-    @BeforeTemplate
-    boolean before(Name name, String string) {
-      return name.toString().equals(string);
-    }
-
-    @AfterTemplate
-    boolean after(Name name, CharSequence string) {
-      return name.contentEquals(string);
+    String after(String value) {
+      return Constants.format(value);
    }
  }
 }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/CharSequenceRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/CharSequenceRules.java
@@ -1,33 +0,0 @@
-package tech.picnic.errorprone.refasterrules;
-
-import com.google.errorprone.refaster.Refaster;
-import com.google.errorprone.refaster.annotation.AfterTemplate;
-import com.google.errorprone.refaster.annotation.AlsoNegation;
-import com.google.errorprone.refaster.annotation.BeforeTemplate;
-import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation;
-
-/** Refaster rules related to expressions dealing with {@link CharSequence}s. */
-@OnlineDocumentation
-final class CharSequenceRules {
-  private CharSequenceRules() {}
-
-  /**
-   * Prefer {@link CharSequence#isEmpty()} over alternatives that consult the char sequence's
-   * length.
-   */
-  // XXX: Drop this rule once we (and OpenRewrite) no longer support projects targeting Java 14 or
-  // below.
-  static final class CharSequenceIsEmpty {
-    @BeforeTemplate
-    boolean before(CharSequence charSequence) {
-      return Refaster.anyOf(
-          charSequence.length() == 0, charSequence.length() <= 0, charSequence.length() < 1);
-    }
-
-    @AfterTemplate
-    @AlsoNegation
-    boolean after(CharSequence charSequence) {
-      return charSequence.isEmpty();
-    }
-  }
-}
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ClassRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ClassRules.java
@@ -3,7 +3,6 @@ package tech.picnic.errorprone.refasterrules;
 import com.google.errorprone.refaster.Refaster;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation;

@@ -38,12 +37,7 @@ final class ClassRules {
    }
  }

-  /**
-   * Prefer {@link Class#isInstance(Object)} method references over lambda expressions that require
-   * naming a variable.
-   */
-  // XXX: Once the `ClassReferenceIsInstancePredicate` rule is dropped, rename this rule to just
-  // `ClassIsInstancePredicate`.
+  /** Prefer {@link Class#isInstance(Object)} method references over more verbose alternatives. */
  static final class ClassLiteralIsInstancePredicate<T, S> {
    @BeforeTemplate
    Predicate<S> before() {
@@ -56,11 +50,7 @@ final class ClassRules {
    }
  }

-  /**
-   * Prefer {@link Class#isInstance(Object)} method references over lambda expressions that require
-   * naming a variable.
-   */
-  // XXX: Drop this rule once the `MethodReferenceUsage` rule is enabled by default.
+  /** Prefer {@link Class#isInstance(Object)} method references over more verbose alternatives. */
  static final class ClassReferenceIsInstancePredicate<T, S> {
    @BeforeTemplate
    Predicate<S> before(Class<T> clazz) {
@@ -72,21 +62,4 @@ final class ClassRules {
      return clazz::isInstance;
    }
  }
-
-  /**
-   * Prefer {@link Class#cast(Object)} method references over lambda expressions that require naming
-   * a variable.
-   */
-  // XXX: Drop this rule once the `MethodReferenceUsage` rule is enabled by default.
-  static final class ClassReferenceCast<T, S> {
-    @BeforeTemplate
-    Function<T, S> before(Class<? extends S> clazz) {
-      return o -> clazz.cast(o);
-    }
-
-    @AfterTemplate
-    Function<T, S> after(Class<? extends S> clazz) {
-      return clazz::cast;
-    }
-  }
 }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/CollectionRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/CollectionRules.java
@@ -8,9 +8,7 @@ import com.google.errorprone.refaster.Refaster;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.AlsoNegation;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
-import com.google.errorprone.refaster.annotation.NotMatches;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -23,7 +21,6 @@ import java.util.function.Consumer;
 import java.util.function.IntFunction;
 import java.util.stream.Stream;
 import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation;
-import tech.picnic.errorprone.refaster.matchers.IsRefasterAsVarargs;

 /** Refaster rules related to expressions dealing with (arbitrary) collections. */
 // XXX: There are other Guava `Iterables` methods that should not be called if the input is known to
@@ -38,21 +35,13 @@ final class CollectionRules {
   */
  static final class CollectionIsEmpty<T> {
    @BeforeTemplate
-    @SuppressWarnings({
-      "java:S1155" /* This violation will be rewritten. */,
-      "LexicographicalAnnotationAttributeListing" /* `key-*` entry must remain last. */,
-      "OptionalFirstCollectionElement" /* This is a more specific template. */,
-      "StreamFindAnyIsEmpty" /* This is a more specific template. */,
-      "key-to-resolve-AnnotationUseStyle-and-TrailingComment-check-conflict"
-    })
+    @SuppressWarnings("java:S1155" /* This violation will be rewritten. */)
    boolean before(Collection<T> collection) {
      return Refaster.anyOf(
          collection.size() == 0,
          collection.size() <= 0,
          collection.size() < 1,
-          Iterables.isEmpty(collection),
-          collection.stream().findAny().isEmpty(),
-          collection.stream().findFirst().isEmpty());
+          Iterables.isEmpty(collection));
    }

    @BeforeTemplate
@@ -187,24 +176,6 @@ final class CollectionRules {
    }
  }

-  /** Don't unnecessarily call {@link Stream#distinct()} on an already-unique stream of elements. */
-  // XXX: This rule assumes that the `Set` relies on `Object#equals`, rather than a custom
-  // equivalence relation.
-  // XXX: Expressions that drop or reorder elements from the stream, such as `.filter`, `.skip` and
-  // `sorted`, can similarly be simplified. Covering all cases is better done using an Error Prone
-  // check.
-  static final class SetStream<T> {
-    @BeforeTemplate
-    Stream<?> before(Set<T> set) {
-      return set.stream().distinct();
-    }
-
-    @AfterTemplate
-    Stream<?> after(Set<T> set) {
-      return set.stream();
-    }
-  }
-
  /** Prefer {@link ArrayList#ArrayList(Collection)} over the Guava alternative. */
  @SuppressWarnings(
      "NonApiType" /* Matching against `List` would unnecessarily constrain the rule. */)
@@ -297,23 +268,6 @@ final class CollectionRules {
    }
  }

-  /** Prefer {@link Arrays#asList(Object[])} over more contrived alternatives. */
-  // XXX: Consider moving this rule to `ImmutableListRules` and having it suggest
-  // `ImmutableList#copyOf`. That would retain immutability, at the cost of no longer handling
-  // `null`s.
-  static final class ArraysAsList<T> {
-    // XXX: This expression produces an unmodifiable list, while the alternative doesn't.
-    @BeforeTemplate
-    List<T> before(@NotMatches(IsRefasterAsVarargs.class) T[] array) {
-      return Arrays.stream(array).toList();
-    }
-
-    @AfterTemplate
-    List<T> after(T[] array) {
-      return Arrays.asList(array);
-    }
-  }
-
  /** Prefer calling {@link Collection#toArray()} over more contrived alternatives. */
  static final class CollectionToArray<T> {
    @BeforeTemplate
@@ -365,29 +319,25 @@ final class CollectionRules {
    }
  }

-  /** Prefer {@link Collection#iterator()} over more contrived or less efficient alternatives. */
-  static final class CollectionIterator<T> {
-    @BeforeTemplate
-    Iterator<T> before(Collection<T> collection) {
-      return collection.stream().iterator();
-    }
-
+  /**
+   * Don't call {@link ImmutableCollection#asList()} if {@link ImmutableCollection#iterator()} is
+   * called on the result; call it directly.
+   */
+  static final class ImmutableCollectionIterator<T> {
    @BeforeTemplate
    Iterator<T> before(ImmutableCollection<T> collection) {
      return collection.asList().iterator();
    }

    @AfterTemplate
-    Iterator<T> after(Collection<T> collection) {
+    Iterator<T> after(ImmutableCollection<T> collection) {
      return collection.iterator();
    }
  }

  /**
   * Don't use the ternary operator to extract the first element of a possibly-empty {@link
-   * Collection} as an {@link Optional}, and (when applicable) prefer {@link Stream#findFirst()}
-   * over {@link Stream#findAny()} to communicate that the collection's first element (if any,
-   * according to iteration order) will be returned.
+   * Collection} as an {@link Optional}.
   */
  static final class OptionalFirstCollectionElement<T> {
    @BeforeTemplate
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ComparatorRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ComparatorRules.java
@@ -16,18 +16,13 @@ import com.google.common.collect.ImmutableSet;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.refaster.Refaster;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
-import com.google.errorprone.refaster.annotation.AlsoNegation;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
 import com.google.errorprone.refaster.annotation.Matches;
-import com.google.errorprone.refaster.annotation.MayOptionallyUse;
-import com.google.errorprone.refaster.annotation.Placeholder;
 import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.List;
 import java.util.Optional;
 import java.util.function.BinaryOperator;
 import java.util.function.Function;
@@ -97,24 +92,6 @@ final class ComparatorRules {
    }
  }

-  /** Don't explicitly compare enums by their ordinal. */
-  abstract static class ComparingEnum<E extends Enum<E>, T> {
-    @Placeholder(allowsIdentity = true)
-    abstract E toEnumFunction(@MayOptionallyUse T value);
-
-    @BeforeTemplate
-    @SuppressWarnings("EnumOrdinal" /* This violation will be rewritten. */)
-    Comparator<T> before() {
-      return comparingInt(v -> toEnumFunction(v).ordinal());
-    }
-
-    @AfterTemplate
-    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
-    Comparator<T> after() {
-      return comparing(v -> toEnumFunction(v));
-    }
-  }
-
  /** Don't explicitly create {@link Comparator}s unnecessarily. */
  static final class ThenComparing<S, T extends Comparable<? super T>> {
    @BeforeTemplate
@@ -245,77 +222,18 @@ final class ComparatorRules {
    }
  }

-  /** Prefer {@link Collections#sort(List)} over more verbose alternatives. */
-  static final class CollectionsSort<T extends Comparable<? super T>> {
-    @BeforeTemplate
-    void before(List<T> collection) {
-      Collections.sort(collection, naturalOrder());
-    }
-
-    @AfterTemplate
-    void after(List<T> collection) {
-      Collections.sort(collection);
-    }
-  }
-
-  /** Prefer {@link Collections#min(Collection)} over more verbose alternatives. */
-  static final class CollectionsMin<T extends Comparable<? super T>> {
-    @BeforeTemplate
-    T before(Collection<T> collection) {
-      return Refaster.anyOf(
-          Collections.min(collection, naturalOrder()), Collections.max(collection, reverseOrder()));
-    }
-
-    @AfterTemplate
-    T after(Collection<T> collection) {
-      return Collections.min(collection);
-    }
-  }
-
  /**
   * Avoid unnecessary creation of a {@link Stream} to determine the minimum of a known collection
   * of values.
   */
-  static final class MinOfArray<S, T extends S> {
+  static final class MinOfVarargs<T> {
    @BeforeTemplate
-    T before(T[] array, Comparator<S> cmp) {
-      return Arrays.stream(array).min(cmp).orElseThrow();
-    }
-
-    @AfterTemplate
-    T after(T[] array, Comparator<S> cmp) {
-      return Collections.min(Arrays.asList(array), cmp);
-    }
-  }
-
-  /**
-   * Avoid unnecessary creation of a {@link Stream} to determine the minimum of a known collection
-   * of values.
-   */
-  static final class CollectionsMinWithComparator<S, T extends S> {
-    @BeforeTemplate
-    T before(Collection<T> collection, Comparator<S> cmp) {
-      return collection.stream().min(cmp).orElseThrow();
-    }
-
-    @AfterTemplate
-    T after(Collection<T> collection, Comparator<S> cmp) {
-      return Collections.min(collection, cmp);
-    }
-  }
-
-  /**
-   * Avoid unnecessary creation of a {@link Stream} to determine the minimum of a known collection
-   * of values.
-   */
-  static final class MinOfVarargs<S, T extends S> {
-    @BeforeTemplate
-    T before(@Repeated T value, Comparator<S> cmp) {
+    T before(@Repeated T value, Comparator<T> cmp) {
      return Stream.of(Refaster.asVarargs(value)).min(cmp).orElseThrow();
    }

    @AfterTemplate
-    T after(@Repeated T value, Comparator<S> cmp) {
+    T after(@Repeated T value, Comparator<T> cmp) {
      return Collections.min(Arrays.asList(value), cmp);
    }
  }
@@ -351,7 +269,7 @@ final class ComparatorRules {
  static final class MinOfPairCustomOrder<T> {
    @BeforeTemplate
    @SuppressWarnings("java:S1067" /* The conditional operators are independent. */)
-    T before(T value1, T value2, Comparator<? super T> cmp) {
+    T before(T value1, T value2, Comparator<T> cmp) {
      return Refaster.anyOf(
          cmp.compare(value1, value2) <= 0 ? value1 : value2,
          cmp.compare(value1, value2) > 0 ? value2 : value1,
@@ -366,69 +284,23 @@ final class ComparatorRules {
    }

    @AfterTemplate
-    T after(T value1, T value2, Comparator<? super T> cmp) {
+    T after(T value1, T value2, Comparator<T> cmp) {
      return Comparators.min(value1, value2, cmp);
    }
  }

-  /** Prefer {@link Collections#max(Collection)} over more verbose alternatives. */
-  static final class CollectionsMax<T extends Comparable<? super T>> {
-    @BeforeTemplate
-    T before(Collection<T> collection) {
-      return Refaster.anyOf(
-          Collections.max(collection, naturalOrder()), Collections.min(collection, reverseOrder()));
-    }
-
-    @AfterTemplate
-    T after(Collection<T> collection) {
-      return Collections.max(collection);
-    }
-  }
-
  /**
   * Avoid unnecessary creation of a {@link Stream} to determine the maximum of a known collection
   * of values.
   */
-  static final class MaxOfArray<S, T extends S> {
+  static final class MaxOfVarargs<T> {
    @BeforeTemplate
-    T before(T[] array, Comparator<S> cmp) {
-      return Arrays.stream(array).max(cmp).orElseThrow();
-    }
-
-    @AfterTemplate
-    T after(T[] array, Comparator<S> cmp) {
-      return Collections.max(Arrays.asList(array), cmp);
-    }
-  }
-
-  /**
-   * Avoid unnecessary creation of a {@link Stream} to determine the maximum of a known collection
-   * of values.
-   */
-  static final class CollectionsMaxWithComparator<S, T extends S> {
-    @BeforeTemplate
-    T before(Collection<T> collection, Comparator<S> cmp) {
-      return collection.stream().max(cmp).orElseThrow();
-    }
-
-    @AfterTemplate
-    T after(Collection<T> collection, Comparator<S> cmp) {
-      return Collections.max(collection, cmp);
-    }
-  }
-
-  /**
-   * Avoid unnecessary creation of a {@link Stream} to determine the maximum of a known collection
-   * of values.
-   */
-  static final class MaxOfVarargs<S, T extends S> {
-    @BeforeTemplate
-    T before(@Repeated T value, Comparator<S> cmp) {
+    T before(@Repeated T value, Comparator<T> cmp) {
      return Stream.of(Refaster.asVarargs(value)).max(cmp).orElseThrow();
    }

    @AfterTemplate
-    T after(@Repeated T value, Comparator<S> cmp) {
+    T after(@Repeated T value, Comparator<T> cmp) {
      return Collections.max(Arrays.asList(value), cmp);
    }
  }
@@ -464,7 +336,7 @@ final class ComparatorRules {
  static final class MaxOfPairCustomOrder<T> {
    @BeforeTemplate
    @SuppressWarnings("java:S1067" /* The conditional operators are independent. */)
-    T before(T value1, T value2, Comparator<? super T> cmp) {
+    T before(T value1, T value2, Comparator<T> cmp) {
      return Refaster.anyOf(
          cmp.compare(value1, value2) >= 0 ? value1 : value2,
          cmp.compare(value1, value2) < 0 ? value2 : value1,
@@ -479,7 +351,7 @@ final class ComparatorRules {
    }

    @AfterTemplate
-    T after(T value1, T value2, Comparator<? super T> cmp) {
+    T after(T value1, T value2, Comparator<T> cmp) {
      return Comparators.max(value1, value2, cmp);
    }
  }
@@ -547,34 +419,4 @@ final class ComparatorRules {
      return maxBy(naturalOrder());
    }
  }
-
-  /** Don't explicitly compare enums by their ordinal. */
-  static final class IsLessThan<E extends Enum<E>> {
-    @BeforeTemplate
-    @SuppressWarnings("EnumOrdinal" /* This violation will be rewritten. */)
-    boolean before(E value1, E value2) {
-      return value1.ordinal() < value2.ordinal();
-    }
-
-    @AfterTemplate
-    @AlsoNegation
-    boolean after(E value1, E value2) {
-      return value1.compareTo(value2) < 0;
-    }
-  }
-
-  /** Don't explicitly compare enums by their ordinal. */
-  static final class IsLessThanOrEqualTo<E extends Enum<E>> {
-    @BeforeTemplate
-    @SuppressWarnings("EnumOrdinal" /* This violation will be rewritten. */)
-    boolean before(E value1, E value2) {
-      return value1.ordinal() <= value2.ordinal();
-    }
-
-    @AfterTemplate
-    @AlsoNegation
-    boolean after(E value1, E value2) {
-      return value1.compareTo(value2) <= 0;
-    }
-  }
 }
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/EqualityRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/EqualityRules.java
@@ -1,6 +1,5 @@
 package tech.picnic.errorprone.refasterrules;

-import static java.util.function.Predicate.isEqual;
 import static java.util.function.Predicate.not;

 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -20,9 +19,9 @@ import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation;
 final class EqualityRules {
  private EqualityRules() {}

-  /** Prefer reference-based equality for enums. */
-  // Primitive value comparisons are not matched, because Error Prone flags those out of the box.
-  static final class EnumReferenceEquality<T extends Enum<T>> {
+  /** Prefer reference-based quality for enums. */
+  // Primitive value comparisons are not listed, because Error Prone flags those out of the box.
+  static final class PrimitiveOrReferenceEquality<T extends Enum<T>> {
    /**
     * Enums can be compared by reference. It is safe to do so even in the face of refactorings,
     * because if the type is ever converted to a non-enum, then Error-Prone will complain about any
@@ -31,9 +30,8 @@ final class EqualityRules {
    // XXX: This Refaster rule is the topic of https://github.com/google/error-prone/issues/559. We
    // work around the issue by selecting the "largest replacements". See the `Refaster` check.
    @BeforeTemplate
-    @SuppressWarnings("EnumOrdinal" /* This violation will be rewritten. */)
    boolean before(T a, T b) {
-      return Refaster.anyOf(a.equals(b), Objects.equals(a, b), a.ordinal() == b.ordinal());
+      return Refaster.anyOf(a.equals(b), Objects.equals(a, b));
    }

    @AfterTemplate
@@ -44,20 +42,6 @@ final class EqualityRules {
    }
  }

-  /** Prefer reference-based equality for enums. */
-  static final class EnumReferenceEqualityLambda<T extends Enum<T>> {
-    @BeforeTemplate
-    Predicate<T> before(T e) {
-      return Refaster.anyOf(isEqual(e), e::equals);
-    }
-
-    @AfterTemplate
-    @SuppressWarnings("java:S1698" /* Reference comparison is valid for enums. */)
-    Predicate<T> after(T e) {
-      return v -> v == e;
-    }
-  }
-
  /** Prefer {@link Object#equals(Object)} over the equivalent lambda function. */
  // XXX: As it stands, this rule is a special case of what `MethodReferenceUsage` tries to achieve.
  // If/when `MethodReferenceUsage` becomes production ready, we should simply drop this check.
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/FileRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/FileRules.java
@@ -2,18 +2,12 @@ package tech.picnic.errorprone.refasterrules;

 import static java.nio.charset.StandardCharsets.UTF_8;

-import com.google.errorprone.refaster.Refaster;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
-import com.google.errorprone.refaster.annotation.Repeated;
-import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.FileAttribute;
 import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation;

 /** Refaster rules related to expressions dealing with files. */
@@ -21,49 +15,6 @@ import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation;
 final class FileRules {
  private FileRules() {}

-  /** Prefer the more idiomatic {@link Path#of(URI)} over {@link Paths#get(URI)}. */
-  static final class PathOfUri {
-    @BeforeTemplate
-    Path before(URI uri) {
-      return Paths.get(uri);
-    }
-
-    @AfterTemplate
-    Path after(URI uri) {
-      return Path.of(uri);
-    }
-  }
-
-  /**
-   * Prefer the more idiomatic {@link Path#of(String, String...)} over {@link Paths#get(String,
-   * String...)}.
-   */
-  static final class PathOfString {
-    @BeforeTemplate
-    Path before(String first, @Repeated String more) {
-      return Paths.get(first, more);
-    }
-
-    @AfterTemplate
-    Path after(String first, @Repeated String more) {
-      return Path.of(first, more);
-    }
-  }
-
-  /** Avoid redundant conversions from {@link Path} to {@link File}. */
-  // XXX: Review whether a rule such as this one is better handled by the `IdentityConversion` rule.
-  static final class PathInstance {
-    @BeforeTemplate
-    Path before(Path path) {
-      return path.toFile().toPath();
-    }
-
-    @AfterTemplate
-    Path after(Path path) {
-      return path;
-    }
-  }
-
  /** Prefer {@link Files#readString(Path, Charset)} over more contrived alternatives. */
  static final class FilesReadStringWithCharset {
    @BeforeTemplate
@@ -89,56 +40,4 @@ final class FileRules {
      return Files.readString(path);
    }
  }
-
-  /**
-   * Prefer {@link Files#createTempFile(String, String, FileAttribute[])} over alternatives that
-   * create files with more liberal permissions.
-   *
-   * <p>Note that {@link File#createTempFile} treats the given prefix as a path, and ignores all but
-   * its file name. That is, the actual prefix used is derived from all characters following the
-   * final file separator (if any). This is not the case with {@link Files#createTempFile}, which
-   * will instead throw an {@link IllegalArgumentException} if the prefix contains any file
-   * separators.
-   */
-  static final class FilesCreateTempFileToFile {
-    @BeforeTemplate
-    @SuppressWarnings({
-      "FilesCreateTempFileInCustomDirectoryToFile" /* This is a more specific template. */,
-      "java:S5443" /* This violation will be rewritten. */,
-      "key-to-resolve-AnnotationUseStyle-and-TrailingComment-check-conflict"
-    })
-    File before(String prefix, String suffix) throws IOException {
-      return Refaster.anyOf(
-          File.createTempFile(prefix, suffix), File.createTempFile(prefix, suffix, null));
-    }
-
-    @AfterTemplate
-    @SuppressWarnings(
-        "java:S5443" /* On POSIX systems the file will only have user read-write permissions. */)
-    File after(String prefix, String suffix) throws IOException {
-      return Files.createTempFile(prefix, suffix).toFile();
-    }
-  }
-
-  /**
-   * Prefer {@link Files#createTempFile(Path, String, String, FileAttribute[])} over alternatives
-   * that create files with more liberal permissions.
-   *
-   * <p>Note that {@link File#createTempFile} treats the given prefix as a path, and ignores all but
-   * its file name. That is, the actual prefix used is derived from all characters following the
-   * final file separator (if any). This is not the case with {@link Files#createTempFile}, which
-   * will instead throw an {@link IllegalArgumentException} if the prefix contains any file
-   * separators.
-   */
-  static final class FilesCreateTempFileInCustomDirectoryToFile {
-    @BeforeTemplate
-    File before(File directory, String prefix, String suffix) throws IOException {
-      return File.createTempFile(prefix, suffix, directory);
-    }
-
-    @AfterTemplate
-    File after(File directory, String prefix, String suffix) throws IOException {
-      return Files.createTempFile(directory.toPath(), prefix, suffix).toFile();
-    }
-  }
 }
--- a/Show More
+++ b/Show More