diff --git a/src/ikarus.boot b/src/ikarus.boot
index 78f30a4..b41eadc 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/makefile.ss b/src/makefile.ss
index 353dc91..6f66237 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -96,7 +96,6 @@
 
   (define library-legend
     '([$all (ikarus system $all)]
-      [s   (ikarus system)]
       [u   (ikarus system unsafe)]
       [i   (ikarus)]
       [r   (r6rs)]
@@ -119,313 +118,313 @@
       ))
 
   (define ikarus-macros-map
-    '([define           s i r]
-      [define-syntax    s i r]
-      [module           s i  ]
-      [begin            s i r]
-      [set!             s i r]
-      [foreign-call     s i r]
-      [quote            s i r]
-      [syntax-case      s i r]
-      [syntax           s i r]
-      [lambda           s i r]
-      [case-lambda      s i r]
-      [type-descriptor  s i  ]
-      [letrec           s i r]
-      [if               s i r]
-      [when             s i r]
-      [unless           s i r]
-      [parameterize     s i  ]
-      [case             s i r]
-      [let-values       s i r]
-      [define-record    s i r]
-      [include          s i r]
-      [syntax-rules     s i r]
-      [quasiquote       s i r]
-      [with-syntax      s i r]
-      [let              s i r]
-      [let*             s i r]
-      [cond             s i r]
-      [and              s i r]
-      [or               s i r]))
+    '([define           i r]
+      [define-syntax    i r]
+      [module           i  ]
+      [begin            i r]
+      [set!             i r]
+      [foreign-call     i r]
+      [quote            i r]
+      [syntax-case      i r]
+      [syntax           i r]
+      [lambda           i r]
+      [case-lambda      i r]
+      [type-descriptor  i  ]
+      [letrec           i r]
+      [if               i r]
+      [when             i r]
+      [unless           i r]
+      [parameterize     i  ]
+      [case             i r]
+      [let-values       i r]
+      [define-record    i r]
+      [include          i r]
+      [syntax-rules     i r]
+      [quasiquote       i r]
+      [with-syntax      i r]
+      [let              i r]
+      [let*             i r]
+      [cond             i r]
+      [and              i r]
+      [or               i r]))
 
   (define ikarus-procedures-map
-    '([void                             s i]
-      [not                              s i]
-      [boolean?                         s i]
-      [null?                            s i]
-      [procedure?                       s i]
-      [eof-object?                      s i]
-      [eof-object                       s i]
-      [eq?                              s i]
-      [eqv?                             s i]
-      [equal?                           s i]
-      [cons                             s i]
-      [pair?                            s i]
-      [car                              s i]
-      [cdr                              s i]
-      [set-car!                         s i]
-      [set-cdr!                         s i]
-      [caar                             s i]
-      [cdar                             s i]
-      [cadr                             s i]
-      [cddr                             s i]
-      [caaar                            s i]
-      [cdaar                            s i]
-      [cadar                            s i]
-      [cddar                            s i]
-      [caadr                            s i]
-      [cdadr                            s i]
-      [caddr                            s i]
-      [cdddr                            s i]
-      [caaaar                           s i]
-      [cdaaar                           s i]
-      [cadaar                           s i]
-      [cddaar                           s i]
-      [caadar                           s i]
-      [cdadar                           s i]
-      [caddar                           s i]
-      [cdddar                           s i]
-      [caaadr                           s i]
-      [cdaadr                           s i]
-      [cadadr                           s i]
-      [cddadr                           s i]
-      [caaddr                           s i]
-      [cdaddr                           s i]
-      [cadddr                           s i]
-      [cddddr                           s i]
-      [list                             s i]
-      [list-ref                         s i]
-      [make-list                        s i]
-      [list*                            s i]
-      [list?                            s i]
-      [append                           s i]
-      [last-pair                        s i]
-      [reverse                          s i]
-      [length                           s i]
-      [assq                             s i]
-      [assv                             s i]
-      [assoc                            s i]
-      [memq                             s i]
-      [memv                             s i]
-      [member                           s i]
-      [bwp-object?                      s i]
-      [weak-cons                        s i]
-      [weak-pair?                       s i]
-      [char?                            s i]
-      [char=?                           s i]
-      [char<?                           s i]
-      [char>?                           s i]
-      [char<=?                          s i]
-      [char>=?                          s i]
-      [integer->char                    s i]
-      [char->integer                    s i]
-      [char-whitespace?                 s i]
-      [string?                          s i]
-      [string                           s i]
-      [make-string                      s i]
-      [string-ref                       s i]
-      [string-set!                      s i]
-      [string-length                    s i]
-      [string=?                         s i]
-      [substring                        s i]
-      [string-append                    s i]
-      [string->list                     s i]
-      [list->string                     s i]
-      [uuid                             s i]
-      [date-string                      s i]
-      [vector                           s i]
-      [make-vector                      s i]
-      [vector-ref                       s i]
-      [vector-set!                      s i]
-      [vector?                          s i]
-      [vector-length                    s i]
-      [list->vector                     s i]
-      [vector->list                     s i]
-      [for-each                         s i]
-      [map                              s i]
-      [andmap                           s i]
-      [ormap                            s i]
-      [fixnum?                          s i]
-      [fx<                              s i]
-      [fx<=                             s i]
-      [fx>                              s i]
-      [fx>=                             s i]
-      [fx=                              s i]
-      [fx-                              s i]
-      [fx+                              s i]
-      [fx*                              s i]
-      [fxzero?                          s i]
-      [fxadd1                           s i]
-      [fxsub1                           s i]
-      [fxquotient                       s i]
-      [fxremainder                      s i]
-      [fxmodulo                         s i]
-      [fxsll                            s i]
-      [fxsra                            s i]
-      [fxlogand                         s i]
-      [fxlogxor                         s i]
-      [fxlogor                          s i]
-      [fxlognot                         s i]
-      [fixnum->string                   s i]
-      [string->flonum                   s i]
-      [-                                s i]
-      [=                                s i]
-      [<                                s i]
-      [>                                s i]
-      [<=                               s i]
-      [>=                               s i]
-      [*                                s i]
-      [+                                s i]
-      [add1                             s i]
-      [sub1                             s i]
-      [number?                          s i]
-      [bignum?                          s i]
-      [integer?                         s i]
-      [flonum?                          s i]
-      [quotient                         s i]
-      [remainder                        s i]
-      [quotient+remainder               s i]
-      [number->string                   s i]
-      [string->number                   s i]
-      [flonum->string                   s i]
-      [symbol?                          s i]
-      [gensym?                          s i]
-      [gensym                           s i]
-      [getprop                          s i]
-      [putprop                          s i]
-      [remprop                          s i]
-      [property-list                    s i]
-      [string->symbol                   s i]
-      [symbol->string                   s i]
-      [gensym->unique-string            s i]
-      [symbol-bound?                    s i]
-      [symbol-value                     s i]
-      [set-symbol-value!                s i]
-      [top-level-bound?                 s  ]
-      [top-level-value                  s  ]
-      [set-top-level-value!             s  ]
-      [make-guardian                    s i]
-      [make-input-port                  s i]
-      [make-output-port                 s i]
-      [make-input/output-port           s i]
-      [port-output-index                s i]
-      [port-output-size                 s i]
-      [port-output-buffer               s i]
-      [set-port-output-index!           s i]
-      [set-port-output-size!            s i]
-      [port-input-buffer                s i]
-      [port-input-index                 s i]
-      [port-input-size                  s i]
-      [set-port-input-index!            s i]
-      [set-port-input-size!             s i]
-      [*standard-input-port*            s i]
-      [*standard-output-port*           s i]
-      [*standard-error-port*            s i]
-      [*current-input-port*             s i]
-      [*current-output-port*            s i]
-      [output-port?                     s i]
-      [input-port?                      s i]
-      [port?                            s i]
-      [port-name                        s i]
-      [input-port-name                  s i]
-      [output-port-name                 s i]
-      [open-input-file                  s i]
-      [with-input-from-file             s i]
-      [with-output-to-file              s i]
-      [open-output-file                 s i]
-      [open-output-string               s i]
-      [get-output-string                s i]
-      [close-input-port                 s i]
-      [close-output-port                s i]
-      [console-input-port               s i]
-      [console-output-port              s i]
-      [current-input-port               s i]
-      [current-output-port              s i]
-      [standard-input-port              s i]
-      [standard-output-port             s i]
-      [standard-error-port              s i]
-      [flush-output-port                s i]
-      [reset-input-port!                s i]
-      [display                          s i]
-      [write                            s i]
-      [write-char                       s i]
-      [read                             s i]
-      [read-char                        s i]
-      [read-token                       s i]
-      [peek-char                        s i]
-      [unread-char                      s i]
-      [newline                          s i]
-      [printf                           s i]
-      [format                           s i]
-      [pretty-print                     s i]
-      [comment-handler                  s i]
-      [print-gensym                     s i]
-      [gensym-count                     s i]
-      [gensym-prefix                    s i]
-      [make-hash-table                  s i]
-      [hash-table?                      s i]
-      [get-hash-table                   s i]
-      [put-hash-table!                  s i]
-      [make-parameter                   s i]
-      [apply                            s i]
-      [values                           s i]
-      [call-with-values                 s i]
-      [call/cc                          s i]
-      [call/cf                          s i]
-      [dynamic-wind                     s i]
-      [error                            s i]
-      [print-error                      s i]
-      [error-handler                    s i]
-      [interrupt-handler                s i]
-      [exit                             s i]
-      [compile-core-expr-to-port        s i]
-      [eval-core                        s i]
-      [load                             s i]
-      [assembler-output                 s i]
-      ;[fasl-write                       s i]
-      [new-cafe                         s i]
-      [command-line-arguments           s i]
-      [list*->code*                     s i]
-      [eval-top-level                   s i]
-      [current-primitive-locations      s i]
-      [record?                          s i]
-      [make-record-type                 s i]
-      [record-type-descriptor           s i]
-      [record-type-field-names          s i]
-      [record-type-symbol               s i]
-      [record-type-name                 s i]
-      [record-name                      s i]
-      [record-constructor               s i]
-      [record-predicate                 s i]
-      [record-length                    s i]
-      [record-printer                   s i]
-      [record-ref                       s i]
-      [record-field-accessor            s i]
-      [record-field-mutator             s i]
-      [identifier?                      s i]
-      [syntax-error                     s i]
-      [generate-temporaries             s i]
-      [free-identifier=?                s i]
-      [boot-library-expand              s i]
-      [code?                            s i]
-      [make-code                        s i]
-      [code-reloc-vector                s i]
-      [set-code-reloc-vector!           s i]
-      [code-size                        s i]
-      [code-freevars                    s i]
-      [code-ref                         s i]
-      [code-set!                        s i]
-      [immediate?                       s i]
-      [pointer-value                    s i]
-      [installed-libraries              s i]
-      [library-subst/env                s i]
-      [find-library-by-name             s i]
-      [imported-label->binding          s i]
-      [imported-loc->library            s i]
-      [library-spec                     s i]
-      [current-library-collection       s i]
-      [invoke-library                   s i]
+    '([void                              i]
+      [not                               i]
+      [boolean?                          i]
+      [null?                             i]
+      [procedure?                        i]
+      [eof-object?                       i]
+      [eof-object                        i]
+      [eq?                               i]
+      [eqv?                              i]
+      [equal?                            i]
+      [cons                              i]
+      [pair?                             i]
+      [car                               i]
+      [cdr                               i]
+      [set-car!                          i]
+      [set-cdr!                          i]
+      [caar                              i]
+      [cdar                              i]
+      [cadr                              i]
+      [cddr                              i]
+      [caaar                             i]
+      [cdaar                             i]
+      [cadar                             i]
+      [cddar                             i]
+      [caadr                             i]
+      [cdadr                             i]
+      [caddr                             i]
+      [cdddr                             i]
+      [caaaar                            i]
+      [cdaaar                            i]
+      [cadaar                            i]
+      [cddaar                            i]
+      [caadar                            i]
+      [cdadar                            i]
+      [caddar                            i]
+      [cdddar                            i]
+      [caaadr                            i]
+      [cdaadr                            i]
+      [cadadr                            i]
+      [cddadr                            i]
+      [caaddr                            i]
+      [cdaddr                            i]
+      [cadddr                            i]
+      [cddddr                            i]
+      [list                              i]
+      [list-ref                          i]
+      [make-list                         i]
+      [list*                             i]
+      [list?                             i]
+      [append                            i]
+      [last-pair                         i]
+      [reverse                           i]
+      [length                            i]
+      [assq                              i]
+      [assv                              i]
+      [assoc                             i]
+      [memq                              i]
+      [memv                              i]
+      [member                            i]
+      [bwp-object?                       i]
+      [weak-cons                         i]
+      [weak-pair?                        i]
+      [char?                             i]
+      [char=?                            i]
+      [char<?                            i]
+      [char>?                            i]
+      [char<=?                           i]
+      [char>=?                           i]
+      [integer->char                     i]
+      [char->integer                     i]
+      [char-whitespace?                  i]
+      [string?                           i]
+      [string                            i]
+      [make-string                       i]
+      [string-ref                        i]
+      [string-set!                       i]
+      [string-length                     i]
+      [string=?                          i]
+      [substring                         i]
+      [string-append                     i]
+      [string->list                      i]
+      [list->string                      i]
+      [uuid                              i]
+      [date-string                       i]
+      [vector                            i]
+      [make-vector                       i]
+      [vector-ref                        i]
+      [vector-set!                       i]
+      [vector?                           i]
+      [vector-length                     i]
+      [list->vector                      i]
+      [vector->list                      i]
+      [for-each                          i]
+      [map                               i]
+      [andmap                            i]
+      [ormap                             i]
+      [fixnum?                           i]
+      [fx<                               i]
+      [fx<=                              i]
+      [fx>                               i]
+      [fx>=                              i]
+      [fx=                               i]
+      [fx-                               i]
+      [fx+                               i]
+      [fx*                               i]
+      [fxzero?                           i]
+      [fxadd1                            i]
+      [fxsub1                            i]
+      [fxquotient                        i]
+      [fxremainder                       i]
+      [fxmodulo                          i]
+      [fxsll                             i]
+      [fxsra                             i]
+      [fxlogand                          i]
+      [fxlogxor                          i]
+      [fxlogor                           i]
+      [fxlognot                          i]
+      [fixnum->string                    i]
+      [string->flonum                    i]
+      [-                                 i]
+      [=                                 i]
+      [<                                 i]
+      [>                                 i]
+      [<=                                i]
+      [>=                                i]
+      [*                                 i]
+      [+                                 i]
+      [add1                              i]
+      [sub1                              i]
+      [number?                           i]
+      [bignum?                           i]
+      [integer?                          i]
+      [flonum?                           i]
+      [quotient                          i]
+      [remainder                         i]
+      [quotient+remainder                i]
+      [number->string                    i]
+      [string->number                    i]
+      [flonum->string                    i]
+      [symbol?                           i]
+      [gensym?                           i]
+      [gensym                            i]
+      [getprop                           i]
+      [putprop                           i]
+      [remprop                           i]
+      [property-list                     i]
+      [string->symbol                    i]
+      [symbol->string                    i]
+      [gensym->unique-string             i]
+      [symbol-bound?                     i]
+      [symbol-value                      i]
+      [set-symbol-value!                 i]
+      [top-level-bound?                   ]
+      [top-level-value                    ]
+      [set-top-level-value!               ]
+      [make-guardian                     i]
+      [make-input-port                   i]
+      [make-output-port                  i]
+      [make-input/output-port            i]
+      [port-output-index                 i]
+      [port-output-size                  i]
+      [port-output-buffer                i]
+      [set-port-output-index!            i]
+      [set-port-output-size!             i]
+      [port-input-buffer                 i]
+      [port-input-index                  i]
+      [port-input-size                   i]
+      [set-port-input-index!             i]
+      [set-port-input-size!              i]
+      [*standard-input-port*             i]
+      [*standard-output-port*            i]
+      [*standard-error-port*             i]
+      [*current-input-port*              i]
+      [*current-output-port*             i]
+      [output-port?                      i]
+      [input-port?                       i]
+      [port?                             i]
+      [port-name                         i]
+      [input-port-name                   i]
+      [output-port-name                  i]
+      [open-input-file                   i]
+      [with-input-from-file              i]
+      [with-output-to-file               i]
+      [open-output-file                  i]
+      [open-output-string                i]
+      [get-output-string                 i]
+      [close-input-port                  i]
+      [close-output-port                 i]
+      [console-input-port                i]
+      [console-output-port               i]
+      [current-input-port                i]
+      [current-output-port               i]
+      [standard-input-port               i]
+      [standard-output-port              i]
+      [standard-error-port               i]
+      [flush-output-port                 i]
+      [reset-input-port!                 i]
+      [display                           i]
+      [write                             i]
+      [write-char                        i]
+      [read                              i]
+      [read-char                         i]
+      [read-token                        i]
+      [peek-char                         i]
+      [unread-char                       i]
+      [newline                           i]
+      [printf                            i]
+      [format                            i]
+      [pretty-print                      i]
+      [comment-handler                   i]
+      [print-gensym                      i]
+      [gensym-count                      i]
+      [gensym-prefix                     i]
+      [make-hash-table                   i]
+      [hash-table?                       i]
+      [get-hash-table                    i]
+      [put-hash-table!                   i]
+      [make-parameter                    i]
+      [apply                             i]
+      [values                            i]
+      [call-with-values                  i]
+      [call/cc                           i]
+      [call/cf                           i]
+      [dynamic-wind                      i]
+      [error                             i]
+      [print-error                       i]
+      [error-handler                     i]
+      [interrupt-handler                 i]
+      [exit                              i]
+      [compile-core-expr-to-port         i]
+      [eval-core                         i]
+      [load                              i]
+      [assembler-output                  i]
+      ;[fasl-write                       i]
+      [new-cafe                          i]
+      [command-line-arguments            i]
+      [list*->code*                      i]
+      [eval-top-level                    i]
+      [current-primitive-locations       i]
+      [record?                           i]
+      [make-record-type                  i]
+      [record-type-descriptor            i]
+      [record-type-field-names           i]
+      [record-type-symbol                i]
+      [record-type-name                  i]
+      [record-name                       i]
+      [record-constructor                i]
+      [record-predicate                  i]
+      [record-length                     i]
+      [record-printer                    i]
+      [record-ref                        i]
+      [record-field-accessor             i]
+      [record-field-mutator              i]
+      [identifier?                       i]
+      [syntax-error                      i]
+      [generate-temporaries              i]
+      [free-identifier=?                 i]
+      [boot-library-expand               i]
+      [code?                             i]
+      [make-code                         i]
+      [code-reloc-vector                 i]
+      [set-code-reloc-vector!            i]
+      [code-size                         i]
+      [code-freevars                     i]
+      [code-ref                          i]
+      [code-set!                         i]
+      [immediate?                        i]
+      [pointer-value                     i]
+      [installed-libraries               i]
+      [library-subst/env                 i]
+      [find-library-by-name              i]
+      [imported-label->binding           i]
+      [imported-loc->library             i]
+      [library-spec                      i]
+      [current-library-collection        i]
+      [invoke-library                    i]
       ; (ikarus system $pairs)
       [$car               $pairs]
       [$cdr               $pairs]