Use 3-argument dict-map mapping function.

dictionary.scm

@@ -100,15 +100,27 @@
    (map car d))
 
  ;; Maps dictionary values, the procedure gets key-value pairs if it
- ;; accepts more than one argument.
+ ;; accepts more than one argument. If it accepts a third argument,
+ ;; index gets passed as well.
  (define (dict-map proc d)
-   (let ((both? (> (length (procedure-information proc)) 2)))
+   (let* ((lpi (length (procedure-information proc)))
-     (map
+	  (both? (> lpi 2))
-      (lambda (kv)
+	  (index? (> lpi 3)))
-	(let ((k (car kv))
+     (let loop ((d d)
-	      (v (cdr kv)))
+		(r '())
-	  (cons k (if both? (proc k v) (proc v)))))
+		(i 0))
-      d)))
+       (if (null? d)
+	   r ; No reverse needed, order does not matter
+	   (loop (cdr d)
+		 (let ((k (caar d))
+		       (v (cdar d)))
+		   (cons (cons k (if both?
+				     (if index?
+					 (proc k v i)
+					 (proc k v))
+				     (proc v)))
+			 r))
+		 (add1 i))))))
 
  ;; Returns a dictionary containing only kv pairs matching the
  ;; predicate which must accept two arguments. Unlike list filter,

members-base.scm

@@ -68,11 +68,9 @@
       progress? "members"
       (let* ((fss (load-members-dir dn))
 	     (tot (sub1 (length (dict-keys fss))))
-	     (prg 0)
 	     (mb0 (dict-map
-		   (lambda (symfn symlinks)
+		   (lambda (symfn symlinks prg)
 		     (progress%-advance (/ prg tot))
-		     (set! prg (add1 prg))
 		     (members-dir-load-member dn
 					      symfn
 					      symlinks))