diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 0000000..4a6a1ab
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[resolver]
+incompatible-rust-versions = "fallback"
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 7ab13b9..27749d4 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -9,13 +9,13 @@
   customManagers: [
     {
       customType: 'regex',
-      fileMatch: [
-        '^rust-toolchain\\.toml$',
-        'Cargo.toml$',
-        'clippy.toml$',
-        '\\.clippy.toml$',
-        '^\\.github/workflows/ci.yml$',
-        '^\\.github/workflows/rust-next.yml$',
+      managerFilePatterns: [
+        '/^rust-toolchain\\.toml$/',
+        '/Cargo.toml$/',
+        '/clippy.toml$/',
+        '/\\.clippy.toml$/',
+        '/^\\.github/workflows/ci.yml$/',
+        '/^\\.github/workflows/rust-next.yml$/',
       ],
       matchStrings: [
         'STABLE.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3728e71..522da41 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
     - name: Build
       run: cargo test --workspace --no-run
     - name: Test
-      run: cargo hack test --feature-powerset --workspace
+      run: cargo hack test --each-feature --workspace
   msrv:
     name: "Check MSRV"
     runs-on: ubuntu-latest
@@ -64,7 +64,7 @@ jobs:
     - uses: Swatinem/rust-cache@v2
     - uses: taiki-e/install-action@cargo-hack
     - name: Default features
-      run: cargo hack check --feature-powerset --locked --rust-version --ignore-private --workspace --all-targets
+      run: cargo hack check --each-feature --locked --rust-version --ignore-private --workspace --all-targets --keep-going
   minimal-versions:
     name: Minimal versions
     runs-on: ubuntu-latest
@@ -82,7 +82,7 @@ jobs:
     - name: Downgrade dependencies to minimal versions
       run: cargo +nightly generate-lockfile -Z minimal-versions
     - name: Compile with minimal versions
-      run: cargo +stable check --workspace --all-features --locked
+      run: cargo +stable check --workspace --all-features --locked --keep-going
   lockfile:
     runs-on: ubuntu-latest
     steps:
@@ -109,7 +109,7 @@ jobs:
     - name: Check documentation
       env:
         RUSTDOCFLAGS: -D warnings
-      run: cargo doc --workspace --all-features --no-deps --document-private-items
+      run: cargo doc --workspace --all-features --no-deps --document-private-items --keep-going
   rustfmt:
     name: rustfmt
     runs-on: ubuntu-latest
@@ -144,7 +144,7 @@ jobs:
       run: cargo install sarif-fmt --locked
     - name: Check
       run: >
-        cargo clippy --workspace --all-features --all-targets --message-format=json -- -D warnings --allow deprecated
+        cargo clippy --workspace --all-features --all-targets --message-format=json
         | clippy-sarif
         | tee clippy-results.sarif
         | sarif-fmt
@@ -155,7 +155,7 @@ jobs:
         sarif_file: clippy-results.sarif
         wait-for-processing: true
     - name: Report status
-      run: cargo clippy --workspace --all-features --all-targets -- -D warnings --allow deprecated
+      run: cargo clippy --workspace --all-features --all-targets --keep-going -- -D warnings --allow deprecated
   coverage:
     name: Coverage
     runs-on: ubuntu-latest
diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml
index 2b20d32..2563a92 100644
--- a/.github/workflows/rust-next.yml
+++ b/.github/workflows/rust-next.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Build
       run: cargo test --workspace --no-run
     - name: Test
-      run: cargo hack test --feature-powerset --workspace
+      run: cargo hack test --each-feature --workspace
   latest:
     name: "Check latest dependencies"
     runs-on: ubuntu-latest
@@ -58,4 +58,4 @@ jobs:
     - name: Build
       run: cargo test --workspace --no-run
     - name: Test
-      run: cargo hack test --feature-powerset --workspace
+      run: cargo hack test --each-feature --workspace
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 68db968..656c68e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,26 +1,19 @@
+default_install_hook_types: ["pre-commit", "commit-msg"]
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
     - id: check-yaml
-      stages: [commit]
     - id: check-json
-      stages: [commit]
     - id: check-toml
-      stages: [commit]
     - id: check-merge-conflict
-      stages: [commit]
     - id: check-case-conflict
-      stages: [commit]
     - id: detect-private-key
-      stages: [commit]
   - repo: https://github.com/crate-ci/typos
-    rev: v1.16.20
+    rev: v1.32.0
     hooks:
     - id: typos
-      stages: [commit]
   - repo: https://github.com/crate-ci/committed
-    rev: v1.0.20
+    rev: v1.1.7
     hooks:
     - id: committed
-      stages: [commit-msg]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f7c6cd4..a36cdc7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,18 +7,18 @@ appreciate any level you're willing to do.
 
 Need some new functionality to help?  You can let us know by opening an
 [issue][new issue]. It's helpful to look through [all issues][all issues] in
-case its already being talked about.
+case it's already being talked about.
 
 ## Bug Reports
 
 Please let us know about what problems you run into, whether in behavior or
 ergonomics of API.  You can do this by opening an [issue][new issue]. It's
-helpful to look through [all issues][all issues] in case its already being
+helpful to look through [all issues][all issues] in case it's already being
 talked about.
 
 ## Pull Requests
 
-Looking for an idea? Check our [issues][issues]. If it's look more open ended,
+Looking for an idea? Check our [issues][issues]. If the issue looks open ended,
 it is probably best to post on the issue how you are thinking of resolving the
 issue so you can get feedback early in the process. We want you to be
 successful and it can be discouraging to find out a lot of re-work is needed.
@@ -41,15 +41,18 @@ As a heads up, we'll be running your PR through the following gauntlet:
 Not everything can be checked automatically though.
 
 We request that the commit history gets cleaned up.
+
 We ask that commits are atomic, meaning they are complete and have a single responsibility.
-PRs should tell a cohesive story, with test and refactor commits that keep the
+A complete commit should build, pass tests, update documentation and tests, and not have dead code.
+
+PRs should tell a cohesive story, with refactor and test commits that keep the
 fix or feature commits simple and clear.
 
 Specifically, we would encourage
 - File renames be isolated into their own commit
-- Add tests in a commit before their feature or fix, showing the current behavior.
+- Add tests in a commit before their feature or fix, showing the current behavior (i.e. they should pass).
   The diff for the feature/fix commit will then show how the behavior changed,
-  making it clearer to reviewers and the community and showing people that the
+  making the commit's intent clearer to reviewers and the community, and showing people that the
   test is verifying the expected state.
   - e.g. [clap#5520](https://github.com/clap-rs/clap/pull/5520)
 
diff --git a/Cargo.lock b/Cargo.lock
index 799abee..478285b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -58,7 +58,6 @@ dependencies = [
  "anstyle",
  "automod",
  "bstr",
- "doc-comment",
  "escargot",
  "libc",
  "predicates",
@@ -108,12 +107,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
 [[package]]
 name = "either"
 version = "1.8.0"
diff --git a/Cargo.toml b/Cargo.toml
index a474b2e..33e6e32 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,12 +13,12 @@ include = [
   "Cargo.lock",
   "LICENSE*",
   "README.md",
-  "benches/**/*",
   "examples/**/*"
 ]
 
 [workspace.lints.rust]
 rust_2018_idioms = { level = "warn", priority = -1 }
+unnameable_types = "warn"
 unreachable_pub = "warn"
 unsafe_op_in_unsafe_fn = "warn"
 unused_lifetimes = "warn"
@@ -61,7 +61,7 @@ lossy_float_literal = "warn"
 macro_use_imports = "warn"
 mem_forget = "warn"
 mutex_integer = "warn"
-needless_continue = "warn"
+needless_continue = "allow"
 needless_for_each = "warn"
 negative_feature_names = "warn"
 path_buf_push_overwrite = "warn"
@@ -86,6 +86,15 @@ verbose_file_reads = "warn"
 wildcard_imports = "warn"
 zero_sized_map_values = "warn"
 
+[profile.dev]
+panic = "abort"
+
+[profile.release]
+panic = "abort"
+codegen-units = 1
+lto = true
+# debug = "line-tables-only"  # requires Cargo 1.71
+
 [package]
 name = "assert_cmd"
 version = "2.0.17"
@@ -126,7 +135,6 @@ name = "bin_fixture"
 predicates = { version = "3.0.1", default-features = false, features = ["diff"] }
 predicates-core = "1.0.6"
 predicates-tree = "1.0.1"
-doc-comment = "0.3"
 wait-timeout = "0.2.0"
 bstr = "1.0.1"
 anstream = { version = "0.6.7", optional = true }
diff --git a/README.md b/README.md
index f8cde96..5acc0d8 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ coreyja
 
 Unless you explicitly state otherwise, any contribution intentionally
 submitted for inclusion in the work by you, as defined in the Apache-2.0
-license, shall be dual licensed as above, without any additional terms or
+license, shall be dual-licensed as above, without any additional terms or
 conditions.
 
 [Crates.io]: https://crates.io/crates/assert_cmd
diff --git a/deny.toml b/deny.toml
index b6ecbe9..ee5ae89 100644
--- a/deny.toml
+++ b/deny.toml
@@ -87,6 +87,7 @@ allow = [
     "MIT",
     "MIT-0",
     "Apache-2.0",
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "MPL-2.0",
     "Unicode-DFS-2016",
diff --git a/src/lib.rs b/src/lib.rs
index 3e7b41b..d16fc1f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -123,4 +123,6 @@ pub use crate::cmd::Command;
 mod color;
 use color::Palette;
 
-doc_comment::doctest!("../README.md");
+#[doc = include_str!("../README.md")]
+#[cfg(doctest)]
+pub struct ReadmeDoctests;