diff --git a/tools/comcom.lisp b/tools/comcom.lisp
index 51342f91a63f47cf58f4b0886ca395a5fea2cabc..f65f1afcbfd14e2d4fed0633a69e7f6490b23dc9 100644
--- a/tools/comcom.lisp
+++ b/tools/comcom.lisp
@@ -70,8 +70,11 @@
 (comf "target:compiler/main")
 
 (with-compilation-unit
-    (:optimize '(optimize (debug 2) (safety 1)))
-  (comf "target:compiler/ir1tran")
+    (:optimize '(optimize (safety 1)))
+  (comf "target:compiler/ir1tran"))
+
+(with-compilation-unit
+    (:optimize '(optimize (debug 2)))
   (comf "target:compiler/ir1util")
   (comf "target:compiler/ir1opt"))
 
@@ -141,22 +144,22 @@
 (comf "target:compiler/ltv")
 (comf "target:compiler/gtn")
 (with-compilation-unit
-    (:optimize '(optimize (debug 2) (safety 1)))
+    (:optimize '(optimize (debug 2)))
   (comf "target:compiler/ltn"))
 (comf "target:compiler/stack")
 (comf "target:compiler/control")
 (comf "target:compiler/entry")
 (with-compilation-unit
-    (:optimize '(optimize (debug 2) (safety 1)))
+    (:optimize '(optimize (debug 2)))
   (comf "target:compiler/ir2tran")
   (comf "target:compiler/generic/vm-ir2tran"))
 (comf "target:compiler/copyprop")
 (with-compilation-unit
-    (:optimize '(optimize (debug 2) (safety 1)))
+    (:optimize '(optimize (debug 2)))
   (comf "target:compiler/represent"))
 (comf "target:compiler/generic/vm-tran")
 (with-compilation-unit
-    (:optimize '(optimize (debug 2) (safety 1)))
+    (:optimize '(optimize (debug 2)))
   (comf "target:compiler/pack"))
 (comf "target:compiler/codegen")
 (with-compilation-unit