diff --git a/crates/engine/src/cmd/draw2/breakline.rs b/crates/engine/src/cmd/draw2/breakline.rs
index 37e20a492..6730abc2f 100644
--- a/crates/engine/src/cmd/draw2/breakline.rs
+++ b/crates/engine/src/cmd/draw2/breakline.rs
@@ -12,7 +12,8 @@ use serde_json::Value;
 use super::added;
 use super::curves::MAX_GEN;
 use super::machines::number;
-use super::*;
+use super::{CommandSpec, line, lwpoly, point_param, point_req, size_param, str_param};
+
 use crate::cmd::modify2::as_lwpoly;
 use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step};
 
diff --git a/crates/engine/src/cmd/draw2/mline.rs b/crates/engine/src/cmd/draw2/mline.rs
index 2f1b7edc6..d02a9360e 100644
--- a/crates/engine/src/cmd/draw2/mline.rs
+++ b/crates/engine/src/cmd/draw2/mline.rs
@@ -11,7 +11,8 @@ use serde_json::{Value, json};
 
 use super::curves::{self, MAX_GEN};
 use super::machines::number;
-use super::*;
+use super::{CommandSpec, bad, bool_or, distinct_points, f64_or, line, ok, point_req, points_param, str_param};
+
 use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {
diff --git a/crates/engine/src/cmd/draworder.rs b/crates/engine/src/cmd/draworder.rs
index fab673353..8020dc520 100644
--- a/crates/engine/src/cmd/draworder.rs
+++ b/crates/engine/src/cmd/draworder.rs
@@ -8,7 +8,8 @@ use cadcraft_doc::{EntityKind, Handle};
 use serde_json::{Value, json};
 
 use super::machines::{SelOutcome, SelectPhase, SelectRun};
-use super::*;
+use super::{CommandSpec, EngineError, bad, ok, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {
diff --git a/crates/engine/src/cmd/edit.rs b/crates/engine/src/cmd/edit.rs
index 822ef8760..d9221a2bd 100644
--- a/crates/engine/src/cmd/edit.rs
+++ b/crates/engine/src/cmd/edit.rs
@@ -5,7 +5,8 @@ use cadcraft_geom::{Bounds2, Mat3, Vec2};
 use serde_json::{Value, json};
 
 use super::machines::{SelOutcome, SelectPhase, SelectRun};
-use super::*;
+use super::{CommandSpec, EngineError, bad, bool_or, clipboard, f64_or, has_selection, point_param, points_param, str_param, targets};
+
 use crate::undoctl::Control;
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
diff --git a/crates/engine/src/cmd/exchange.rs b/crates/engine/src/cmd/exchange.rs
index da842c6f0..12996c758 100644
--- a/crates/engine/src/cmd/exchange.rs
+++ b/crates/engine/src/cmd/exchange.rs
@@ -18,7 +18,8 @@ use cadcraft_render::raster::{RasterOptions, View};
 use serde_json::{Value, json};
 
 use super::file::{base64_decode, base64_encode, io};
-use super::*;
+use super::{CommandSpec, bad, point_value, resolve_alias, str_param};
+
 use crate::{EngineError, Result, Session};
 
 /// Formats EXPORT writes (the io layer picks the writer from the extension).
@@ -557,7 +558,7 @@ mod tests {
     use cadcraft_geom::Vec3;
 
     use super::super::file::{IoHooks, set_io};
-    use super::*;
+    use super::{CommandSpec, bad, point_value, resolve_alias, str_param};
 
     static DELIVERED: std::sync::Mutex<Vec<(String, String, usize)>> = std::sync::Mutex::new(Vec::new());
 
diff --git a/crates/engine/src/cmd/file.rs b/crates/engine/src/cmd/file.rs
index 3bb9f870d..8ea963cfb 100644
--- a/crates/engine/src/cmd/file.rs
+++ b/crates/engine/src/cmd/file.rs
@@ -11,7 +11,8 @@ use cadcraft_doc::Drawing;
 pub use cadcraft_dxf::Version;
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, EngineError, Interactive, always, bad, bool_or, ok, str_param};
+
 use crate::{Accept, Input, Prompt, Result, Session, Step};
 
 /// The rules the Command Aliases dialog checks before it sends an alias to ALIASEDIT.
@@ -720,7 +721,7 @@ mod tests {
 
 #[cfg(test)]
 mod pr193_tests {
-    use super::*;
+    use super::{CommandSpec, EngineError, Interactive, bad, bool_or, ok, str_param};
 
     #[test]
     fn failed_store_keeps_unsaved_changes_and_delivered_save_clears_them() {
diff --git a/crates/engine/src/cmd/file/pgp.rs b/crates/engine/src/cmd/file/pgp.rs
index e502ad80a..2fd8614b0 100644
--- a/crates/engine/src/cmd/file/pgp.rs
+++ b/crates/engine/src/cmd/file/pgp.rs
@@ -13,6 +13,7 @@ use std::sync::{Mutex, MutexGuard, OnceLock, PoisonError};
 use serde_json::{Value, json};
 
 use super::super::helpers::support_text;
+use super::super::{always, find_command};
 use super::*;
 
 /// Most user aliases held.