return alists; refactor structure

15 files changed, 687 insertions, 531 deletions

diff --git a/srfi/225.sld b/srfi/225.sld
index d9d38ec..84d17cf 100644
--- a/srfi/225.sld
+++ b/srfi/225.sld
@@ -1,159 +1,57 @@
 (define-library
   (srfi 225)
 
-  (import (scheme base)
-          (scheme case-lambda)
-          (scheme write)
-          (srfi 1)
-          (srfi 128))
-
-  (cond-expand
-    ((library (srfi 145)) (import (srfi 145)))
-    (else (include "assumptions.scm")))
-
+  (import 
+    (scheme base)
+    (srfi 1)
+    (srfi 128)
+    (srfi 225 core)
+    (srfi 225 default-impl)
+    (srfi 225 indexes))
+
+  (include-library-declarations "225/core-exports.scm")
+  (include-library-declarations "225/indexes-exports.scm")
+  (export make-dto)
+
+  ;; common implementations
+  (import (srfi 225 alist-impl))
   (export
+    make-alist-dto
+    eqv-alist-dto
+    equal-alist-dto)
+
+  ;; library-dependent DTO exports
+  ;; and implementations
+  ;;
+  ;;srfi-69-dto
+  ;;hash-table-dto
+  ;;srfi-126-dto
+  ;;mapping-dto
+  ;;hash-mapping-dto
 
-    ;; predicates
-    dictionary?
-    dict-empty?
-    dict-contains?
-    dict=?
-    dict-pure?
-
-    ;; lookup
-    dict-ref
-    dict-ref/default
-    dict-comparator
-
-    ;; mutation
-    dict-set
-    dict-adjoin
-    dict-delete
-    dict-delete-all
-    dict-replace
-    dict-intern
-    dict-update
-    dict-update/default
-    dict-pop
-    dict-map
-    dict-filter
-    dict-remove
-    dict-find-update
-
-    ;; whole dictionary
-    dict-size
-    dict-count
-    dict-any
-    dict-every
-    dict-keys
-    dict-values
-    dict-entries
-    dict-fold
-    dict-map->list
-    dict->alist
-
-    ;; iteration
-    dict-for-each
-    dict->generator
-    dict-set-accumulator
-    dict-adjoin-accumulator
-
-    ;; dictionary type descriptors
-    dto?
-    make-dto
-    dto-ref
-
-    ;; exceptions
-    dictionary-error
-    dictionary-error?
-    dictionary-message
-    dictionary-irritants
-
-    ;; proc indeces
-
-    ;; required
-    dictionary?-id
-    dict-find-update-id
-    dict-comparator-id
-    dict-map-id
-    dict-pure?-id
-    dict-remove-id
-    dict-size-id
-
-    ;; extra
-    dict->alist-id
-    dict-adjoin-accumulator-id
-    dict-adjoin-id
-    dict-any-id
-    dict-contains?-id
-    dict-count-id
-    dict-delete-all-id
-    dict-delete-id
-    dict-empty?-id
-    dict-entries-id
-    dict-every-id
-    dict-filter-id
-    dict-fold-id
-    dict-for-each-id
-    dict-intern-id
-    dict-keys-id
-    dict-map->list-id
-    dict-map-id
-    dict-pop-id
-    dict-ref-id
-    dict-ref/default-id
-    dict-remove-id
-    dict-replace-id
-    dict-set-accumulator-id
-    dict-set-id
-    dict-update-id
-    dict-update/default-id
-    dict-values-id
-    dict=?-id
-    dict->generator-id)
-
-    ;; implementations
-    (include "indexes.scm")
-    (include "externals.scm")
-    (include "default-impl.scm")
-
-    ;; library-dependent DTO exports
-    ;; and implementations
-    ;;
-    ;;srfi-69-dto
-    ;;hash-table-dto
-    ;;srfi-126-dto
-    ;;mapping-dto
-    ;;hash-mapping-dto
-
-    (cond-expand
-        ((library (srfi 69))
-         (import (prefix (srfi 69) t69-))
-         (include "srfi-69-impl.scm")
-         (export srfi-69-dto))
-        (else))
+  (cond-expand
+    ((library (srfi 69))
+     (import (srfi 225 srfi-69-impl))
+     (export srfi-69-dto))
+    (else))
 
-    (cond-expand
-        ((library (srfi 125))
-         (import (prefix (srfi 125) t125-))
-         (include "srfi-125-impl.scm")
-         (export hash-table-dto))
-        (else))
+  (cond-expand
+    ((library (srfi 125))
+     (import (srfi 225 srfi-125-impl))
+     (export hash-table-dto))
+    (else))
 
-    (cond-expand
-        ((library (srfi 126))
-         (import (prefix (srfi 126) t126-))
-         (include "srfi-126-impl.scm")
-         (export srfi-126-dto))
-        (else))
+  (cond-expand
+    ((library (srfi 126))
+     (import (srfi 225 srfi-126-impl))
+     (export srfi-126-dto))
+    (else))
 
-    (cond-expand
-        ((and (library (srfi 146))
-              (library (srfi 146 hash)))
-         (import (srfi 146)
-                 (srfi 146 hash))
-         (include "srfi-146-impl.scm"
-                  "srfi-146-hash-impl.scm")
-         (export mapping-dto
-                 hash-mapping-dto))
-        (else)))
+  (cond-expand
+    ((and (library (srfi 146))
+          (library (srfi 146 hash)))
+     (import (srfi 225 srfi-146-impl)
+             (srfi 225 srfi-146-hash-impl))
+     (export mapping-dto
+             hash-mapping-dto))
+    (else)))
diff --git a/srfi/225/alist-impl.sld b/srfi/225/alist-impl.sld
new file mode 100644
index 0000000..01df92a
--- /dev/null
+++ b/srfi/225/alist-impl.sld
@@ -0,0 +1,100 @@
+(define-library
+  (srfi 225 alist-impl)
+  (import (scheme base)
+          (srfi 1)
+          (srfi 128)
+          (srfi 225 core)
+          (srfi 225 default-impl)
+          (srfi 225 indexes))
+  (export
+    make-alist-dto
+    eqv-alist-dto
+    equal-alist-dto)
+
+  (begin
+
+    (define (alist? dto l)
+      (and (list? l)
+           (or (null? l)
+               (pair? (car l)))))
+
+    (define (alist-pure? dto alist)
+      #t)
+
+    (define (alist-map dto proc alist)
+      (map
+        (lambda (e)
+          (define key (car e))
+          (define value (cdr e))
+          (cons key (proc key value)))
+        alist))
+
+    (define (alist-filter dto pred alist)
+      (filter
+        (lambda (e)
+          (pred (car e) (cdr e)))
+        alist))
+
+    (define (make-alist-delete key=)
+      (lambda (dto key alist)
+        (filter
+          (lambda (entry)
+            (not (key= (car entry) key)))
+          alist)))
+
+    (define (make-alist-find-update key=)
+      (define alist-delete (make-alist-delete key=))
+      (lambda (dto alist key failure success)
+        (define (handle-success pair)
+          (define old-key (car pair))
+          (define old-value (cdr pair))
+          (define (update new-key new-value)
+            (cond
+              ((and (eq? old-key
+                         new-key)
+                    (eq? old-value
+                         new-value))
+               alist)
+              (else
+                (let ((new-list
+                        (alist-cons
+                          new-key new-value
+                          (alist-delete dto old-key alist))))
+                  new-list))))
+          (define (remove)
+            (alist-delete dto old-key alist))
+          (success old-key old-value update remove))
+
+        (define (handle-failure)
+          (define (insert value)
+            (alist-cons key value alist))
+          (define (ignore)
+            alist)
+          (failure insert ignore))
+        (cond
+          ((assoc key alist key=) => handle-success)
+          (else (handle-failure)))))
+
+
+    (define (alist-size dto alist)
+      (length alist))
+
+    (define (alist->alist dto alist)
+      alist)
+
+    (define (alist-comparator dto dictionary)
+      #f)
+
+    (define (make-alist-dto key=)
+      (make-dto
+        dictionary?-id alist?
+        dict-pure?-id alist-pure?
+        dict-map-id alist-map
+        dict-filter-id alist-filter
+        dict-find-update-id (make-alist-find-update key=)
+        dict-size-id alist-size
+        dict->alist-id alist->alist
+        dict-comparator-id alist-comparator))
+
+    (define eqv-alist-dto (make-alist-dto eqv?))
+    (define equal-alist-dto (make-alist-dto equal?))))
diff --git a/srfi/assumptions.scm b/srfi/225/assumptions.scm
index 86ef435..86ef435 100644
--- a/srfi/assumptions.scm
+++ b/srfi/225/assumptions.scm
diff --git a/srfi/225/core-exports.scm b/srfi/225/core-exports.scm
new file mode 100644
index 0000000..90e2992
--- /dev/null
+++ b/srfi/225/core-exports.scm
@@ -0,0 +1,55 @@
+(export
+    ;; predicates
+    dictionary?
+    dict-empty?
+    dict-contains?
+    dict=?
+    dict-pure?
+
+    ;; lookup
+    dict-ref
+    dict-ref/default
+    dict-comparator
+
+    ;; mutation
+    dict-set
+    dict-adjoin
+    dict-delete
+    dict-delete-all
+    dict-replace
+    dict-intern
+    dict-update
+    dict-update/default
+    dict-pop
+    dict-map
+    dict-filter
+    dict-remove
+    dict-find-update
+
+    ;; whole dictionary
+    dict-size
+    dict-count
+    dict-any
+    dict-every
+    dict-keys
+    dict-values
+    dict-entries
+    dict-fold
+    dict-map->list
+    dict->alist
+
+    ;; iteration
+    dict-for-each
+    dict->generator
+    dict-set-accumulator
+    dict-adjoin-accumulator
+
+    ;; dictionary type descriptors
+    dto?
+    dto-ref
+
+    ;; exceptions
+    dictionary-error
+    dictionary-error?
+    dictionary-message
+    dictionary-irritants)
diff --git a/srfi/externals.scm b/srfi/225/core-impl.scm
index f1045e5..2e38432 100644
--- a/srfi/externals.scm
+++ b/srfi/225/core-impl.scm
@@ -104,7 +104,7 @@
 (define (dto-ref dto procindex)
   (dto-ref-stx dto procindex))
 
-(define (make-modified-dto dto . lst)
+(define (make-modified-dto dto lst)
   (define vec (vector-copy (procvec dto)))
   (do ((lst lst (cddr lst)))
       ((null? lst))
@@ -117,9 +117,6 @@
       (vector-set! vec proc-id proc)))
   (make-dto-private vec))
 
-(define (make-dto . lst)
-  (apply make-modified-dto default-dto lst))
-
 (define-syntax dto-helper
   (syntax-rules ()
     ((_ (arg ...) (index proc) rest ...)
diff --git a/srfi/225/core.sld b/srfi/225/core.sld
new file mode 100644
index 0000000..573464d
--- /dev/null
+++ b/srfi/225/core.sld
@@ -0,0 +1,18 @@
+(define-library
+  (srfi 225 core)
+
+  (import (scheme base)
+          (scheme case-lambda)
+          (srfi 1)
+          (srfi 128)
+          (srfi 225 indexes))
+  (cond-expand
+    ((library (srfi 145)) (import (srfi 145)))
+    (else (include "assumptions.scm")))
+
+  (include "core-impl.scm")
+  (include-library-declarations "core-exports.scm")
+  (export make-dto-private
+          make-modified-dto
+          procvec
+          dict-procedures-count))
diff --git a/srfi/default-impl.scm b/srfi/225/default-impl.sld
index ef1eb6c..0c7d75c 100644
--- a/srfi/default-impl.scm
+++ b/srfi/225/default-impl.sld
@@ -1,5 +1,12 @@
-(define default-dto
-  (let ()
+(define-library
+  (srfi 225 default-impl)
+  (import (scheme base)
+          (srfi 1)
+          (srfi 128)
+          (srfi 225 core)
+          (srfi 225 indexes))
+  (export make-dto)
+  (begin
 
     ;; implementation of "default" dto, used as a filler for undefined
     ;; functions in other dtos
@@ -26,8 +33,8 @@
                             (lambda () #f)
                             (lambda (d2-value)
                               (if (= d1-value d2-value)
-                                  (check-entries* (cdr keys))
-                                  #f)))))))
+                                (check-entries* (cdr keys))
+                                #f)))))))
       (and (= (dict-size dto dict1)
               (dict-size dto dict2))
            (check-entries* (dict-keys dto dict1))))
@@ -39,10 +46,10 @@
 
     (define (default-dict-ref dto dictionary key failure success)
       (dict-find-update dto dictionary key
-                     (lambda (insert ignore)
-                       (failure))
-                     (lambda (key value update remove)
-                       (success value))))
+                        (lambda (insert ignore)
+                          (failure))
+                        (lambda (key value update remove)
+                          (success value))))
 
     (define (default-dict-ref/default dto dictionary key default)
       (dict-ref dto dictionary key
@@ -54,19 +61,19 @@
       (let loop ((objs objs)
                  (dictionary dictionary))
         (cond
-         ((null? objs)
-          dictionary)
-         ((null? (cdr objs))
-          (error "mismatch of key / values argument list" objs))
-         (else (let* ((key (car objs))
-                      (value (cadr objs))
-                      (new-d (dict-find-update dto dictionary key
-                                         (lambda (insert ignore)
-                                           (insert value))
-                                         (lambda (key old-value update delete)
-                                           (update key (if use-old? old-value value))))))
-                 (loop (cddr objs)
-                       new-d))))))
+          ((null? objs)
+           dictionary)
+          ((null? (cdr objs))
+           (error "mismatch of key / values argument list" objs))
+          (else (let* ((key (car objs))
+                       (value (cadr objs))
+                       (new-d (dict-find-update dto dictionary key
+                                                (lambda (insert ignore)
+                                                  (insert value))
+                                                (lambda (key old-value update delete)
+                                                  (update key (if use-old? old-value value))))))
+                  (loop (cddr objs)
+                        new-d))))))
 
     (define (default-dict-set dto dictionary . objs)
       (default-dict-set* dto dictionary #f objs))
@@ -84,54 +91,54 @@
           ((null? keylist) d)
           (else (let* ((key (car keylist))
                        (new-d (dict-find-update dto d key
-                                          (lambda (_ ignore)
-                                            (ignore))
-                                          (lambda (key old-value _ delete)
-                                            (delete)))))
+                                                (lambda (_ ignore)
+                                                  (ignore))
+                                                (lambda (key old-value _ delete)
+                                                  (delete)))))
                   (loop (cdr keylist)
                         new-d))))))
 
     (define (default-dict-replace dto dictionary key value)
       (dict-find-update dto dictionary key
-                  (lambda (_ ignore)
-                    (ignore))
-                  (lambda (key old-value update _)
-                    (update key value))))
+                        (lambda (_ ignore)
+                          (ignore))
+                        (lambda (key old-value update _)
+                          (update key value))))
 
     (define (default-dict-intern dto dictionary key failure)
       (dict-find-update dto dictionary key
-                  (lambda (insert _)
-                    (let ((value (failure)))
-                     (values (insert value) value)))
-                  (lambda (key value update _)
-                    (values dictionary value))))
+                        (lambda (insert _)
+                          (let ((value (failure)))
+                            (values (insert value) value)))
+                        (lambda (key value update _)
+                          (values dictionary value))))
 
     (define (default-dict-update dto dictionary key updater failure success)
       (dict-find-update dto dictionary key
-                  (lambda (insert ignore)
-                    (insert (updater (failure))))
-                  (lambda (key value update _)
-                    (update key (updater (success value))))))
+                        (lambda (insert ignore)
+                          (insert (updater (failure))))
+                        (lambda (key value update _)
+                          (update key (updater (success value))))))
 
     (define (default-dict-update/default dto dictionary key updater default)
       (dict-update dto dictionary key updater
-                    (lambda () default)
-                    (lambda (x) x)))
+                   (lambda () default)
+                   (lambda (x) x)))
 
     (define (default-dict-pop dto dictionary)
       (define (do-pop)
         (call/cc
-         (lambda (cont)
-           (dict-for-each dto
-                          (lambda (key value)
-                            (define new-dict
-                              (dict-delete-all dto dictionary (list key)))
-                            (cont new-dict key value))
-                          dictionary))))
+          (lambda (cont)
+            (dict-for-each dto
+                           (lambda (key value)
+                             (define new-dict
+                               (dict-delete-all dto dictionary (list key)))
+                             (cont new-dict key value))
+                           dictionary))))
       (define empty? (dict-empty? dto dictionary))
       (if empty?
-          (error "popped empty dictionary")
-          (do-pop)))
+        (error "popped empty dictionary")
+        (do-pop)))
 
     (define default-dict-map (not-implemented "dict-map"))
 
@@ -139,64 +146,64 @@
       (define keys (dict-keys dto dictionary))
       (define keys-to-delete
         (filter
-         (lambda (key)
-           (not (pred key (dict-ref dto dictionary key))))
-         keys))
+          (lambda (key)
+            (not (pred key (dict-ref dto dictionary key))))
+          keys))
       (dict-delete-all dto dictionary keys-to-delete))
 
     (define (default-dict-remove dto pred dictionary)
       (dict-filter dto (lambda (key value)
-                          (not (pred key value)))
-                    dictionary))
+                         (not (pred key value)))
+                   dictionary))
 
     (define (default-dict-count dto pred dictionary)
       (dict-fold dto
                  (lambda (key value acc)
                    (if (pred key value)
-                       (+ 1 acc)
-                       acc))
+                     (+ 1 acc)
+                     acc))
                  0
                  dictionary))
 
     (define (default-dict-any dto pred dictionary)
       (call/cc
-       (lambda (cont)
-         (dict-for-each dto
-                        (lambda (key value)
-                          (define ret (pred key value))
-                          (when ret
-                            (cont ret)))
-                        dictionary)
-         #f)))
+        (lambda (cont)
+          (dict-for-each dto
+                         (lambda (key value)
+                           (define ret (pred key value))
+                           (when ret
+                             (cont ret)))
+                         dictionary)
+          #f)))
 
     (define (default-dict-every dto pred dictionary)
       (define last #t)
       (call/cc
-       (lambda (cont)
-         (dict-for-each dto
-                        (lambda (key value)
-                          (define ret (pred key value))
-                          (when (not ret)
-                            (cont #f))
-                          (set! last ret))
-                        dictionary)
-         last)))
+        (lambda (cont)
+          (dict-for-each dto
+                         (lambda (key value)
+                           (define ret (pred key value))
+                           (when (not ret)
+                             (cont #f))
+                           (set! last ret))
+                         dictionary)
+          last)))
 
     (define (default-dict-keys dto dictionary)
       (reverse
-       (dict-fold dto
-                  (lambda (key value acc)
-                    (cons key acc))
-                  '()
-                  dictionary)))
+        (dict-fold dto
+                   (lambda (key value acc)
+                     (cons key acc))
+                   '()
+                   dictionary)))
 
     (define (default-dict-values dto dictionary)
       (reverse
-       (dict-fold dto
-                  (lambda (key value acc)
-                    (cons value acc))
-                  '()
-                  dictionary)))
+        (dict-fold dto
+                   (lambda (key value acc)
+                     (cons value acc))
+                   '()
+                   dictionary)))
 
     (define (default-dict-entries dto dictionary)
       (define pair
@@ -238,15 +245,15 @@
       (define cmp (dict-comparator dto dict))
       (define lower
         (if start
-            (lambda (el) (>=? cmp el start))
-            any))
+          (lambda (el) (>=? cmp el start))
+          any))
       (define upper
         (if end
-            (lambda (el) (<=? cmp el end))
-            any))
+          (lambda (el) (<=? cmp el end))
+          any))
       (define (accept el)
         (and (upper el) (lower el)))
-      
+
       (dict-map 
         dto
         (lambda (key value)
@@ -256,44 +263,44 @@
         dict))
 
     (define (default-dict->generator dto dict start end)
-      
+
       (define (any . _) #t)
       (define cmp (dict-comparator dto dict))
       (define lower
         (if start
-            (lambda (el) (>=? cmp el start))
-            any))
+          (lambda (el) (>=? cmp el start))
+          any))
       (define upper
         (if end
-            (lambda (el) (<=? cmp el end))
-            any))
+          (lambda (el) (<=? cmp el end))
+          any))
       (define (accept el)
         (and (upper el) (lower el)))
 
       ;; proc that takes yield value and yield continuation when yield is called
       ;; shouldn't return
       (define yield-handler #f)
-      
+
       (define (yield value)
         (when (or (eof-object? value)
                   (accept (car value)))
           (call/cc (lambda (yield-cont)
                      (yield-handler value yield-cont))) ))
-      
+
       (define (generate)
         (dict-for-each dto
                        (lambda (key value)
                          (yield (cons key value)))
                        dict)
         (yield (eof-object)))
-      
+
       ;; continuation at the point of last yield
       (define yield-cont #f)
-      
+
       ;; check if eof return was seen; if yes, keep returning eof
       ;; for further invocations
       (define eof #f)
-      
+
       (define (get-next-value exit)
         (set! yield-handler
           (lambda (value new-yield-cont)
@@ -304,7 +311,7 @@
               ;; gc clean everything up
               (set! yield-cont #f))
             (exit value)))
-        
+
         (cond
           ;; eof seen -- keep returning eof
           (eof (eof-object))
@@ -312,15 +319,15 @@
           ((not yield-cont) (generate))
           ;; continue from last yield position
           (else (yield-cont #t))))
-      
+
       (lambda ()
         (call/cc get-next-value)))
 
     (define (default-dict-accumulator dto dict acc-proc)
       (lambda (arg)
         (if (eof-object? arg)
-            dict
-            (set! dict (acc-proc dto dict (car arg) (cdr arg))))))
+          dict
+          (set! dict (acc-proc dto dict (car arg) (cdr arg))))))
 
     (define (default-dict-set-accumulator dto dict)
       (default-dict-accumulator dto dict dict-set))
@@ -328,56 +335,58 @@
     (define (default-dict-adjoin-accumulator dto dict)
       (default-dict-accumulator dto dict dict-adjoin))
 
-    (let ()
-      (define null-dto (make-dto-private (make-vector dict-procedures-count #f)))
-      (define default-dto
-        (make-modified-dto
-         null-dto
-         dictionary?-id default-dictionary?
-         dict-empty?-id default-dict-empty?
-         dict-contains?-id default-dict-contains?
-         dict=?-id default-dict=?
-         dict-pure?-id default-dict-pure?
-         dict-ref-id default-dict-ref
-         dict-ref/default-id default-dict-ref/default
-         dict-set-id default-dict-set
-         dict-adjoin-id default-dict-adjoin
-         dict-delete-id default-dict-delete
-         dict-delete-all-id default-dict-delete-all
-         dict-replace-id default-dict-replace
-         dict-intern-id default-dict-intern
-         dict-update-id default-dict-update
-         dict-update/default-id default-dict-update/default
-         dict-pop-id default-dict-pop
-         dict-map-id default-dict-map
-         dict-filter-id default-dict-filter
-         dict-remove-id default-dict-remove
-         dict-find-update-id default-dict-find-update
-         dict-size-id default-dict-size
-         dict-count-id default-dict-count
-         dict-any-id default-dict-any
-         dict-every-id default-dict-every
-         dict-keys-id default-dict-keys
-         dict-values-id default-dict-values
-         dict-entries-id default-dict-entries
-         dict-fold-id default-dict-fold
-         dict-map->list-id default-dict-map->list
-         dict->alist-id default-dict->alist
-         dict-comparator-id default-dict-comparator
-
-         dict-for-each-id default-dict-for-each
-
-         ;; generator procedures
-         dict->generator-id default-dict->generator
-         dict-set-accumulator-id default-dict-set-accumulator
-         dict-adjoin-accumulator-id default-dict-adjoin-accumulator))
-
-      ;; sanity check
-      (vector-for-each
-       (lambda (proc index)
-         (unless (and proc (procedure? proc))
-           (error "Missing or wrong default procedure definition" proc index)))
-       (procvec default-dto)
-       (list->vector (iota dict-procedures-count)))
-
-      default-dto)))
+    (define null-dto (make-dto-private (make-vector dict-procedures-count #f)))
+
+    (define default-dto
+      (make-modified-dto
+        null-dto
+        (list
+            dictionary?-id default-dictionary?
+            dict-empty?-id default-dict-empty?
+            dict-contains?-id default-dict-contains?
+            dict=?-id default-dict=?
+            dict-pure?-id default-dict-pure?
+            dict-ref-id default-dict-ref
+            dict-ref/default-id default-dict-ref/default
+            dict-set-id default-dict-set
+            dict-adjoin-id default-dict-adjoin
+            dict-delete-id default-dict-delete
+            dict-delete-all-id default-dict-delete-all
+            dict-replace-id default-dict-replace
+            dict-intern-id default-dict-intern
+            dict-update-id default-dict-update
+            dict-update/default-id default-dict-update/default
+            dict-pop-id default-dict-pop
+            dict-map-id default-dict-map
+            dict-filter-id default-dict-filter
+            dict-remove-id default-dict-remove
+            dict-find-update-id default-dict-find-update
+            dict-size-id default-dict-size
+            dict-count-id default-dict-count
+            dict-any-id default-dict-any
+            dict-every-id default-dict-every
+            dict-keys-id default-dict-keys
+            dict-values-id default-dict-values
+            dict-entries-id default-dict-entries
+            dict-fold-id default-dict-fold
+            dict-map->list-id default-dict-map->list
+            dict->alist-id default-dict->alist
+            dict-comparator-id default-dict-comparator
+
+            dict-for-each-id default-dict-for-each
+
+            ;; generator procedures
+            dict->generator-id default-dict->generator
+            dict-set-accumulator-id default-dict-set-accumulator
+            dict-adjoin-accumulator-id default-dict-adjoin-accumulator)))
+
+    (define (make-dto . lst)
+      (make-modified-dto default-dto lst))
+
+    ;; sanity check
+    (vector-for-each
+      (lambda (proc index)
+        (unless (and proc (procedure? proc))
+          (error "Missing or wrong default procedure definition" proc index)))
+      (procvec default-dto)
+      (list->vector (iota dict-procedures-count)))))
diff --git a/srfi/225/indexes-exports.scm b/srfi/225/indexes-exports.scm
new file mode 100644
index 0000000..fcb49ae
--- /dev/null
+++ b/srfi/225/indexes-exports.scm
@@ -0,0 +1,41 @@
+(export
+    ;; required
+    dictionary?-id
+    dict-find-update-id
+    dict-comparator-id
+    dict-map-id
+    dict-pure?-id
+    dict-remove-id
+    dict-size-id
+
+    ;; extra
+    dict->alist-id
+    dict-adjoin-accumulator-id
+    dict-adjoin-id
+    dict-any-id
+    dict-contains?-id
+    dict-count-id
+    dict-delete-all-id
+    dict-delete-id
+    dict-empty?-id
+    dict-entries-id
+    dict-every-id
+    dict-filter-id
+    dict-fold-id
+    dict-for-each-id
+    dict-intern-id
+    dict-keys-id
+    dict-map->list-id
+    dict-map-id
+    dict-pop-id
+    dict-ref-id
+    dict-ref/default-id
+    dict-remove-id
+    dict-replace-id
+    dict-set-accumulator-id
+    dict-set-id
+    dict-update-id
+    dict-update/default-id
+    dict-values-id
+    dict=?-id
+    dict->generator-id)
diff --git a/srfi/225/indexes.sld b/srfi/225/indexes.sld
new file mode 100644
index 0000000..b746c39
--- /dev/null
+++ b/srfi/225/indexes.sld
@@ -0,0 +1,48 @@
+(define-library
+  (srfi 225 indexes)
+  (import (scheme base))
+  (include-library-declarations "indexes-exports.scm")
+  (export dict-procedures-count)
+  (begin
+    (define proc-id 0)
+    (define (proc-id-inc)
+      (define v proc-id)
+      (set! proc-id (+ 1 proc-id))
+      v)
+    (define dictionary?-id (proc-id-inc))
+    (define dict-empty?-id (proc-id-inc))
+    (define dict-contains?-id (proc-id-inc))
+    (define dict=?-id (proc-id-inc))
+    (define dict-pure?-id (proc-id-inc))
+    (define dict-ref-id (proc-id-inc))
+    (define dict-ref/default-id (proc-id-inc))
+    (define dict-set-id (proc-id-inc))
+    (define dict-adjoin-id (proc-id-inc))
+    (define dict-delete-id (proc-id-inc))
+    (define dict-delete-all-id (proc-id-inc))
+    (define dict-replace-id (proc-id-inc))
+    (define dict-intern-id (proc-id-inc))
+    (define dict-update-id (proc-id-inc))
+    (define dict-update/default-id (proc-id-inc))
+    (define dict-pop-id (proc-id-inc))
+    (define dict-map-id (proc-id-inc))
+    (define dict-filter-id (proc-id-inc))
+    (define dict-remove-id (proc-id-inc))
+    (define dict-find-update-id (proc-id-inc))
+    (define dict-size-id (proc-id-inc))
+    (define dict-count-id (proc-id-inc))
+    (define dict-any-id (proc-id-inc))
+    (define dict-every-id (proc-id-inc))
+    (define dict-keys-id (proc-id-inc))
+    (define dict-values-id (proc-id-inc))
+    (define dict-entries-id (proc-id-inc))
+    (define dict-fold-id (proc-id-inc))
+    (define dict-map->list-id (proc-id-inc))
+    (define dict->alist-id (proc-id-inc))
+    (define dict-comparator-id (proc-id-inc))
+    (define dict-for-each-id (proc-id-inc))
+    (define dict->generator-id (proc-id-inc))
+    (define dict-set-accumulator-id (proc-id-inc))
+    (define dict-adjoin-accumulator-id (proc-id-inc))
+    (define dict-procedures-count (proc-id-inc)) ;; only used for tracking backing vector size
+    ))
diff --git a/srfi/srfi-125-impl.scm b/srfi/225/srfi-125-impl.sld
index b3affe4..a987787 100644
--- a/srfi/srfi-125-impl.scm
+++ b/srfi/225/srfi-125-impl.sld
@@ -1,5 +1,12 @@
-(define hash-table-dto
-  (let ()
+(define-library
+  (srfi 225 srfi-125-impl)
+  (import (scheme base)
+          (srfi 128)
+          (prefix (srfi 125) t125-)
+          (srfi 225 default-impl)
+          (srfi 225 indexes))
+  (export hash-table-dto)
+  (begin
 
    (define (t125-hash-table-pure?* dto table)
      #f)
@@ -78,9 +85,6 @@
                        #f
                        (t125-hash-table-hash-function table)))
 
-    (define (t125-hash-table-copy* dto table)
-      (t125-hash-table-copy table #t))
-
     (define (t125-hash-table-size* dto table)
       (t125-hash-table-size table))
 
@@ -117,28 +121,29 @@
     (define (t125-hash-table-ref/default* dto table key default)
       (t125-hash-table-ref/default table key default))
 
-    (make-dto
-     dictionary?-id t125-hash-table?*
-     dict-pure?-id t125-hash-table-pure?*
-     dict-empty?-id t125-hash-table-empty?*
-     dict-contains?-id t125-hash-table-contains?*
-     dict-ref-id t125-hash-table-ref*
-     dict-ref/default-id t125-hash-table-ref/default*
-     dict-set-id t125-hash-table-set*
-     dict-delete-all-id t125-hash-table-delete-all*
-     dict-intern-id t125-hash-table-intern*
-     dict-update-id t125-hash-table-update*
-     dict-update/default-id t125-hash-table-update/default*
-     dict-pop-id t125-hash-table-pop*
-     dict-map-id t125-hash-table-map*
-     dict-filter-id t125-hash-table-filter*
-     dict-remove-id t125-hash-table-remove*
-     dict-find-update-id t125-hash-table-find-update*
-     dict-size-id t125-hash-table-size*
-     dict-keys-id t125-hash-table-keys*
-     dict-values-id t125-hash-table-values*
-     dict-entries-id t125-hash-table-entries*
-     dict-fold-id t125-hash-table-fold*
-     dict-map->list-id t125-hash-table-map->list*
-     dict->alist-id t125-hash-table->alist*
-     dict-comparator-id t125-hash-table-comparator*)))
+    (define hash-table-dto
+      (make-dto
+        dictionary?-id t125-hash-table?*
+        dict-pure?-id t125-hash-table-pure?*
+        dict-empty?-id t125-hash-table-empty?*
+        dict-contains?-id t125-hash-table-contains?*
+        dict-ref-id t125-hash-table-ref*
+        dict-ref/default-id t125-hash-table-ref/default*
+        dict-set-id t125-hash-table-set*
+        dict-delete-all-id t125-hash-table-delete-all*
+        dict-intern-id t125-hash-table-intern*
+        dict-update-id t125-hash-table-update*
+        dict-update/default-id t125-hash-table-update/default*
+        dict-pop-id t125-hash-table-pop*
+        dict-map-id t125-hash-table-map*
+        dict-filter-id t125-hash-table-filter*
+        dict-remove-id t125-hash-table-remove*
+        dict-find-update-id t125-hash-table-find-update*
+        dict-size-id t125-hash-table-size*
+        dict-keys-id t125-hash-table-keys*
+        dict-values-id t125-hash-table-values*
+        dict-entries-id t125-hash-table-entries*
+        dict-fold-id t125-hash-table-fold*
+        dict-map->list-id t125-hash-table-map->list*
+        dict->alist-id t125-hash-table->alist*
+        dict-comparator-id t125-hash-table-comparator*))))
diff --git a/srfi/srfi-126-impl.scm b/srfi/225/srfi-126-impl.sld
index 4bdb53d..5acc2cc 100644
--- a/srfi/srfi-126-impl.scm
+++ b/srfi/225/srfi-126-impl.sld
@@ -1,36 +1,41 @@
-(define srfi-126-dto
-  (let ()
-
+(define-library
+  (srfi 225 srfi-126-impl)
+  (import (scheme base)
+          (prefix (srfi 126) t126-)
+          (srfi 225 default-impl)
+          (srfi 225 indexes))
+  (export srfi-126-dto)
+  (begin
     (define (prep-dto-arg proc)
       (lambda (dto . args)
         (apply proc args)))
-    
+
     (define (t126-hashtable-pure?* dto table)
       #f)
 
     (define (t126-hashtable-ref* dto table key fail success)
       (define-values (value found?) (t126-hashtable-lookup table key))
       (if found?
-          (success value)
-          (fail)))
+        (success value)
+        (fail)))
 
     (define (t126-hashtable-ref/default* dto table key default)
       (t126-hashtable-ref table key default))
 
     (define (t126-hashtable-set* dto table . obj)
       (let loop ((obj obj))
-         (if (null? obj)
-             #t
-             (begin
-               (t126-hashtable-set! table (car obj) (cadr obj))
-               (loop (cddr obj)))))
+        (if (null? obj)
+          #t
+          (begin
+            (t126-hashtable-set! table (car obj) (cadr obj))
+            (loop (cddr obj)))))
       table)
 
     (define (t126-hashtable-delete-all* dto table keys)
       (for-each
-          (lambda (key)
-            (t126-hashtable-delete! table key))
-          keys)
+        (lambda (key)
+          (t126-hashtable-delete! table key))
+        keys)
       table)
 
     (define (t126-hashtable-intern* dto table key default)
@@ -42,9 +47,9 @@
 
     (define (t126-hashtable-pop* dto table)
       (if (t126-hashtable-empty? table)
-          (error "popped empty dictionary")
-          (call-with-values (lambda () (t126-hashtable-pop! table))
-                            (lambda (key value) (values table key value)))))
+        (error "popped empty dictionary")
+        (call-with-values (lambda () (t126-hashtable-pop! table))
+                          (lambda (key value) (values table key value)))))
 
     (define (t126-hashtable-update-all* dto proc table)
       (t126-hashtable-update-all! table proc)
@@ -52,8 +57,8 @@
 
     (define (t126-hashtable-filter* dto proc table)
       (t126-hashtable-prune! table
-                               (lambda (key value)
-                                 (not (proc key value))))
+                             (lambda (key value)
+                               (not (proc key value))))
       table)
 
     (define (t126-hashtable-remove* dto proc table)
@@ -64,7 +69,7 @@
       (define (handle-success value)
         (define (update new-key new-value)
           (unless (eq? new-key key)
-              (t126-hashtable-delete! table key))
+            (t126-hashtable-delete! table key))
           (t126-hashtable-set! table new-key new-value)
           table)
         (define (remove)
@@ -82,8 +87,8 @@
       (define default (cons #f #f))
       (define found (t126-hashtable-ref table key default))
       (if (eq? default found)
-          (handle-fail)
-          (handle-success found)))
+        (handle-fail)
+        (handle-success found)))
 
     (define (t126-hashtable-map->lset* dto proc table)
       (t126-hashtable-map->lset table proc))
@@ -96,34 +101,35 @@
 
     (define (t126-hashtable-entries* dto table)
       (call-with-values
-          (lambda () (t126-hashtable-entries table))
+        (lambda () (t126-hashtable-entries table))
         (lambda (keys vals)
           (values
-           (vector->list keys)
-           (vector->list vals)))))
+            (vector->list keys)
+            (vector->list vals)))))
 
     (define (t126-hashtable-comparator* dto table)
       #f)
 
-    (make-dto
-     dictionary?-id (prep-dto-arg t126-hashtable?)
-     dict-pure?-id t126-hashtable-pure?*
-     dict-empty?-id (prep-dto-arg t126-hashtable-empty?)
-     dict-contains?-id (prep-dto-arg t126-hashtable-contains?)
-     dict-ref-id t126-hashtable-ref*
-     dict-ref/default-id t126-hashtable-ref/default*
-     dict-set-id t126-hashtable-set*
-     dict-delete-all-id t126-hashtable-delete-all*
-     dict-intern-id t126-hashtable-intern*
-     dict-update/default-id t126-hashtable-update/default*
-     dict-pop-id t126-hashtable-pop*
-     dict-map-id t126-hashtable-update-all*
-     dict-filter-id t126-hashtable-filter*
-     dict-remove-id t126-hashtable-remove*
-     dict-find-update-id t126-hashtable-find-update*
-     dict-size-id (prep-dto-arg t126-hashtable-size)
-     dict-keys-id t126-hashtable-keys*
-     dict-values-id t126-hashtable-values*
-     dict-entries-id t126-hashtable-entries*
-     dict-map->list-id t126-hashtable-map->lset*
-     dict-comparator-id t126-hashtable-comparator*)))
+    (define srfi-126-dto
+      (make-dto
+        dictionary?-id (prep-dto-arg t126-hashtable?)
+        dict-pure?-id t126-hashtable-pure?*
+        dict-empty?-id (prep-dto-arg t126-hashtable-empty?)
+        dict-contains?-id (prep-dto-arg t126-hashtable-contains?)
+        dict-ref-id t126-hashtable-ref*
+        dict-ref/default-id t126-hashtable-ref/default*
+        dict-set-id t126-hashtable-set*
+        dict-delete-all-id t126-hashtable-delete-all*
+        dict-intern-id t126-hashtable-intern*
+        dict-update/default-id t126-hashtable-update/default*
+        dict-pop-id t126-hashtable-pop*
+        dict-map-id t126-hashtable-update-all*
+        dict-filter-id t126-hashtable-filter*
+        dict-remove-id t126-hashtable-remove*
+        dict-find-update-id t126-hashtable-find-update*
+        dict-size-id (prep-dto-arg t126-hashtable-size)
+        dict-keys-id t126-hashtable-keys*
+        dict-values-id t126-hashtable-values*
+        dict-entries-id t126-hashtable-entries*
+        dict-map->list-id t126-hashtable-map->lset*
+        dict-comparator-id t126-hashtable-comparator*))))
diff --git a/srfi/srfi-146-hash-impl.scm b/srfi/225/srfi-146-hash-impl.sld
index 609fce9..82dc769 100644
--- a/srfi/srfi-146-hash-impl.scm
+++ b/srfi/225/srfi-146-hash-impl.sld
@@ -1,10 +1,17 @@
-(define hash-mapping-dto
-  (let ()
+(define-library
+  (srfi 225 srfi-146-hash-impl)
+  (import (scheme base)
+          (srfi 146 hash)
+          (srfi 225 core)
+          (srfi 225 default-impl)
+          (srfi 225 indexes))
+  (export hash-mapping-dto)
+  (begin
 
     (define (prep-dto-arg proc)
       (lambda (dto . args)
         (apply proc args)))
-    
+
     (define (hashmap-map* dto proc dict)
       (hashmap-map (lambda (key value)
                      (values key (proc key value)))
@@ -40,33 +47,33 @@
                                              (lambda () (call-with-values (lambda () (remove #f)) k2))))
                                          (k result))))))
           new-dict)))
-
-    (make-dto
-     dictionary?-id (prep-dto-arg hashmap?)
-     dict-pure?-id (lambda _ #t)
-     dict-map-id hashmap-map*
-     dict-empty?-id (prep-dto-arg hashmap-empty?)
-     dict-contains?-id (prep-dto-arg hashmap-contains?)
-     dict-ref-id (prep-dto-arg hashmap-ref)
-     dict-ref/default-id (prep-dto-arg hashmap-ref/default)
-     dict-set-id (prep-dto-arg hashmap-set)
-     dict-adjoin-id (prep-dto-arg hashmap-adjoin)
-     dict-delete-id (prep-dto-arg hashmap-delete)
-     dict-delete-all-id (prep-dto-arg hashmap-delete-all)
-     dict-replace-id (prep-dto-arg hashmap-replace)
-     dict-intern-id (prep-dto-arg hashmap-intern)
-     dict-update-id (prep-dto-arg hashmap-update)
-     dict-update/default-id (prep-dto-arg hashmap-update/default)
-     dict-pop-id (prep-dto-arg hashmap-pop)
-     dict-filter-id (prep-dto-arg hashmap-filter)
-     dict-remove-id (prep-dto-arg hashmap-remove)
-     dict-find-update-id hashmap-find-update*
-     dict-size-id (prep-dto-arg hashmap-size)
-     dict-count-id (prep-dto-arg hashmap-count)
-     dict-keys-id (prep-dto-arg hashmap-keys)
-     dict-values-id (prep-dto-arg hashmap-values)
-     dict-entries-id (prep-dto-arg hashmap-entries)
-     dict-fold-id (prep-dto-arg hashmap-fold)
-     dict-map->list-id (prep-dto-arg hashmap-map->list)
-     dict->alist-id (prep-dto-arg hashmap->alist)
-     dict-comparator-id (prep-dto-arg hashmap-key-comparator))))
+    (define hash-mapping-dto
+      (make-dto
+        dictionary?-id (prep-dto-arg hashmap?)
+        dict-pure?-id (lambda _ #t)
+        dict-map-id hashmap-map*
+        dict-empty?-id (prep-dto-arg hashmap-empty?)
+        dict-contains?-id (prep-dto-arg hashmap-contains?)
+        dict-ref-id (prep-dto-arg hashmap-ref)
+        dict-ref/default-id (prep-dto-arg hashmap-ref/default)
+        dict-set-id (prep-dto-arg hashmap-set)
+        dict-adjoin-id (prep-dto-arg hashmap-adjoin)
+        dict-delete-id (prep-dto-arg hashmap-delete)
+        dict-delete-all-id (prep-dto-arg hashmap-delete-all)
+        dict-replace-id (prep-dto-arg hashmap-replace)
+        dict-intern-id (prep-dto-arg hashmap-intern)
+        dict-update-id (prep-dto-arg hashmap-update)
+        dict-update/default-id (prep-dto-arg hashmap-update/default)
+        dict-pop-id (prep-dto-arg hashmap-pop)
+        dict-filter-id (prep-dto-arg hashmap-filter)
+        dict-remove-id (prep-dto-arg hashmap-remove)
+        dict-find-update-id hashmap-find-update*
+        dict-size-id (prep-dto-arg hashmap-size)
+        dict-count-id (prep-dto-arg hashmap-count)
+        dict-keys-id (prep-dto-arg hashmap-keys)
+        dict-values-id (prep-dto-arg hashmap-values)
+        dict-entries-id (prep-dto-arg hashmap-entries)
+        dict-fold-id (prep-dto-arg hashmap-fold)
+        dict-map->list-id (prep-dto-arg hashmap-map->list)
+        dict->alist-id (prep-dto-arg hashmap->alist)
+        dict-comparator-id (prep-dto-arg hashmap-key-comparator)))))
diff --git a/srfi/srfi-146-impl.scm b/srfi/225/srfi-146-impl.sld
index c6280ba..d9577b4 100644
--- a/srfi/srfi-146-impl.scm
+++ b/srfi/225/srfi-146-impl.sld
@@ -1,10 +1,17 @@
-(define mapping-dto
-  (let ()
+(define-library
+  (srfi 225 srfi-146-impl)
+  (import (scheme base)
+          (srfi 146)
+          (srfi 225 core)
+          (srfi 225 default-impl)
+          (srfi 225 indexes))
+  (export mapping-dto)
+  (begin
 
     (define (prep-dto-arg proc)
       (lambda (dto . args)
         (apply proc args)))
-    
+
     (define (mapping-map* dto proc dict)
       (mapping-map (lambda (key value)
                      (values key (proc key value))) 
@@ -41,32 +48,33 @@
                                          (k result))))))
           new-dict)))
 
-    (make-dto
-     dictionary?-id (prep-dto-arg mapping?)
-     dict-pure?-id (lambda _ #t)
-     dict-map-id mapping-map*
-     dict-empty?-id (prep-dto-arg mapping-empty?)
-     dict-contains?-id (prep-dto-arg mapping-contains?)
-     dict-ref-id (prep-dto-arg mapping-ref)
-     dict-ref/default-id (prep-dto-arg mapping-ref/default)
-     dict-set-id (prep-dto-arg mapping-set)
-     dict-adjoin-id (prep-dto-arg mapping-adjoin)
-     dict-delete-id (prep-dto-arg mapping-delete)
-     dict-delete-all-id (prep-dto-arg mapping-delete-all)
-     dict-replace-id (prep-dto-arg mapping-replace)
-     dict-intern-id (prep-dto-arg mapping-intern)
-     dict-update-id (prep-dto-arg mapping-update)
-     dict-update/default-id (prep-dto-arg mapping-update/default)
-     dict-pop-id (prep-dto-arg mapping-pop)
-     dict-filter-id (prep-dto-arg mapping-filter)
-     dict-remove-id (prep-dto-arg mapping-remove)
-     dict-find-update-id mapping-find-update*
-     dict-size-id (prep-dto-arg mapping-size)
-     dict-count-id (prep-dto-arg mapping-count)
-     dict-keys-id (prep-dto-arg mapping-keys)
-     dict-values-id (prep-dto-arg mapping-values)
-     dict-entries-id (prep-dto-arg mapping-entries)
-     dict-fold-id (prep-dto-arg mapping-fold)
-     dict-map->list-id (prep-dto-arg mapping-map->list)
-     dict->alist-id (prep-dto-arg mapping->alist)
-     dict-comparator-id (prep-dto-arg mapping-key-comparator))))
+    (define mapping-dto
+      (make-dto
+        dictionary?-id (prep-dto-arg mapping?)
+        dict-pure?-id (lambda _ #t)
+        dict-map-id mapping-map*
+        dict-empty?-id (prep-dto-arg mapping-empty?)
+        dict-contains?-id (prep-dto-arg mapping-contains?)
+        dict-ref-id (prep-dto-arg mapping-ref)
+        dict-ref/default-id (prep-dto-arg mapping-ref/default)
+        dict-set-id (prep-dto-arg mapping-set)
+        dict-adjoin-id (prep-dto-arg mapping-adjoin)
+        dict-delete-id (prep-dto-arg mapping-delete)
+        dict-delete-all-id (prep-dto-arg mapping-delete-all)
+        dict-replace-id (prep-dto-arg mapping-replace)
+        dict-intern-id (prep-dto-arg mapping-intern)
+        dict-update-id (prep-dto-arg mapping-update)
+        dict-update/default-id (prep-dto-arg mapping-update/default)
+        dict-pop-id (prep-dto-arg mapping-pop)
+        dict-filter-id (prep-dto-arg mapping-filter)
+        dict-remove-id (prep-dto-arg mapping-remove)
+        dict-find-update-id mapping-find-update*
+        dict-size-id (prep-dto-arg mapping-size)
+        dict-count-id (prep-dto-arg mapping-count)
+        dict-keys-id (prep-dto-arg mapping-keys)
+        dict-values-id (prep-dto-arg mapping-values)
+        dict-entries-id (prep-dto-arg mapping-entries)
+        dict-fold-id (prep-dto-arg mapping-fold)
+        dict-map->list-id (prep-dto-arg mapping-map->list)
+        dict->alist-id (prep-dto-arg mapping->alist)
+        dict-comparator-id (prep-dto-arg mapping-key-comparator)))))
diff --git a/srfi/srfi-69-impl.scm b/srfi/225/srfi-69-impl.sld
index 02e3d4a..6d04e4e 100644
--- a/srfi/srfi-69-impl.scm
+++ b/srfi/225/srfi-69-impl.sld
@@ -1,6 +1,12 @@
-(define srfi-69-dto
-  (let ()
-
+(define-library
+  (srfi 225 srfi-69-impl)
+  (import (scheme base)
+          (srfi 128)
+          (prefix (srfi 69) t69-)
+          (srfi 225 default-impl)
+          (srfi 225 indexes))
+  (export srfi-69-dto)
+  (begin
     (define (prep-dto-arg proc)
       (lambda (dto . args)
         (apply proc args)))
@@ -12,16 +18,16 @@
       (define default (cons #f #f))
       (define found (t69-hash-table-ref/default table key default))
       (if (eq? found default)
-          (fail)
-          (success found)))
+        (fail)
+        (success found)))
 
     (define (t69-hash-table-set!* dto table . obj)
       (let loop ((obj obj))
         (if (null? obj)
-            table
-            (begin
-              (t69-hash-table-set! table (car obj) (cadr obj))
-              (loop (cddr obj)))))
+          table
+          (begin
+            (t69-hash-table-set! table (car obj) (cadr obj))
+            (loop (cddr obj)))))
       table)
 
     (define (t69-hash-table-update!/default* dto table key proc default)
@@ -30,21 +36,21 @@
 
     (define (t69-hash-table-delete-all!* dto table keys)
       (for-each
-       (lambda (key)
-         (t69-hash-table-delete! table key))
-       keys)
+        (lambda (key)
+          (t69-hash-table-delete! table key))
+        keys)
       table)
 
     (define (t69-hash-table-map!* dto proc table)
       (t69-hash-table-walk table (lambda (key value)
-                               (t69-hash-table-set! table key (proc key value))))
+                                   (t69-hash-table-set! table key (proc key value))))
       table)
 
     (define (t69-hash-table-filter!* dto proc table)
       (t69-hash-table-walk table
-                       (lambda (key value)
-                         (unless (proc key value)
-                           (t69-hash-table-delete! table key))))
+                           (lambda (key value)
+                             (unless (proc key value)
+                               (t69-hash-table-delete! table key))))
       table)
 
     (define (t69-hash-table-fold* dto proc knil table)
@@ -72,8 +78,8 @@
       (define default (cons #f #f))
       (define found (t69-hash-table-ref/default table key default))
       (if (eq? default found)
-          (handle-fail)
-          (handle-success found)))
+        (handle-fail)
+        (handle-success found)))
 
     (define (t69-hash-table-comparator* dto table)
       (make-comparator (lambda args #t)
@@ -82,21 +88,22 @@
                        #f
                        (t69-hash-table-hash-function table)))
 
-    (make-dto
-     dictionary?-id (prep-dto-arg t69-hash-table?)
-     dict-pure?-id t69-hash-table-pure?*
-     dict-ref-id t69-hash-table-ref*
-     dict-ref/default-id (prep-dto-arg t69-hash-table-ref/default)
-     dict-set-id t69-hash-table-set!*
-     dict-delete-all-id t69-hash-table-delete-all!*
-     dict-contains?-id (prep-dto-arg t69-hash-table-exists?)
-     dict-update/default-id t69-hash-table-update!/default*
-     dict-size-id (prep-dto-arg t69-hash-table-size)
-     dict-keys-id (prep-dto-arg t69-hash-table-keys)
-     dict-values-id (prep-dto-arg t69-hash-table-values)
-     dict-map-id t69-hash-table-map!*
-     dict-filter-id t69-hash-table-filter!*
-     dict-fold-id t69-hash-table-fold*
-     dict->alist-id (prep-dto-arg t69-hash-table->alist)
-     dict-find-update-id t69-hash-table-find-update!*
-     dict-comparator-id t69-hash-table-comparator*)))
+    (define srfi-69-dto
+      (make-dto
+        dictionary?-id (prep-dto-arg t69-hash-table?)
+        dict-pure?-id t69-hash-table-pure?*
+        dict-ref-id t69-hash-table-ref*
+        dict-ref/default-id (prep-dto-arg t69-hash-table-ref/default)
+        dict-set-id t69-hash-table-set!*
+        dict-delete-all-id t69-hash-table-delete-all!*
+        dict-contains?-id (prep-dto-arg t69-hash-table-exists?)
+        dict-update/default-id t69-hash-table-update!/default*
+        dict-size-id (prep-dto-arg t69-hash-table-size)
+        dict-keys-id (prep-dto-arg t69-hash-table-keys)
+        dict-values-id (prep-dto-arg t69-hash-table-values)
+        dict-map-id t69-hash-table-map!*
+        dict-filter-id t69-hash-table-filter!*
+        dict-fold-id t69-hash-table-fold*
+        dict->alist-id (prep-dto-arg t69-hash-table->alist)
+        dict-find-update-id t69-hash-table-find-update!*
+        dict-comparator-id t69-hash-table-comparator*))))
diff --git a/srfi/indexes.scm b/srfi/indexes.scm
deleted file mode 100644
index f6a178f..0000000
--- a/srfi/indexes.scm
+++ /dev/null
@@ -1,43 +0,0 @@
-;; procedure index definitions
-
-(define proc-id 0)
-(define (proc-id-inc)
-  (define v proc-id)
-  (set! proc-id (+ 1 proc-id))
-  v)
-(define dictionary?-id (proc-id-inc))
-(define dict-empty?-id (proc-id-inc))
-(define dict-contains?-id (proc-id-inc))
-(define dict=?-id (proc-id-inc))
-(define dict-pure?-id (proc-id-inc))
-(define dict-ref-id (proc-id-inc))
-(define dict-ref/default-id (proc-id-inc))
-(define dict-set-id (proc-id-inc))
-(define dict-adjoin-id (proc-id-inc))
-(define dict-delete-id (proc-id-inc))
-(define dict-delete-all-id (proc-id-inc))
-(define dict-replace-id (proc-id-inc))
-(define dict-intern-id (proc-id-inc))
-(define dict-update-id (proc-id-inc))
-(define dict-update/default-id (proc-id-inc))
-(define dict-pop-id (proc-id-inc))
-(define dict-map-id (proc-id-inc))
-(define dict-filter-id (proc-id-inc))
-(define dict-remove-id (proc-id-inc))
-(define dict-find-update-id (proc-id-inc))
-(define dict-size-id (proc-id-inc))
-(define dict-count-id (proc-id-inc))
-(define dict-any-id (proc-id-inc))
-(define dict-every-id (proc-id-inc))
-(define dict-keys-id (proc-id-inc))
-(define dict-values-id (proc-id-inc))
-(define dict-entries-id (proc-id-inc))
-(define dict-fold-id (proc-id-inc))
-(define dict-map->list-id (proc-id-inc))
-(define dict->alist-id (proc-id-inc))
-(define dict-comparator-id (proc-id-inc))
-(define dict-for-each-id (proc-id-inc))
-(define dict->generator-id (proc-id-inc))
-(define dict-set-accumulator-id (proc-id-inc))
-(define dict-adjoin-accumulator-id (proc-id-inc))
-(define dict-procedures-count (proc-id-inc)) ;; only used for tracking backing vector size