@@ -34,28 +34,10 @@
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "megatest-fossil-hash.scm")
 
-;; Overall exit handling setup immediately
-;;
-(let ((original-exit (exit-handler)))
-  (exit-handler (lambda (#!optional (exit-code 0))
-		  (printf "Preparing to exit with exit code ~A ...\n" exit-code)
-		  (children
-		   (lambda (pid)
-		     (handle-exceptions
-		      exn
-		      #t
-		      (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
-				  (if (or (eq? pid-val pid)
-					  (eq? pid-val 0))
-				      (begin
-					(printf "Sending signal/term to ~A\n" pid)
-					(process-signal pid signal/term)))))))
-		  (original-exit exit-code))))
-
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
   (if (file-exists? debugcontrolf)
       (load debugcontrolf)))
 
 
@@ -270,10 +252,34 @@
     (begin
       (print megatest-version)
       (exit)))
 
 (define *didsomething* #f)
+
+;; Overall exit handling setup immediately
+;;
+(if (or (args:get-arg "-process-reap"))
+        ;; (args:get-arg "-runtests")
+	;; (args:get-arg "-execute")
+	;; (args:get-arg "-remove-runs")
+	;; (args:get-arg "-runstep"))
+    (let ((original-exit (exit-handler)))
+      (exit-handler (lambda (#!optional (exit-code 0))
+		      (printf "Preparing to exit with exit code ~A ...\n" exit-code)
+		      (for-each 
+		       (lambda (pid)
+			 (handle-exceptions
+			  exn
+			  #t
+			  (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
+				      (if (or (eq? pid-val pid)
+					      (eq? pid-val 0))
+					  (begin
+					    (printf "Sending signal/term to ~A\n" pid)
+					    (process-signal pid signal/term))))))
+		       (process:children #f))
+		      (original-exit exit-code)))))
 
 ;; Force default transport to fs
 ;; (if ;; (and (or (args:get-arg "-list-targets")
 ;;     ;;          (args:get-arg "-list-db-targets"))
 ;;  (not (args:get-arg "-transport"))