diff --git a/src/garage/cli/remote/admin_token.rs b/src/garage/cli/remote/admin_token.rs
index 6b2bd67e..5a0b0595 100644
--- a/src/garage/cli/remote/admin_token.rs
+++ b/src/garage/cli/remote/admin_token.rs
@@ -230,7 +230,7 @@ fn print_token_info(token: &GetAdminTokenInfoResponse) {
 		format!("Created:\t{}", token.created.unwrap().with_timezone(&Local)),
 		format!(
 			"Validity:\t{}",
-			token.expired.then_some("EXPIRED").unwrap_or("valid")
+			if token.expired { "EXPIRED" } else { "valid" }
 		),
 		format!(
 			"Expiration:\t{}",
diff --git a/src/garage/cli/remote/block.rs b/src/garage/cli/remote/block.rs
index c0e9d98a..613a1a16 100644
--- a/src/garage/cli/remote/block.rs
+++ b/src/garage/cli/remote/block.rs
@@ -67,11 +67,9 @@ impl Cli {
 				Some(BlockVersionBacklink::Object { bucket_id, key }) => {
 					table.push(format!(
 						"{}\t{:.16}{}\t{:.16}\t{}",
-						ver.ref_deleted.then_some("deleted").unwrap_or("active"),
+						if ver.ref_deleted { "deleted" } else { "active" },
 						ver.version_id,
-						ver.version_deleted
-							.then_some(" (deleted)")
-							.unwrap_or_default(),
+						deleted_to_str(ver.version_deleted),
 						bucket_id,
 						key
 					));
@@ -85,15 +83,13 @@ impl Cli {
 				}) => {
 					table.push(format!(
 						"{}\t{:.16}{}\t{:.16}\t{}\t{:.16}{}",
-						ver.ref_deleted.then_some("deleted").unwrap_or("active"),
+						if ver.ref_deleted { "deleted" } else { "active" },
 						ver.version_id,
-						ver.version_deleted
-							.then_some(" (deleted)")
-							.unwrap_or_default(),
+						deleted_to_str(ver.version_deleted),
 						bucket_id.as_deref().unwrap_or(""),
 						key.as_deref().unwrap_or(""),
 						upload_id,
-						upload_deleted.then_some(" (deleted)").unwrap_or_default(),
+						deleted_to_str(*upload_deleted),
 					));
 				}
 				None => {
@@ -167,3 +163,12 @@ impl Cli {
 		Ok(())
 	}
 }
+
+#[must_use]
+const fn deleted_to_str(deleted: bool) -> &'static str {
+	if deleted {
+		" (deleted)"
+	} else {
+		""
+	}
+}
diff --git a/src/garage/cli/remote/key.rs b/src/garage/cli/remote/key.rs
index 7341d3d1..657607ea 100644
--- a/src/garage/cli/remote/key.rs
+++ b/src/garage/cli/remote/key.rs
@@ -283,7 +283,7 @@ fn print_key_info(key: &GetKeyInfoResponse) {
 	table.extend([
 		format!(
 			"Validity:\t{}",
-			key.expired.then_some("EXPIRED").unwrap_or("valid")
+			if key.expired { "EXPIRED" } else { "valid" }
 		),
 		format!(
 			"Expiration:\t{}",