@@ -594,10 +594,17 @@
       (cdr reg)
       (if (null? tal) ;; if tal is null and reg not full then '() as reg contents moved to tal
 	  '()
 	  reg)))
 
+
+(define (runs:loop-values tal reg reglen regfull reruns)
+  (list (runs:queue-next-hed tal reg reglen regfull)
+        (runs:queue-next-tal tal reg reglen regfull)
+        (runs:queue-next-reg tal reg reglen regfull)
+        reruns))
+
 (define runs:nothing-left-in-queue-count 0)
 
 ;; BB: for future reference - suspect target vars are not expanded to env vars at this point (item expansion using [items]\nwhatever [system echo $TARGETVAR] doesnt work right whereas [system echo #{targetvar}] does.. Tal and Randy have tix on this.  on first pass, var not set, on second pass, ok.  
 (define (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps)
   (let* ((loop-list       (list hed tal reg reruns))
@@ -636,14 +643,11 @@
 	   (member (hash-table-ref/default test-registry (db:test-make-full-name hed item-path) 'n/a)
 		   '(DONOTRUN removed CANNOTRUN))) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE)) ;; try to catch repeat processing of COMPLETED tests here
       (debug:print-info 1 *default-log-port* "Test " hed " set to \"" (hash-table-ref test-registry (db:test-make-full-name hed item-path)) "\". Removing it from the queue")
       (if (or (not (null? tal))
 	      (not (null? reg)))
-	  (list (runs:queue-next-hed tal reg reglen regfull)
-		(runs:queue-next-tal tal reg reglen regfull)
-		(runs:queue-next-reg tal reg reglen regfull)
-		reruns)
+          (runs:loop-values tal reg reglen regfull reruns)
 	  (begin
 	    (debug:print-info 0 *default-log-port* "Nothing left in the queue!")
 	    ;; If get here twice then we know we've tried to expand all items
 	    ;; since there must be a logic issue with the handling of loops in the 
 	    ;; items expand phase we will brute force an exit here.
@@ -712,14 +716,12 @@
 		(if test-id (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_DISCARDED" "Failed to run due to discarded prerequisites")))
 	      
 	      (if (and (null? trimmed-tal)
 		       (null? trimmed-reg))
 		  #f
-		  (list (runs:queue-next-hed trimmed-tal trimmed-reg reglen regfull)
-			(runs:queue-next-tal trimmed-tal trimmed-reg reglen regfull)
-			(runs:queue-next-reg trimmed-tal trimmed-reg reglen regfull)
-			reruns)))
+                  (runs:loop-values trimmed-tal trimmed-reg reglen regfull reruns)
+                  ))
 	      (list (car newtal)(append (cdr newtal) reg) '() reruns))))
 
      ((and (null? fails)
 	   (null? prereq-fails)
 	   (null? non-completed))
@@ -734,14 +736,12 @@
 	    (list (car newtal)(append (cdr newtal) reg) '() reruns)) ;; an issue with prereqs not yet met?
 	  (begin
 	    (debug:print-info 1 *default-log-port* "no fails in prerequisites for " hed " but nothing seen running in a while, dropping test " hed " from the run queue")
 	    (let ((test-id (rmt:get-test-id run-id hed "")))
 	      (if test-id (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "TIMED_OUT" "Nothing seen running in a while.")))
-	    (list (runs:queue-next-hed tal reg reglen regfull)
-		  (runs:queue-next-tal tal reg reglen regfull)
-		  (runs:queue-next-reg tal reg reglen regfull)
-		  reruns))))
+            (runs:loop-values tal reg reglen regfull reruns)
+            )))
 
      ((and 
        (or (not (null? fails))
 	   (not (null? prereq-fails)))
        (member 'normal testmode))
@@ -754,27 +754,21 @@
 		(mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_DISCARDED" "Failed to run due to prior failed prerequisites")
 		(mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_FAIL"      "Failed to run due to failed prerequisites"))))
       (if (or (not (null? reg))(not (null? tal)))
 	  (begin
 	    (hash-table-set! test-registry hed 'CANNOTRUN)
-	    (list (runs:queue-next-hed tal reg reglen regfull)
-		  (runs:queue-next-tal tal reg reglen regfull)
-		  (runs:queue-next-reg tal reg reglen regfull)
-		  (cons hed reruns)))
+            (runs:loop-values tal reg reglen regfull (cons hed reruns))
+            )
 	  #f)) ;; #f flags do not loop
 
      ((and (not (null? fails))(member 'toplevel testmode))
       (if (or (not (null? reg))(not (null? tal)))
 	   (list (car newtal)(append (cdr newtal) reg) '() reruns)
 	  #f)) 
      ((null? runnables) #f) ;; if we get here and non-completed is null then it is all over.
      (else
       (debug:print 0 *default-log-port* "WARNING: FAILS or incomplete tests maybe preventing completion of this run. Watch for issues with test " hed ", continuing for now")
-      ;; (list (runs:queue-next-hed tal reg reglen regfull)
-      ;;   	(runs:queue-next-tal tal reg reglen regfull)
-      ;;   	(runs:queue-next-reg tal reg reglen regfull)
-      ;;   	reruns)
       (list (car newtal)(cdr newtal) reg reruns)))))
 
 (define (runs:mixed-list-testname-and-testrec->list-of-strings inlst)
   (if (null? inlst)
       '()