diff --git a/Cargo.lock b/Cargo.lock
index 4aef3053c1f..3a75315cb18 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -101,15 +101,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "anstream"
 version = "0.6.11"
@@ -1025,21 +1016,6 @@ dependencies = [
  "libloading",
 ]
 
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim 0.8.0",
- "textwrap 0.11.0",
- "unicode-width",
- "vec_map",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.4"
@@ -1314,7 +1290,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.5.4",
+ "clap",
  "criterion-plot",
  "futures",
  "is-terminal",
@@ -1957,7 +1933,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "dns-service-client",
  "dropshot",
  "expectorate",
@@ -2264,7 +2240,7 @@ dependencies = [
  "async-trait",
  "base64 0.22.0",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "colored",
  "dhcproto",
  "http 0.2.12",
@@ -2686,7 +2662,7 @@ name = "gateway-cli"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.4",
+ "clap",
  "futures",
  "gateway-client",
  "gateway-messages",
@@ -3608,7 +3584,7 @@ dependencies = [
  "bytes",
  "camino",
  "cancel-safe-futures",
- "clap 4.5.4",
+ "clap",
  "display-error-chain",
  "futures",
  "hex",
@@ -3669,7 +3645,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap 4.5.4",
+ "clap",
  "dropshot",
  "expectorate",
  "hyper 0.14.28",
@@ -3750,7 +3726,7 @@ name = "internal-dns-cli"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.4",
+ "clap",
  "dropshot",
  "internal-dns",
  "omicron-common",
@@ -3991,7 +3967,7 @@ dependencies = [
  "anstyle",
  "anyhow",
  "camino",
- "clap 4.5.4",
+ "clap",
  "colored",
  "futures",
  "libc",
@@ -4101,7 +4077,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f0f4c6f44ecfd52e8b443f2ad18f2b996540135771561283c2352ce56a1c70b"
 dependencies = [
- "clap 4.5.4",
+ "clap",
  "escape8259",
  "termcolor",
  "threadpool",
@@ -4158,7 +4134,7 @@ version = "0.2.4"
 source = "git+https://github.com/oxidecomputer/lpc55_support#96f064eaae5e95930efaab6c29fd1b2e22225dac"
 dependencies = [
  "bitfield",
- "clap 4.5.4",
+ "clap",
  "packed_struct",
  "serde",
 ]
@@ -5274,7 +5250,7 @@ dependencies = [
  "anyhow",
  "camino",
  "camino-tempfile",
- "clap 4.5.4",
+ "clap",
  "dropshot",
  "expectorate",
  "futures",
@@ -5308,7 +5284,7 @@ dependencies = [
  "anyhow",
  "base64 0.22.0",
  "camino",
- "clap 4.5.4",
+ "clap",
  "dropshot",
  "expectorate",
  "futures",
@@ -5359,7 +5335,7 @@ dependencies = [
  "camino-tempfile",
  "cancel-safe-futures",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "criterion",
  "crucible-agent-client",
  "crucible-pantry-client",
@@ -5476,7 +5452,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "crossterm",
  "crucible-agent-client",
  "csv",
@@ -5517,7 +5493,7 @@ dependencies = [
  "strum",
  "subprocess",
  "tabled",
- "textwrap 0.16.1",
+ "textwrap",
  "tokio",
  "unicode-width",
  "uuid 1.8.0",
@@ -5529,7 +5505,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "camino",
- "clap 4.5.4",
+ "clap",
  "expectorate",
  "futures",
  "hex",
@@ -5596,7 +5572,7 @@ dependencies = [
  "cancel-safe-futures",
  "cfg-if",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "crucible-agent-client",
  "derive_more",
  "display-error-chain",
@@ -5742,7 +5718,7 @@ dependencies = [
  "bytes",
  "chrono",
  "cipher",
- "clap 4.5.4",
+ "clap",
  "clap_builder",
  "console",
  "const-oid",
@@ -6121,7 +6097,7 @@ dependencies = [
  "anyhow",
  "camino",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "dropshot",
  "expectorate",
  "futures",
@@ -6165,7 +6141,7 @@ dependencies = [
  "bytes",
  "camino",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "crossterm",
  "dropshot",
  "expectorate",
@@ -6238,7 +6214,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "dropshot",
  "nexus-client",
  "omicron-common",
@@ -6260,7 +6236,7 @@ dependencies = [
  "anyhow",
  "camino",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "omicron-workspace-hack",
  "sigpipe",
  "uuid 1.8.0",
@@ -7108,7 +7084,7 @@ dependencies = [
  "anyhow",
  "atty",
  "base64 0.21.7",
- "clap 4.5.4",
+ "clap",
  "dropshot",
  "futures",
  "hyper 0.14.28",
@@ -7397,7 +7373,7 @@ dependencies = [
  "assert_matches",
  "camino",
  "camino-tempfile",
- "clap 4.5.4",
+ "clap",
  "dns-service-client",
  "dropshot",
  "expectorate",
@@ -8955,7 +8931,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap 4.5.4",
+ "clap",
  "dropshot",
  "futures",
  "gateway-messages",
@@ -9133,12 +9109,6 @@ dependencies = [
  "vte",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -9197,30 +9167,6 @@ dependencies = [
  "syn 2.0.52",
 ]
 
-[[package]]
-name = "structopt"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
-dependencies = [
- "clap 2.34.0",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
-dependencies = [
- "heck 0.3.3",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "strum"
 version = "0.26.2"
@@ -9504,15 +9450,6 @@ dependencies = [
  "syn 2.0.52",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.16.1"
@@ -9695,13 +9632,11 @@ dependencies = [
 [[package]]
 name = "tofino"
 version = "0.1.0"
-source = "git+http://github.com/oxidecomputer/tofino?branch=main#8283f8021068f055484b653f0cc6b4d5c0979dc1"
+source = "git+http://github.com/oxidecomputer/tofino?branch=main#1b66b89c3727d2191082df057b068ec52560e334"
 dependencies = [
  "anyhow",
  "cc",
- "chrono",
  "illumos-devinfo",
- "structopt",
 ]
 
 [[package]]
@@ -10137,7 +10072,7 @@ dependencies = [
  "assert_cmd",
  "camino",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "console",
  "datatest-stable",
  "fs-err",
@@ -10413,7 +10348,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "clap 4.5.4",
+ "clap",
  "debug-ignore",
  "display-error-chain",
  "dropshot",
@@ -10444,7 +10379,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "cancel-safe-futures",
- "clap 4.5.4",
+ "clap",
  "debug-ignore",
  "derive-where",
  "either",
@@ -10640,12 +10575,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -10888,7 +10817,7 @@ dependencies = [
  "buf-list",
  "camino",
  "ciborium",
- "clap 4.5.4",
+ "clap",
  "crossterm",
  "futures",
  "humantime",
@@ -10913,7 +10842,7 @@ dependencies = [
  "slog-term",
  "supports-color",
  "tempfile",
- "textwrap 0.16.1",
+ "textwrap",
  "tokio",
  "tokio-util",
  "toml 0.8.12",
@@ -10949,7 +10878,7 @@ dependencies = [
  "bytes",
  "camino",
  "ciborium",
- "clap 4.5.4",
+ "clap",
  "crossterm",
  "omicron-workspace-hack",
  "reedline",
@@ -10974,7 +10903,7 @@ dependencies = [
  "bytes",
  "camino",
  "camino-tempfile",
- "clap 4.5.4",
+ "clap",
  "debug-ignore",
  "display-error-chain",
  "dpd-client",
@@ -11300,7 +11229,7 @@ dependencies = [
  "camino",
  "cargo_metadata",
  "cargo_toml",
- "clap 4.5.4",
+ "clap",
  "fs-err",
  "macaddr",
  "serde",
@@ -11448,7 +11377,7 @@ name = "zone-network-setup"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.4",
+ "clap",
  "dropshot",
  "illumos-utils",
  "omicron-common",