diff --git a/Cargo.lock b/Cargo.lock
index d39b76d616c..7b56366e759 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -285,7 +285,7 @@ dependencies = [
  "bitflags",
  "cexpr",
  "clang-sys",
- "clap 3.2.12",
+ "clap 3.2.15",
  "env_logger",
  "lazy_static",
  "lazycell",
@@ -536,9 +536,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.12"
+version = "3.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8b79fe3946ceb4a0b1c080b4018992b8d27e9ff363644c1c9b6387c854614d"
+checksum = "44bbe24bbd31a185bc2c4f7c2abe80bea13a20d57ee4e55be70ac512bdc76417"
 dependencies = [
  "atty",
  "bitflags",
@@ -553,9 +553,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.7"
+version = "3.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902"
+checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4"
 dependencies = [
  "heck 0.4.0",
  "proc-macro-error",
@@ -1776,7 +1776,7 @@ name = "gateway-cli"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 3.2.12",
+ "clap 3.2.15",
  "futures",
  "gateway-client",
  "libc",
@@ -2322,7 +2322,7 @@ name = "internal-dns"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 3.2.12",
+ "clap 3.2.15",
  "dropshot",
  "expectorate",
  "internal-dns-client",
@@ -3054,7 +3054,7 @@ name = "omicron-deploy"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 3.2.12",
+ "clap 3.2.15",
  "crossbeam",
  "omicron-package",
  "omicron-sled-agent",
@@ -3070,7 +3070,7 @@ dependencies = [
 name = "omicron-gateway"
 version = "0.1.0"
 dependencies = [
- "clap 3.2.12",
+ "clap 3.2.15",
  "dropshot",
  "expectorate",
  "futures",
@@ -3109,7 +3109,7 @@ dependencies = [
  "base64",
  "bb8",
  "chrono",
- "clap 3.2.12",
+ "clap 3.2.15",
  "cookie",
  "criterion",
  "crucible-agent-client",
@@ -3188,7 +3188,7 @@ name = "omicron-package"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 3.2.12",
+ "clap 3.2.15",
  "futures",
  "hex",
  "indicatif",
@@ -3226,7 +3226,7 @@ dependencies = [
  "bytes",
  "cfg-if 1.0.0",
  "chrono",
- "clap 3.2.12",
+ "clap 3.2.15",
  "crucible",
  "crucible-agent-client",
  "ddm-admin-client",
@@ -3288,7 +3288,7 @@ name = "omicron-test-utils"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 3.2.12",
+ "clap 3.2.15",
  "dropshot",
  "expectorate",
  "futures",
@@ -3540,7 +3540,7 @@ dependencies = [
 name = "oximeter-collector"
 version = "0.1.0"
 dependencies = [
- "clap 3.2.12",
+ "clap 3.2.15",
  "dropshot",
  "expectorate",
  "internal-dns-client",
@@ -3571,7 +3571,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "chrono",
- "clap 3.2.12",
+ "clap 3.2.15",
  "dropshot",
  "itertools",
  "omicron-test-utils",
@@ -4142,10 +4142,10 @@ dependencies = [
 [[package]]
 name = "progenitor"
 version = "0.1.2-dev"
-source = "git+https://github.com/oxidecomputer/progenitor#bfd194f39c2ce1a3ce16b5a1bddf79699c72aa0b"
+source = "git+https://github.com/oxidecomputer/progenitor#ea5a6a5a79e741d3b3ed9ad4f0f489c6602cf358"
 dependencies = [
  "anyhow",
- "clap 3.2.12",
+ "clap 3.2.15",
  "openapiv3",
  "progenitor-client",
  "progenitor-impl",
@@ -4157,7 +4157,7 @@ dependencies = [
 [[package]]
 name = "progenitor-client"
 version = "0.1.2-dev"
-source = "git+https://github.com/oxidecomputer/progenitor#bfd194f39c2ce1a3ce16b5a1bddf79699c72aa0b"
+source = "git+https://github.com/oxidecomputer/progenitor#ea5a6a5a79e741d3b3ed9ad4f0f489c6602cf358"
 dependencies = [
  "bytes",
  "futures-core",
@@ -4171,7 +4171,7 @@ dependencies = [
 [[package]]
 name = "progenitor-impl"
 version = "0.1.2-dev"
-source = "git+https://github.com/oxidecomputer/progenitor#bfd194f39c2ce1a3ce16b5a1bddf79699c72aa0b"
+source = "git+https://github.com/oxidecomputer/progenitor#ea5a6a5a79e741d3b3ed9ad4f0f489c6602cf358"
 dependencies = [
  "getopts",
  "heck 0.4.0",
@@ -4193,7 +4193,7 @@ dependencies = [
 [[package]]
 name = "progenitor-macro"
 version = "0.1.2-dev"
-source = "git+https://github.com/oxidecomputer/progenitor#bfd194f39c2ce1a3ce16b5a1bddf79699c72aa0b"
+source = "git+https://github.com/oxidecomputer/progenitor#ea5a6a5a79e741d3b3ed9ad4f0f489c6602cf358"
 dependencies = [
  "openapiv3",
  "proc-macro2",
@@ -5393,7 +5393,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap 3.2.12",
+ "clap 3.2.15",
  "dropshot",
  "futures",
  "gateway-messages",
@@ -5462,7 +5462,7 @@ version = "0.1.0"
 source = "git+http://github.com/oxidecomputer/sprockets?rev=0361fd13ff19cda6696242fe40f1325fca30d3d1#0361fd13ff19cda6696242fe40f1325fca30d3d1"
 dependencies = [
  "anyhow",
- "clap 3.2.12",
+ "clap 3.2.15",
  "derive_more",
  "futures",
  "pin-project",
@@ -6217,7 +6217,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
  "rand 0.8.5",
  "static_assertions",
 ]
@@ -6231,7 +6231,7 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 [[package]]
 name = "typify"
 version = "0.0.10-dev"
-source = "git+https://github.com/oxidecomputer/typify#69b65c3c050eefa0fc0dc52e7ac6a6014449c025"
+source = "git+https://github.com/oxidecomputer/typify#b0520682aecfe077d0eb9c6612e4c5f71ab36bf6"
 dependencies = [
  "typify-impl",
  "typify-macro",
@@ -6240,7 +6240,7 @@ dependencies = [
 [[package]]
 name = "typify-impl"
 version = "0.0.10-dev"
-source = "git+https://github.com/oxidecomputer/typify#69b65c3c050eefa0fc0dc52e7ac6a6014449c025"
+source = "git+https://github.com/oxidecomputer/typify#b0520682aecfe077d0eb9c6612e4c5f71ab36bf6"
 dependencies = [
  "heck 0.4.0",
  "log",
@@ -6258,7 +6258,7 @@ dependencies = [
 [[package]]
 name = "typify-macro"
 version = "0.0.10-dev"
-source = "git+https://github.com/oxidecomputer/typify#69b65c3c050eefa0fc0dc52e7ac6a6014449c025"
+source = "git+https://github.com/oxidecomputer/typify#b0520682aecfe077d0eb9c6612e4c5f71ab36bf6"
 dependencies = [
  "proc-macro2",
  "quote",