diff --git a/crates/engine/src/cmd/selecttools.rs b/crates/engine/src/cmd/selecttools.rs
index eef98ffdd..1f742bb11 100644
--- a/crates/engine/src/cmd/selecttools.rs
+++ b/crates/engine/src/cmd/selecttools.rs
@@ -9,7 +9,8 @@ use cadcraft_doc::{Drawing, Entity, EntityKind, Handle};
 use serde_json::{Value, json};
 
 use super::machines::{SelOutcome, SelectPhase, SelectRun};
-use super::*;
+use super::{CommandSpec, bad, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 /// Most objects one call looks at (a hostile drawing can be huge).
diff --git a/crates/engine/src/cmd/settings.rs b/crates/engine/src/cmd/settings.rs
index 014e130eb..5cc9d7b65 100644
--- a/crates/engine/src/cmd/settings.rs
+++ b/crates/engine/src/cmd/settings.rs
@@ -2,7 +2,8 @@
 
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, bad, point_param, str_param};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub(super) mod iso;
diff --git a/crates/engine/src/cmd/table.rs b/crates/engine/src/cmd/table.rs
index be156fb1d..978335262 100644
--- a/crates/engine/src/cmd/table.rs
+++ b/crates/engine/src/cmd/table.rs
@@ -12,7 +12,8 @@ use cadcraft_geom::Vec2;
 use serde_json::{Value, json};
 
 use super::helpers::v3;
-use super::*;
+use super::{CommandSpec, bad, point_req, size_param, str_param};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 /// Caps for hostile parameters.
diff --git a/crates/engine/src/cmd/tolerance.rs b/crates/engine/src/cmd/tolerance.rs
index 1a33a5670..b4edfe0f9 100644
--- a/crates/engine/src/cmd/tolerance.rs
+++ b/crates/engine/src/cmd/tolerance.rs
@@ -5,7 +5,8 @@ use cadcraft_geom::{PolyVertex, Vec2};
 use serde_json::{Value, json};
 
 use super::helpers::{line, lwpoly, v3};
-use super::*;
+use super::{CommandSpec, bad, bool_or, f64_or, point_req, str_param};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {
diff --git a/crates/engine/src/cmd/utility.rs b/crates/engine/src/cmd/utility.rs
index 89c00f7a6..050700018 100644
--- a/crates/engine/src/cmd/utility.rs
+++ b/crates/engine/src/cmd/utility.rs
@@ -4,7 +4,8 @@ use cadcraft_doc::{EntityKind, Handle};
 use cadcraft_geom::Vec2;
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, bad, bool_or, point_param, points_param, str_param, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {
@@ -379,7 +380,7 @@ impl Interactive for MeasureM {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use super::{CommandSpec, bad, bool_or, point_param, points_param, str_param, targets};
 
     #[test]
     fn calculator() {
diff --git a/crates/engine/src/cmd/view.rs b/crates/engine/src/cmd/view.rs
index e6051a6e9..2494bb56a 100644
--- a/crates/engine/src/cmd/view.rs
+++ b/crates/engine/src/cmd/view.rs
@@ -6,7 +6,8 @@ use cadcraft_geom::{Bounds2, Vec2};
 use serde_json::{Value, json};
 
 use super::machines::{SelectRun, number};
-use super::*;
+use super::{CommandSpec, bad, bool_or, f64_req, ok, point_req, str_param, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step, View};
 
 mod named_views;