@@ -233,20 +233,18 @@
 
 ;; client side handler
 ;;
 ;;(tt:handler #<tt> get-keys #f () 2 #f "/home/matt/data/megatest/ext-tests" #f "main.db" "ext-tests" "/home/matt/data/megatest/bin/.22.04/../megatest")
 ;;
-(define (tt:handler ttdat cmd run-id params attemptnum area-dat areapath readonly-mode dbfname testsuite mtexe)
-  (debug:print 2 *default-log-port* "tt:handler cmd: " cmd " run-id: " run-id " attemptnum: " attemptnum)
-  ;; NOTE: areapath is passed in and in tt struct. We'll use passed in value for now.
+(define (tt:handler ttdat cmd run-id params attemptnum readonly-mode dbfname testsuite mtexe)
   ;; connect-to-server will start a server if needed.
-  (let* ((conn (tt:client-connect-to-server ttdat dbfname run-id testsuite))) ;; (hash-table-ref/default (tt-conns ttdat) dbfname #f)))
+  (let* ((areapath (tt-areapath ttdat))
+	 (conn     (tt:client-connect-to-server ttdat dbfname run-id testsuite))) ;; looks up conn keyed by dbfname
     (if conn
 	;; have connection, call the server
 	(let* ((res (tt:send-receive ttdat conn cmd run-id params)))
 	  ;; res is (status errmsg result meta)
-         ; (debug:print 0 *default-log-port* "conn:" conn " res: " res)
 	  (match res
 	    ((status errmsg result meta)
 	     (if (list? meta)
 		 (let* ((delay-wait (alist-ref 'delay-wait meta)))
 		   (if (and (number? delay-wait)
@@ -257,15 +255,15 @@
 	     (case status
 	       ((busy) ;; result will be how long the server wants you to delay
 		(let* ((dly  (if (number? result) result 0.1)))
 		  (debug:print 0 *default-log-port* "WARNING: server for "dbfname" is busy, will try again in "dly" seconds.")
 		  (thread-sleep! dly)
-		  (tt:handler  ttdat cmd run-id params (+ attemptnum 1) area-dat areapath readonly-mode dbfname testsuite mtexe)))
+		  (tt:handler  ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe)))
 	       ((loaded)
 		(debug:print 0 *default-log-port* "WARNING: server for "dbfname" is loaded, slowing queries.")
 		(tt:backoff-incr (tt-conn-host conn)(tt-conn-port conn))
-		result) ;; (tt:handler  ttdat cmd run-id params (+ attemptnum 1) area-dat areapath readonly-mode dbfname testsuite mtexe))
+		result) ;; (tt:handler  ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe))
 	       (else
 		result)))
 	    (else ;; did not receive properly formated result
 	     (if (not res) ;; tt:send-receive telling us that communication failed
 		 (let* ((host    (tt-conn-host conn))
@@ -278,11 +276,11 @@
 		   (if (and servinf (file-exists? servinf))
 		       (begin
 			 (if (< attemptnum 10)
 			     (begin
 			       (thread-sleep! 0.5)
-			       (tt:handler ttdat cmd run-id params (+ attemptnum 1) area-dat areapath readonly-mode dbfname testsuite mtexe))
+			       (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe))
 			     (begin
 			       (debug:print 0 *default-log-port* "INFO: no response from server "host":"port" for "dbfname)
 			       (if (and (file-exists? servinf)
 					(> (- (current-seconds)(file-modification-time servinf)) 60))
 				   (begin
@@ -289,30 +287,30 @@
 				     (debug:print 0 *default-log-port* "INFO: "servinf" file seems old and no ping response, removing it.")
 				     (handle-exceptions
 					 exn
 				       #f
 				       (delete-file* servinf))
-				     (tt:handler ttdat cmd run-id params (+ attemptnum 1) area-dat areapath readonly-mode dbfname testsuite mtexe))
+				     (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe))
 				   (begin
 				     ;; start server - addressed in client-connect-to-server
 				     ;; delay        - addressed in client-connect-to-server
 				     ;; try again
 				     (thread-sleep! 0.25) ;; dunno, I think this needs to be here
-				     (tt:handler ttdat cmd run-id params (+ attemptnum 1) area-dat areapath readonly-mode dbfname testsuite mtexe))
+				     (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe))
 				   ))))
 		       (begin ;; no server file, delay and try again
 			 (debug:print 2 *default-log-port* "INFO: connection to server "host":"port" broken for "dbfname", no servinf file. Server exited? ")
 			 (thread-sleep! 0.5)
-			 (tt:handler ttdat cmd run-id params (+ attemptnum 1) area-dat areapath readonly-mode dbfname testsuite mtexe))))
+			 (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe))))
 		 (begin ;; this case is where res is malformed. Probably should abort
 		   (assert #f "FATAL: tt:handler received bad data "res)
 		   ;; (debug:print 0 *default-log-port* "INFO: got corrupt data from server "host":"port", "res", for "dbfname", will try again.")
-		   ;; (tt:handler ttdat cmd run-id params (+ attemptnum 1) area-dat areapath readonly-mode dbfname testsuite mtexe)
+		   ;; (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe)
 		   )))))
 	(begin
 	  (thread-sleep! 1) ;; no conn yet set up, give it a rest and try again
-	  (tt:handler ttdat cmd run-id params attemptnum area-dat areapath readonly-mode dbfname testsuite mtexe)))))
+	  (tt:handler ttdat cmd run-id params attemptnum readonly-mode dbfname testsuite mtexe)))))
 
 (define (tt:bid-for-servership run-id)
   #f)
 
 ;; gets server info and appends path to server file