~ chicken-core (chicken-5) 8c3913f09f9997c2c4ffe4e419838fb38643dc6c


commit 8c3913f09f9997c2c4ffe4e419838fb38643dc6c
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Thu Aug 25 15:29:05 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Thu Aug 25 15:29:05 2011 +0200

    small bugfix in proc-type analysis; new format for types.db (test suite not run, yet)

diff --git a/scrutinizer.scm b/scrutinizer.scm
index 99fb973d..6f7fbd76 100755
--- a/scrutinizer.scm
+++ b/scrutinizer.scm
@@ -1444,10 +1444,10 @@
        (case (car ptype)
 	 ((procedure)
 	  (and (list? ptype)
-	       (eq? 'noreturn 
-		    (if (symbol? (second ptype)) 
-			(fourth ptype)
-			(third ptype)))))
+	       (eq? '(noreturn)
+		    (if (pair? (second ptype))
+			(cddr ptype)
+			(cdddr ptype)))))
 	 ((forall)
 	  (noreturn-procedure-type? (third ptype)))
 	 (else #f))))
@@ -1549,13 +1549,13 @@
 			      (let loop ((props (cdr (vector->list (car new)))))
 				(unless (null? props)
 				  (case (car props)
-				    ((pure)
+				    ((#:pure)
 				     (pure! name)
 				     (loop (cdr props)))
-				    ((enforce)
+				    ((#:enforce)
 				     (mark-variable name '##compiler#enforce #t)
 				     (loop (cdr props)))
-				    ((predicate)
+				    ((#:predicate)
 				     (mark-variable name '##compiler#predicate (cadr props))
 				     (loop (cddr props)))
 				    (else
@@ -1563,7 +1563,7 @@
 				      "load-type-database: invalid procedure-type property"
 				      (car props) new)))))
 			      `(procedure ,@(cdr new)))
-			     (else 	;XXX old style, remove at some stage
+			     (else 	;XXX DEPRECATED
 			      (case (car new)
 				((procedure!)
 				 (mark-variable name '##compiler#enforce #t)
@@ -1616,9 +1616,9 @@
 			(case (car type)
 			  ((procedure)
 			   `(#(procedure
-			       ,@(if enforce '(enforce) '())
-			       ,@(if pred `(predicate ,pred) '())
-			       ,@(if pure '(pure) '()))
+			       ,@(if enforce '(#:enforce) '())
+			       ,@(if pred `(#:predicate ,pred) '())
+			       ,@(if pure '(#:pure) '()))
 			     ,@(cdr type)))
 			  ((forall)
 			   `(forall ,(second type) ,(wrap (third type))))
@@ -1802,7 +1802,7 @@
 		type 
 		(and ptype (eq? (car ptype) type) (cdr ptype))
 		pure))))
-	  (else (values #f #f)))))
+	  (else (values #f #f #f)))))
 
 (define (install-specializations name specs)
   (define (fail spec)
diff --git a/types.db b/types.db
index abfa0e11..c7c91ef3 100644
--- a/types.db
+++ b/types.db
@@ -34,12 +34,6 @@
 ;   all remaining arguments
 ; - in templates "#(SYMBOL)" binds X to a temporary gensym'd variable, further references
 ;   to "#(SYMBOL)" allow backreferences to this generated identifier
-; - a type of the form "(procedure! ...)" is internally treated like "(procedure ..."
-;   but declares the procedure as "argument-type enforcing"
-; - a type of the form "(procedure? TYPE  ...)" is internally treated like "(procedure ..."
-;   but declares the procedure as a predicate over TYPE.
-; - a type of the form "(procedure!? TYPE ...)" or "(procedure?! TYPE ...)" is the obvious.
-; - types in specializations are currently not validated
 
 
 ;; scheme
@@ -47,7 +41,7 @@
 (not (procedure not (*) boolean)
      (((not boolean)) (let ((#(tmp) #(1))) '#t)))
 
-(boolean? (procedure? boolean boolean? (*) boolean))
+(boolean? (#(procedure #:predicate boolean) boolean? (*) boolean))
 
 (eq? (procedure eq? (* *) boolean))
 
@@ -59,91 +53,91 @@
 	(((or fixnum symbol char eof null) *) (eq? #(1) #(2)))
 	((* (or fixnum symbol char eof null)) (eq? #(1) #(2))))
 
-(pair? (procedure? pair pair? (*) boolean))
+(pair? (#(procedure #:predicate pair) pair? (*) boolean))
 
-(cons (forall (a b) (#(procedure pure enforce) cons (a b) (pair a b))))
+(cons (forall (a b) (#(procedure #:pure #:enforce) cons (a b) (pair a b))))
 
 (##sys#cons (forall (a b) (procedure ##sys#cons (a b) (pair a b))))
 
-(car (forall (a) (procedure! car ((pair a *)) a)) ((pair) (##core#inline "C_u_i_car" #(1))))
-(cdr (forall (a) (procedure! cdr ((pair * a)) a)) ((pair) (##core#inline "C_u_i_cdr" #(1))))
+(car (forall (a) (#(procedure #:enforce) car ((pair a *)) a)) ((pair) (##core#inline "C_u_i_car" #(1))))
+(cdr (forall (a) (#(procedure #:enforce) cdr ((pair * a)) a)) ((pair) (##core#inline "C_u_i_cdr" #(1))))
 
-(caar (forall (a) (procedure! caar ((pair (pair a *) *)) a))
+(caar (forall (a) (#(procedure #:enforce) caar ((pair (pair a *) *)) a))
       (((pair (pair * *) *)) (##core#inline "C_u_i_car" (##core#inline "C_u_i_car" #(1)))))
-(cadr (forall (a) (procedure! cadr ((pair * (pair a *))) a))
+(cadr (forall (a) (#(procedure #:enforce) cadr ((pair * (pair a *))) a))
       (((pair * (pair * *))) (##core#inline "C_u_i_car" (##core#inline "C_u_i_cdr" #(1)))))
-(cdar (forall (a) (procedure! cdar ((pair (pair * a) *)) a))
+(cdar (forall (a) (#(procedure #:enforce) cdar ((pair (pair * a) *)) a))
       (((pair (pair * *) *)) (##core#inline "C_u_i_cdr" (##core#inline "C_u_i_car" #(1)))))
-(cddr (forall (a) (procedure! cddr ((pair * (pair * a))) a))
+(cddr (forall (a) (#(procedure #:enforce) cddr ((pair * (pair * a))) a))
       (((pair * (pair * *))) (##core#inline "C_u_i_cdr" (##core#inline "C_u_i_cdr" #(1)))))
 
-(caaar (forall (a) (procedure! caaar ((pair (pair (pair a *) *) *)) a))
+(caaar (forall (a) (#(procedure #:enforce) caaar ((pair (pair (pair a *) *) *)) a))
        (((pair (pair (pair * *) *) *))
 	(##core#inline "C_u_i_car"
 		       (##core#inline "C_u_i_car" (##core#inline "C_u_i_car" #(1))))))
 
-(caadr (forall (a) (procedure! caadr ((pair * (pair (pair a *) *))) a))
+(caadr (forall (a) (#(procedure #:enforce) caadr ((pair * (pair (pair a *) *))) a))
        (((pair * (pair (pair * *) *)))
 	(##core#inline "C_u_i_car"
 		       (##core#inline "C_u_i_car" (##core#inline "C_u_i_cdr" #(1))))))
 
-(cadar (forall (a) (procedure! cadar ((pair (pair * (pair a *)) *)) a))
+(cadar (forall (a) (#(procedure #:enforce) cadar ((pair (pair * (pair a *)) *)) a))
        (((pair (pair * (pair * *)) *))
 	(##core#inline "C_u_i_car"
 		       (##core#inline "C_u_i_cdr" (##core#inline "C_u_i_car" #(1))))))
 
-(caddr (forall (a) (procedure! caddr ((pair * (pair * (pair a *)))) a))
+(caddr (forall (a) (#(procedure #:enforce) caddr ((pair * (pair * (pair a *)))) a))
        (((pair * (pair * (pair * *))))
 	(##core#inline "C_u_i_car"
 		       (##core#inline "C_u_i_cdr" (##core#inline "C_u_i_cdr" #(1))))))
 
-(cdaar (forall (a) (procedure! cdaar ((pair (pair (pair * a) *) *)) a))
+(cdaar (forall (a) (#(procedure #:enforce) cdaar ((pair (pair (pair * a) *) *)) a))
        (((pair (pair (pair * *) *) *))
 	(##core#inline "C_u_i_cdr"
 		       (##core#inline "C_u_i_car" (##core#inline "C_u_i_car" #(1))))))
 
-(cdadr (forall (a) (procedure! cdadr ((pair * (pair (pair * a) *))) a))
+(cdadr (forall (a) (#(procedure #:enforce) cdadr ((pair * (pair (pair * a) *))) a))
        (((pair * (pair (pair * *) *)))
 	(##core#inline "C_u_i_cdr"
 		       (##core#inline "C_u_i_car" (##core#inline "C_u_i_cdr" #(1))))))
 
-(cddar (forall (a) (procedure! cddar ((pair (pair * (pair * a)) *)) a))
+(cddar (forall (a) (#(procedure #:enforce) cddar ((pair (pair * (pair * a)) *)) a))
        (((pair (pair * (pair * *)) *))
 	(##core#inline "C_u_i_cdr"
 		       (##core#inline "C_u_i_cdr" (##core#inline "C_u_i_car" #(1))))))
 
-(cdddr (forall (a) (procedure! cdddr ((pair * (pair * (pair * a)))) a))
+(cdddr (forall (a) (#(procedure #:enforce) cdddr ((pair * (pair * (pair * a)))) a))
        (((pair * (pair * (pair * *))))
 	(##core#inline "C_u_i_cdr"
 		       (##core#inline "C_u_i_cdr" (##core#inline "C_u_i_cdr" #(1))))))
 
-(caaaar (forall (a) (procedure! caaaar ((pair (pair (pair (pair a *) *) *) *)) a)))
-(caaadr (forall (a) (procedure! caaadr ((pair * (pair (pair (pair a *) *) *))) a)))
-(caadar (forall (a) (procedure! caadar ((pair (pair * (pair (pair a *) *)) *)) a)))
-(caaddr (forall (a) (procedure! caaddr ((pair * (pair * (pair (pair a *) *)))) a)))
-(cadaar (forall (a) (procedure! cadaar ((pair (pair (pair * (pair a *)) *) *)) a)))
-(cadadr (forall (a) (procedure! cadadr ((pair * (pair (pair * (pair a *)) *))) a)))
-(caddar (forall (a) (procedure! caddar ((pair (pair * (pair * (pair a *))) *)) a)))
-(cadddr (forall (a) (procedure! cadddr ((pair * (pair * (pair * (pair a *))))) a)))
-(cdaaar (forall (a) (procedure! cdaaar ((pair (pair (pair (pair * a) *) *) *)) a)))
-(cdaadr (forall (a) (procedure! cdaadr ((pair * (pair (pair (pair * a) *) *))) a)))
-(cdadar (forall (a) (procedure! cdadar ((pair (pair * (pair (pair * a) *)) *)) a)))
-(cdaddr (forall (a) (procedure! cdaddr ((pair * (pair * (pair (pair * a) *)))) a)))
-(cddaar (forall (a) (procedure! cddaar ((pair (pair (pair * (pair * a)) *) *)) a)))
-(cddadr (forall (a) (procedure! cddadr ((pair * (pair (pair * (pair * a)) *))) a)))
-(cdddar (forall (a) (procedure! cdddar ((pair (pair * (pair * (pair * a))) *)) a)))
-(cddddr (forall (a) (procedure! cddddr ((pair * (pair * (pair * (pair * a))))) a)))
-
-(set-car! (procedure! set-car! (pair *) undefined) 
+(caaaar (forall (a) (#(procedure #:enforce) caaaar ((pair (pair (pair (pair a *) *) *) *)) a)))
+(caaadr (forall (a) (#(procedure #:enforce) caaadr ((pair * (pair (pair (pair a *) *) *))) a)))
+(caadar (forall (a) (#(procedure #:enforce) caadar ((pair (pair * (pair (pair a *) *)) *)) a)))
+(caaddr (forall (a) (#(procedure #:enforce) caaddr ((pair * (pair * (pair (pair a *) *)))) a)))
+(cadaar (forall (a) (#(procedure #:enforce) cadaar ((pair (pair (pair * (pair a *)) *) *)) a)))
+(cadadr (forall (a) (#(procedure #:enforce) cadadr ((pair * (pair (pair * (pair a *)) *))) a)))
+(caddar (forall (a) (#(procedure #:enforce) caddar ((pair (pair * (pair * (pair a *))) *)) a)))
+(cadddr (forall (a) (#(procedure #:enforce) cadddr ((pair * (pair * (pair * (pair a *))))) a)))
+(cdaaar (forall (a) (#(procedure #:enforce) cdaaar ((pair (pair (pair (pair * a) *) *) *)) a)))
+(cdaadr (forall (a) (#(procedure #:enforce) cdaadr ((pair * (pair (pair (pair * a) *) *))) a)))
+(cdadar (forall (a) (#(procedure #:enforce) cdadar ((pair (pair * (pair (pair * a) *)) *)) a)))
+(cdaddr (forall (a) (#(procedure #:enforce) cdaddr ((pair * (pair * (pair (pair * a) *)))) a)))
+(cddaar (forall (a) (#(procedure #:enforce) cddaar ((pair (pair (pair * (pair * a)) *) *)) a)))
+(cddadr (forall (a) (#(procedure #:enforce) cddadr ((pair * (pair (pair * (pair * a)) *))) a)))
+(cdddar (forall (a) (#(procedure #:enforce) cdddar ((pair (pair * (pair * (pair * a))) *)) a)))
+(cddddr (forall (a) (#(procedure #:enforce) cddddr ((pair * (pair * (pair * (pair * a))))) a)))
+
+(set-car! (#(procedure #:enforce) set-car! (pair *) undefined) 
 	  ((pair (or fixnum char boolean eof null undefined)) (##sys#setislot #(1) '0 #(2)))
 	  ((pair *) (##sys#setslot #(1) '0 #(2))))
 
-(set-cdr! (procedure! set-cdr! (pair *) undefined)
+(set-cdr! (#(procedure #:enforce) set-cdr! (pair *) undefined)
 	  ((pair (or fixnum char boolean eof null undefined)) (##sys#setislot #(1) '1 #(2)))
 	  ((pair *) (##sys#setslot #(1) '1 #(2))))
 
-(null? (procedure? null null? (*) boolean))
-(list? (procedure? list list? (*) boolean))
+(null? (#(procedure #:predicate null) null? (*) boolean))
+(list? (#(procedure #:predicate list) list? (*) boolean))
 
 (list (procedure list (#!rest) list)
       (() (null) '()))
@@ -151,19 +145,19 @@
 (##sys#list (procedure ##sys#list (#!rest) list)
 	    (() (null) '()))
 
-(length (procedure! length (list) fixnum)
+(length (#(procedure #:enforce) length (list) fixnum)
 	((null) '0)
 	((list) (##core#inline "C_u_i_length" #(1))))
 
-(##sys#length (procedure! ##sys#length (list) fixnum)
+(##sys#length (#(procedure #:enforce) ##sys#length (list) fixnum)
 	      ((null) '0)
 	      ((list) (##core#inline "C_u_i_length" #(1))))
 
-(list-tail (forall (a) (procedure! list-tail ((list a) fixnum) (list a))))
-(list-ref (forall (a) (procedure! list-ref ((list a) fixnum) a)))
+(list-tail (forall (a) (#(procedure #:enforce) list-tail ((list a) fixnum) (list a))))
+(list-ref (forall (a) (#(procedure #:enforce) list-ref ((list a) fixnum) a)))
 (append (procedure append (list #!rest) *))
 (##sys#append (procedure ##sys#append (list #!rest) *))
-(reverse (forall (a) (procedure! reverse ((list a)) (list a))))
+(reverse (forall (a) (#(procedure #:enforce) reverse ((list a)) (list a))))
 (memq (procedure memq (* list) *) ((* list) (##core#inline "C_u_i_memq" #(1) #(2))))
 
 (memv (procedure memv (* list) *)
@@ -191,52 +185,52 @@
        ((* (list (or fixnum boolean char eof undefined null)))
 	(##core#inline "C_u_i_assq" #(1) #(2))))
 
-(symbol? (procedure? symbol symbol? (*) boolean))
+(symbol? (#(procedure #:predicate symbol) symbol? (*) boolean))
 
-(symbol-append (procedure! symbol-append (#!rest symbol) symbol))
-(symbol->string (procedure! symbol->string (symbol) string))
-(string->symbol (procedure! string->symbol (string) symbol))
+(symbol-append (#(procedure #:enforce) symbol-append (#!rest symbol) symbol))
+(symbol->string (#(procedure #:enforce) symbol->string (symbol) string))
+(string->symbol (#(procedure #:enforce) string->symbol (string) symbol))
 
-(number? (procedure? number number? (*) boolean))
+(number? (#(procedure #:predicate number) number? (*) boolean))
 
 ;;XXX predicate?
 (integer? (procedure integer? (*) boolean)
 	  ((fixnum) (let ((#(tmp) #(1))) '#t))
 	  ((float) (##core#inline "C_u_i_fpintegerp" #(1))))
 
-(exact? (procedure? fixnum exact? (*) boolean))
-(real? (procedure? number real? (*) boolean))
-(complex? (procedure? number complex? (*) boolean))
-(inexact? (procedure? float inexact? (*) boolean))
+(exact? (#(procedure #:predicate fixnum) exact? (*) boolean))
+(real? (#(procedure #:predicate number) real? (*) boolean))
+(complex? (#(procedure #:predicate number) complex? (*) boolean))
+(inexact? (#(procedure #:predicate float) inexact? (*) boolean))
 
 ;;XXX predicate?
 (rational? (procedure rational? (*) boolean)
 	   ((fixnum) (let ((#(tmp) #(1))) '#t)))
 
-(zero? (procedure! zero? (number) boolean) 
+(zero? (#(procedure #:enforce) zero? (number) boolean) 
        ((fixnum) (eq? #(1) '0))
        ((number) (##core#inline "C_u_i_zerop" #(1))))
 
-(odd? (procedure! odd? (number) boolean) ((fixnum) (fxodd? #(1))))
-(even? (procedure! even? (number) boolean) ((fixnum) (fxeven? #(1))))
+(odd? (#(procedure #:enforce) odd? (number) boolean) ((fixnum) (fxodd? #(1))))
+(even? (#(procedure #:enforce) even? (number) boolean) ((fixnum) (fxeven? #(1))))
 
-(positive? (procedure! positive? (number) boolean)
+(positive? (#(procedure #:enforce) positive? (number) boolean)
 	   ((fixnum) (##core#inline "C_fixnum_greaterp" #(1) '0))
 	   ((number) (##core#inline "C_u_i_positivep" #(1))))
 
-(negative? (procedure! negative? (number) boolean)
+(negative? (#(procedure #:enforce) negative? (number) boolean)
 	   ((fixnum) (##core#inline "C_fixnum_lessp" #(1) '0))
 	   ((number) (##core#inline "C_u_i_negativep" #(1))))
 
-(max (procedure! max (#!rest number) number)
+(max (#(procedure #:enforce) max (#!rest number) number)
      ((fixnum fixnum) (fxmax #(1) #(2)))
      ((float float) (##core#inline "C_i_flonum_max" #(1) #(2))))
 
-(min (procedure! min (#!rest number) number)
+(min (#(procedure #:enforce) min (#!rest number) number)
      ((fixnum fixnum) (fxmin #(1) #(2)))
      ((float float) (##core#inline "C_i_flonum_min" #(1) #(2))))
 
-(+ (procedure! + (#!rest number) number)
+(+ (#(procedure #:enforce) + (#!rest number) number)
    (() (fixnum) '0)
    ((fixnum) (fixnum) #(1))
    ((float) (float) #(1))
@@ -255,7 +249,7 @@
    ((float float) (float)
     (##core#inline_allocate ("C_a_i_flonum_plus" 4) #(1) #(2))))
 
-(- (procedure! - (number #!rest number) number)
+(- (#(procedure #:enforce) - (number #!rest number) number)
    ((fixnum) (fixnum)
     (##core#inline "C_u_fixnum_negate" #(1)))
    ((float fixnum) (float)
@@ -273,7 +267,7 @@
    ((float) (float) 
     (##core#inline_allocate ("C_a_i_flonum_negate" 4) #(1))))
 
-(* (procedure! * (#!rest number) number)
+(* (#(procedure #:enforce) * (#!rest number) number)
    (() (fixnum) '1)
    ((fixnum) (fixnum) #(1))
    ((float) (float) #(1))
@@ -291,7 +285,7 @@
    ((float float) (float)
     (##core#inline_allocate ("C_a_i_flonum_times" 4) #(1) #(2))))
 
-(/ (procedure! / (number #!rest number) number)
+(/ (#(procedure #:enforce) / (number #!rest number) number)
    ((float fixnum) (float)
     (##core#inline_allocate 
      ("C_a_i_flonum_quotient_checked" 4) 
@@ -305,7 +299,7 @@
    ((float float) (float)
     (##core#inline_allocate ("C_a_i_flonum_quotient_checked" 4) #(1) #(2))))
 
-(= (procedure! = (#!rest number) boolean)
+(= (#(procedure #:enforce) = (#!rest number) boolean)
    ((fixnum fixnum) (eq? #(1) #(2)))
    ((float fixnum) (##core#inline
 		    "C_flonum_equalp"
@@ -317,7 +311,7 @@
 		    #(2)))
    ((float float) (##core#inline "C_flonum_equalp" #(1) #(2))))
 
-(> (procedure! > (#!rest number) boolean)
+(> (#(procedure #:enforce) > (#!rest number) boolean)
    ((fixnum fixnum) (fx> #(1) #(2)))
    ((float fixnum) (##core#inline
 		    "C_flonum_greaterp"
@@ -329,7 +323,7 @@
 		    #(2)))
    ((float float) (##core#inline "C_flonum_greaterp" #(1) #(2))))
 
-(< (procedure! < (#!rest number) boolean)
+(< (#(procedure #:enforce) < (#!rest number) boolean)
    ((fixnum fixnum) (fx< #(1) #(2)))
    ((float fixnum) (##core#inline
 		    "C_flonum_lessp"
@@ -341,7 +335,7 @@
 		    #(2)))
    ((float float) (##core#inline "C_flonum_lessp" #(1) #(2))))
 
-(>= (procedure! >= (#!rest number) boolean)
+(>= (#(procedure #:enforce) >= (#!rest number) boolean)
     ((fixnum fixnum) (fx>= #(1) #(2)))
     ((float fixnum) (##core#inline
 		     "C_flonum_greater_or_equal_p"
@@ -353,7 +347,7 @@
 		     #(2)))
     ((float float) (##core#inline "C_flonum_greater_or_equal_p" #(1) #(2))))
 
-(<= (procedure! <= (#!rest number) boolean)
+(<= (#(procedure #:enforce) <= (#!rest number) boolean)
     ((fixnum fixnum) (fx<= #(1) #(2)))
     ((float fixnum) (##core#inline
 		     "C_flonum_less_or_equal_p"
@@ -365,205 +359,206 @@
 		     #(2)))
     ((float float) (##core#inline "C_flonum_less_or_equal_p" #(1) #(2))))
 
-(quotient (procedure! quotient (number number) number)
+(quotient (#(procedure #:enforce) quotient (number number) number)
 	  ;;XXX flonum/mixed case
 	  ((fixnum fixnum) (fixnum)
 	   (##core#inline "C_fixnum_divide" #(1) #(2))))
 
-(remainder (procedure! remainder (number number) number)
+(remainder (#(procedure #:enforce) remainder (number number) number)
 	   ;;XXX flonum/mixed case
 	   ((fixnum fixnum) (fixnum)
 	    (##core#inline "C_fixnum_modulo" #(1) #(2))))
 
-(modulo (procedure! modulo (number number) number))
+(modulo (#(procedure #:enforce) modulo (number number) number))
 
-(gcd (procedure! gcd (#!rest number) number) ((* *) (##sys#gcd #(1) #(2))))
-(lcm (procedure! lcm (#!rest number) number) ((* *) (##sys#lcm #(1) #(2))))
+(gcd (#(procedure #:enforce) gcd (#!rest number) number) ((* *) (##sys#gcd #(1) #(2))))
+(lcm (#(procedure #:enforce) lcm (#!rest number) number) ((* *) (##sys#lcm #(1) #(2))))
 
-(abs (procedure! abs (number) number)
+(abs (#(procedure #:enforce) abs (number) number)
      ((fixnum) (fixnum)
       (##core#inline "C_fixnum_abs" #(1)))
      ((float) (float)
       (##core#inline_allocate ("C_a_i_flonum_abs" 4) #(1))))
 
-(floor (procedure! floor (number) number)
+(floor (#(procedure #:enforce) floor (number) number)
        ((fixnum) (fixnum) #(1))
        ((float) (float)
 	(##core#inline_allocate ("C_a_i_flonum_floor" 4) #(1))))
 
-(ceiling (procedure! ceiling (number) number)
+(ceiling (#(procedure #:enforce) ceiling (number) number)
 	 ((fixnum) (fixnum) #(1))
 	 ((float) (float)
 	  (##core#inline_allocate ("C_a_i_flonum_ceiling" 4) #(1))))
 
-(truncate (procedure! truncate (number) number)
+(truncate (#(procedure #:enforce) truncate (number) number)
 	  ((fixnum) (fixnum) #(1))
 	  ((float) (float)
 	   (##core#inline_allocate ("C_a_i_flonum_truncate" 4) #(1))))
 
-(round (procedure! round (number) number)
+(round (#(procedure #:enforce) round (number) number)
        ((fixnum) (fixnum) #(1))
        ((float) (float)
 	(##core#inline_allocate ("C_a_i_flonum_round" 4) #(1))))
 
-(exact->inexact (procedure! exact->inexact (number) float)
+(exact->inexact (#(procedure #:enforce) exact->inexact (number) float)
 		((float) #(1))
 		((fixnum) (##core#inline_allocate ("C_a_i_fix_to_flo" 4) #(1))))
 
-(inexact->exact (procedure! inexact->exact (number) fixnum) ((fixnum) #(1)))
+(inexact->exact (#(procedure #:enforce) inexact->exact (number) fixnum) ((fixnum) #(1)))
 
-(exp (procedure! exp (number) float)
+(exp (#(procedure #:enforce) exp (number) float)
      ((float) (##core#inline_allocate ("C_a_i_flonum_exp" 4) #(1))))
 
-(log (procedure! log (number) float)
+(log (#(procedure #:enforce) log (number) float)
      ((float) (##core#inline_allocate ("C_a_i_flonum_log" 4) #(1))))
 
-(expt (procedure! expt (number number) number)
+(expt (#(procedure #:enforce) expt (number number) number)
       ((float float) (float)
        (##core#inline_allocate ("C_a_i_flonum_expt" 4) #(1) #(2))))
 
-(sqrt (procedure! sqrt (number) float)
+(sqrt (#(procedure #:enforce) sqrt (number) float)
       ((float) (##core#inline_allocate ("C_a_i_flonum_sqrt" 4) #(1))))
 
-(sin (procedure! sin (number) float)
+(sin (#(procedure #:enforce) sin (number) float)
      ((float) (##core#inline_allocate ("C_a_i_flonum_sin" 4) #(1))))
 
-(cos (procedure! cos (number) float)
+(cos (#(procedure #:enforce) cos (number) float)
      ((float) (##core#inline_allocate ("C_a_i_flonum_cos" 4) #(1))))
 
-(tan (procedure! tan (number) float)
+(tan (#(procedure #:enforce) tan (number) float)
      ((float) (##core#inline_allocate ("C_a_i_flonum_tan" 4) #(1))))
 
-(asin (procedure! asin (number) float) 
+(asin (#(procedure #:enforce) asin (number) float) 
       ((float) (##core#inline_allocate ("C_a_i_flonum_asin" 4) #(1))))
 
-(acos (procedure! acos (number) float)
+(acos (#(procedure #:enforce) acos (number) float)
       ((float) (##core#inline_allocate ("C_a_i_flonum_acos" 4) #(1))))
 
-(atan (procedure! atan (number #!optional number) float)
+(atan (#(procedure #:enforce) atan (number #!optional number) float)
       ((float) (##core#inline_allocate ("C_a_i_flonum_atan" 4) #(1)))
       ((float float) (##core#inline_allocate ("C_a_i_flonum_atan2" 4) #(1))))
 
-(number->string (procedure! number->string (number #!optional number) string)
+(number->string (#(procedure #:enforce) number->string (number #!optional number) string)
 		((fixnum) (##sys#fixnum->string #(1))))
 
-(string->number (procedure! string->number (string #!optional number) (or number boolean)))
+(string->number (#(procedure #:enforce) string->number (string #!optional number) 
+		 (or number boolean)))
 
-(char? (procedure? char char? (*) boolean))
+(char? (#(procedure #:predicate char) char? (*) boolean))
 
 ;; we could rewrite these, but this is done by the optimizer anyway (safe)
-(char=? (procedure! char=? (char char) boolean))
-(char>? (procedure! char>? (char char) boolean))
-(char<? (procedure! char<? (char char) boolean))
-(char>=? (procedure! char>=? (char char) boolean))
-(char<=? (procedure! char<=? (char char) boolean))
-
-(char-ci=? (procedure! char-ci=? (char char) boolean))
-(char-ci<? (procedure! char-ci<? (char char) boolean))
-(char-ci>? (procedure! char-ci>? (char char) boolean))
-(char-ci>=? (procedure! char-ci>=? (char char) boolean))
-(char-ci<=? (procedure! char-ci<=? (char char) boolean))
-(char-alphabetic? (procedure! char-alphabetic? (char) boolean))
-(char-whitespace? (procedure! char-whitespace? (char) boolean))
-(char-numeric? (procedure! char-numeric? (char) boolean))
-(char-upper-case? (procedure! char-upper-case? (char) boolean))
-(char-lower-case? (procedure! char-lower-case? (char) boolean))
-(char-upcase (procedure! char-upcase (char) char))
-(char-downcase (procedure! char-downcase (char) char))
-
-(char->integer (procedure! char->integer (char) fixnum))
-(integer->char (procedure! integer->char (fixnum) char))
-
-(string? (procedure? string string? (*) boolean))
-
-(string=? (procedure! string=? (string string) boolean)
+(char=? (#(procedure #:enforce) char=? (char char) boolean))
+(char>? (#(procedure #:enforce) char>? (char char) boolean))
+(char<? (#(procedure #:enforce) char<? (char char) boolean))
+(char>=? (#(procedure #:enforce) char>=? (char char) boolean))
+(char<=? (#(procedure #:enforce) char<=? (char char) boolean))
+
+(char-ci=? (#(procedure #:enforce) char-ci=? (char char) boolean))
+(char-ci<? (#(procedure #:enforce) char-ci<? (char char) boolean))
+(char-ci>? (#(procedure #:enforce) char-ci>? (char char) boolean))
+(char-ci>=? (#(procedure #:enforce) char-ci>=? (char char) boolean))
+(char-ci<=? (#(procedure #:enforce) char-ci<=? (char char) boolean))
+(char-alphabetic? (#(procedure #:enforce) char-alphabetic? (char) boolean))
+(char-whitespace? (#(procedure #:enforce) char-whitespace? (char) boolean))
+(char-numeric? (#(procedure #:enforce) char-numeric? (char) boolean))
+(char-upper-case? (#(procedure #:enforce) char-upper-case? (char) boolean))
+(char-lower-case? (#(procedure #:enforce) char-lower-case? (char) boolean))
+(char-upcase (#(procedure #:enforce) char-upcase (char) char))
+(char-downcase (#(procedure #:enforce) char-downcase (char) char))
+
+(char->integer (#(procedure #:enforce) char->integer (char) fixnum))
+(integer->char (#(procedure #:enforce) integer->char (fixnum) char))
+
+(string? (#(procedure #:predicate string) string? (*) boolean))
+
+(string=? (#(procedure #:enforce) string=? (string string) boolean)
 	  ((string string) (##core#inline "C_u_i_string_equal_p" #(1) #(2))))
 
-(string>? (procedure! string>? (string string) boolean))
-(string<? (procedure! string<? (string string) boolean))
-(string>=? (procedure! string>=? (string string) boolean))
-(string<=? (procedure! string<=? (string string) boolean))
-(string-ci=? (procedure! string-ci=? (string string) boolean))
-(string-ci<? (procedure! string-ci<? (string string) boolean))
-(string-ci>? (procedure! string-ci>? (string string) boolean))
-(string-ci>=? (procedure! string-ci>=? (string string) boolean))
-(string-ci<=? (procedure! string-ci<=? (string string) boolean))
-
-(make-string (procedure! make-string (fixnum #!optional char) string)
+(string>? (#(procedure #:enforce) string>? (string string) boolean))
+(string<? (#(procedure #:enforce) string<? (string string) boolean))
+(string>=? (#(procedure #:enforce) string>=? (string string) boolean))
+(string<=? (#(procedure #:enforce) string<=? (string string) boolean))
+(string-ci=? (#(procedure #:enforce) string-ci=? (string string) boolean))
+(string-ci<? (#(procedure #:enforce) string-ci<? (string string) boolean))
+(string-ci>? (#(procedure #:enforce) string-ci>? (string string) boolean))
+(string-ci>=? (#(procedure #:enforce) string-ci>=? (string string) boolean))
+(string-ci<=? (#(procedure #:enforce) string-ci<=? (string string) boolean))
+
+(make-string (#(procedure #:enforce) make-string (fixnum #!optional char) string)
 	     ((fixnum char) (##sys#make-string #(1) #(2)))
 	     ((fixnum) (##sys#make-string #(1) '#\space)))
 
-(string-length (procedure! string-length (string) fixnum)
+(string-length (#(procedure #:enforce) string-length (string) fixnum)
 	       ((string) (##sys#size #(1))))
 
-(string-ref (procedure! string-ref (string fixnum) char)
+(string-ref (#(procedure #:enforce) string-ref (string fixnum) char)
 	    ((string fixnum) (##core#inline "C_subchar" #(1) #(2))))
 
-(string-set! (procedure! string-set! (string fixnum char) undefined)
+(string-set! (#(procedure #:enforce) string-set! (string fixnum char) undefined)
 	     ((string fixnum char) (##core#inline "C_setsubchar" #(1) #(2) #(3))))
 
-(string-append (procedure! string-append (#!rest string) string)
+(string-append (#(procedure #:enforce) string-append (#!rest string) string)
 	       ((string string) (##sys#string-append #(1) #(2))))
 
-;(string-copy (procedure! string-copy (string) string)) - we use the more general version from srfi-13
+;(string-copy (#(procedure #:enforce) string-copy (string) string)) - we use the more general version from srfi-13
 
-(string->list (procedure! string->list (string) (list char)))
-(list->string (procedure! list->string ((list char)) string))
-(substring (procedure! substring (string fixnum #!optional fixnum) string))
-;(string-fill! (procedure! string-fill! (string char) string)) - s.a.
-(string (procedure! string (#!rest char) string))
+(string->list (#(procedure #:enforce) string->list (string) (list char)))
+(list->string (#(procedure #:enforce) list->string ((list char)) string))
+(substring (#(procedure #:enforce) substring (string fixnum #!optional fixnum) string))
+;(string-fill! (#(procedure #:enforce) string-fill! (string char) string)) - s.a.
+(string (#(procedure #:enforce) string (#!rest char) string))
 
-(vector? (procedure? vector vector? (*) boolean))
+(vector? (#(procedure #:predicate vector) vector? (*) boolean))
 
 ;; not result type "(vector a)", since it may be mutated!
-(make-vector (forall (a) (procedure! make-vector (fixnum #!optional a) vector)))
+(make-vector (forall (a) (#(procedure #:enforce) make-vector (fixnum #!optional a) vector)))
 
-(vector-ref (forall (a) (procedure! vector-ref ((vector a) fixnum) a)))
-(##sys#vector-ref (forall (a) (procedure! ##sys#vector-ref ((vector a) fixnum) a)))
-(vector-set! (procedure! vector-set! (vector fixnum *) undefined))
+(vector-ref (forall (a) (#(procedure #:enforce) vector-ref ((vector a) fixnum) a)))
+(##sys#vector-ref (forall (a) (#(procedure #:enforce) ##sys#vector-ref ((vector a) fixnum) a)))
+(vector-set! (#(procedure #:enforce) vector-set! (vector fixnum *) undefined))
 (vector (procedure vector (#!rest) vector))
 (##sys#vector (procedure ##sys#vector (#!rest) vector))
 
-(vector-length (procedure! vector-length (vector) fixnum)
+(vector-length (#(procedure #:enforce) vector-length (vector) fixnum)
 	       ((vector) (##sys#size #(1))))
-(##sys#vector-length (procedure! ##sys#vector-length (vector) fixnum)
+(##sys#vector-length (#(procedure #:enforce) ##sys#vector-length (vector) fixnum)
 		     ((vector) (##sys#size #(1))))
 
-(vector->list (forall (a) (procedure! vector->list ((vector a)) (list a))))
-(##sys#vector->list (forall (a) (procedure! ##sys#vector->list ((vector a)) (list a))))
-(list->vector (forall (a) (procedure! list->vector ((list a)) (vector a))))
-(##sys#list->vector (forall (a) (procedure! ##sys#list->vector ((list a)) (vector a))))
-(vector-fill! (procedure! vector-fill! (vector *) undefined))
+(vector->list (forall (a) (#(procedure #:enforce) vector->list ((vector a)) (list a))))
+(##sys#vector->list (forall (a) (#(procedure #:enforce) ##sys#vector->list ((vector a)) (list a))))
+(list->vector (forall (a) (#(procedure #:enforce) list->vector ((list a)) (vector a))))
+(##sys#list->vector (forall (a) (#(procedure #:enforce) ##sys#list->vector ((list a)) (vector a))))
+(vector-fill! (#(procedure #:enforce) vector-fill! (vector *) undefined))
 
-(procedure? (procedure? procedure procedure? (*) boolean))
+(procedure? (#(procedure #:predicate procedure) procedure? (*) boolean))
 
-(vector-copy! (procedure! vector-copy! (vector vector #!optional fixnum) undefined))
-(map (forall (a b) (procedure! map ((procedure (a #!rest) b) (list a) #!rest list) (list b))))
+(vector-copy! (#(procedure #:enforce) vector-copy! (vector vector #!optional fixnum) undefined))
+(map (forall (a b) (#(procedure #:enforce) map ((procedure (a #!rest) b) (list a) #!rest list) (list b))))
 
 (for-each
- (forall (a) (procedure! for-each ((procedure (a #!rest) . *) (list a) #!rest list) undefined)))
+ (forall (a) (#(procedure #:enforce) for-each ((procedure (a #!rest) . *) (list a) #!rest list) undefined)))
 
-(apply (procedure! apply (procedure #!rest) . *))
-(##sys#apply (procedure! ##sys#apply (procedure #!rest) . *))
+(apply (#(procedure #:enforce) apply (procedure #!rest) . *))
+(##sys#apply (#(procedure #:enforce) ##sys#apply (procedure #!rest) . *))
 
 (force (procedure force (*) *)
        (((not (struct promise))) #(1)))
 
 (call-with-current-continuation
- (procedure! call-with-current-continuation ((procedure (procedure) . *)) . *))
+ (#(procedure #:enforce) call-with-current-continuation ((procedure (procedure) . *)) . *))
 
 (input-port? (procedure input-port? (*) boolean))
 (output-port? (procedure output-port? (*) boolean))
 
 (current-input-port
- (procedure! current-input-port (#!optional port) port)
+ (#(procedure #:enforce) current-input-port (#!optional port) port)
  ((port) (let ((#(tmp1) #(1))) 
 	   (let ((#(tmp2) (set! ##sys#standard-input #(tmp1))))
 	     #(tmp1))))
  (() ##sys#standard-input))
 
 (current-output-port
- (procedure! current-output-port (#!optional port) port)
+ (#(procedure #:enforce) current-output-port (#!optional port) port)
  ((port) (let ((#(tmp1) #(1)))
 	   (let ((#(tmp2) (set! ##sys#standard-output #(tmp1))))
 	     #(tmp1))))
@@ -575,148 +570,148 @@
 (call-with-output-file
     (procedure call-with-output-file (string (procedure (port) . *) #!rest) . *))
 
-(open-input-file (procedure! open-input-file (string #!rest symbol) port))
-(open-output-file (procedure! open-output-file (string #!rest symbol) port))
-(close-input-port (procedure! close-input-port (port) undefined))
-(close-output-port (procedure! close-output-port (port) undefined))
+(open-input-file (#(procedure #:enforce) open-input-file (string #!rest symbol) port))
+(open-output-file (#(procedure #:enforce) open-output-file (string #!rest symbol) port))
+(close-input-port (#(procedure #:enforce) close-input-port (port) undefined))
+(close-output-port (#(procedure #:enforce) close-output-port (port) undefined))
 (load (procedure load (string #!optional (procedure (*) . *)) undefined))
-(read (procedure! read (#!optional port) *))
+(read (#(procedure #:enforce) read (#!optional port) *))
 
-(eof-object? (procedure? eof eof-object? (*) boolean))
+(eof-object? (#(procedure #:predicate eof) eof-object? (*) boolean))
 
 ;;XXX if we had input/output port distinction, we could specialize these:
-(read-char (procedure! read-char (#!optional port) *)) ;XXX result (or eof char) ?
-(peek-char (procedure! peek-char (#!optional port) *))
+(read-char (#(procedure #:enforce) read-char (#!optional port) *)) ;XXX result (or eof char) ?
+(peek-char (#(procedure #:enforce) peek-char (#!optional port) *))
 
-(write (procedure! write (* #!optional port) undefined))
-(display (procedure! display (* #!optional port) undefined))
-(write-char (procedure! write-char (char #!optional port) undefined))
-(newline (procedure! newline (#!optional port) undefined))
+(write (#(procedure #:enforce) write (* #!optional port) undefined))
+(display (#(procedure #:enforce) display (* #!optional port) undefined))
+(write-char (#(procedure #:enforce) write-char (char #!optional port) undefined))
+(newline (#(procedure #:enforce) newline (#!optional port) undefined))
 
 (with-input-from-file
-    (procedure! with-input-from-file (string (procedure () . *) #!rest symbol) . *))
+    (#(procedure #:enforce) with-input-from-file (string (procedure () . *) #!rest symbol) . *))
 
 (with-output-to-file
-    (procedure! with-output-to-file (string (procedure () . *) #!rest symbol) . *))
+    (#(procedure #:enforce) with-output-to-file (string (procedure () . *) #!rest symbol) . *))
 
 (dynamic-wind
-    (procedure! dynamic-wind ((procedure () . *) (procedure () . *) (procedure () . *)) . *))
+    (#(procedure #:enforce) dynamic-wind ((procedure () . *) (procedure () . *) (procedure () . *)) . *))
 
 (values (procedure values (#!rest values) . *))
 (##sys#values (procedure ##sys#values (#!rest values) . *))
 
-(call-with-values (procedure! call-with-values ((procedure () . *) procedure) . *)
+(call-with-values (#(procedure #:enforce) call-with-values ((procedure () . *) procedure) . *)
   (((procedure () *) *) (let ((#(tmp1) #(1)))
 			  (let ((#(tmp2) #(2)))
 			    (#(tmp2) (#(tmp1)))))))
 
 (##sys#call-with-values
- (procedure! ##sys#call-with-values ((procedure () . *) procedure) . *)
+ (#(procedure #:enforce) ##sys#call-with-values ((procedure () . *) procedure) . *)
  (((procedure () *) *) (let ((#(tmp1) #(1)))
 			 (let ((#(tmp2) #(2)))
 			   (#(tmp2) (#(tmp1)))))))
 
 (eval (procedure eval (* #!optional (struct environment)) *))
-(char-ready? (procedure! char-ready? (#!optional port) boolean))
+(char-ready? (#(procedure #:enforce) char-ready? (#!optional port) boolean))
 
-(imag-part (procedure! imag-part (number) number)
+(imag-part (#(procedure #:enforce) imag-part (number) number)
 	   (((or fixnum float number)) (let ((#(tmp) #(1))) '0)))
 
-(real-part (procedure! real-part (number) number)
+(real-part (#(procedure #:enforce) real-part (number) number)
 	   (((or fixnum float number)) #(1)))
 
-(magnitude (procedure! magnitude (number) number)
+(magnitude (#(procedure #:enforce) magnitude (number) number)
 	   ((fixnum) (fixnum)
 	    (##core#inline "C_fixnum_abs" #(1)))
 	   ((float) (float)
 	    (##core#inline_allocate ("C_a_i_flonum_abs" 4) #(1))))
 
-(numerator (procedure! numerator (number) number)
+(numerator (#(procedure #:enforce) numerator (number) number)
 	   ((fixnum) (fixnum) #(1)))
 	   
-(denominator (procedure! denominator (number) number)
+(denominator (#(procedure #:enforce) denominator (number) number)
 	     ((fixnum) (fixnum) (let ((#(tmp) #(1))) '1)))
 
 (scheme-report-environment 
- (procedure! scheme-report-environment (#!optional fixnum) (struct environment)))
+ (#(procedure #:enforce) scheme-report-environment (#!optional fixnum) (struct environment)))
 
 (null-environment
- (procedure! null-environment (#!optional fixnum) (struct environment)))
+ (#(procedure #:enforce) null-environment (#!optional fixnum) (struct environment)))
 
 (interaction-environment
  (procedure interaction-environment () (struct environment)))
 
-(port-closed? (procedure! port-closed? (port) boolean)
+(port-closed? (#(procedure #:enforce) port-closed? (port) boolean)
 	      ((port) (##sys#slot #(1) '8)))
 
 ;; chicken
 
 (abort (procedure abort (*) noreturn))
 
-(add1 (procedure! add1 (number) number)
+(add1 (#(procedure #:enforce) add1 (number) number)
       ((float) (float) 
        (##core#inline_allocate ("C_a_i_flonum_plus" 4) #(1) '1.0)))
 
 (argc+argv (procedure argc+argv () fixnum (list string) fixnum))
 (argv (procedure argv () (list string)))
-(arithmetic-shift (procedure! arithmetic-shift (number number) number))
+(arithmetic-shift (#(procedure #:enforce) arithmetic-shift (number number) number))
 
-(bit-set? (procedure! bit-set? (number fixnum) boolean)
+(bit-set? (#(procedure #:enforce) bit-set? (number fixnum) boolean)
 	  ((fixnum fixnum) (##core#inline "C_u_i_bit_setp" #(1) #(2))))
 
-(bitwise-and (procedure! bitwise-and (#!rest number) number)
+(bitwise-and (#(procedure #:enforce) bitwise-and (#!rest number) number)
 	     ((fixnum fixnum) (fixnum)
 	      (##core#inline "C_fixnum_and" #(1) #(2))))
 
-(bitwise-ior (procedure! bitwise-ior (#!rest number) number)
+(bitwise-ior (#(procedure #:enforce) bitwise-ior (#!rest number) number)
 	     ((fixnum fixnum) (fixnum)
 	      (##core#inline "C_fixnum_or" #(1) #(2))))
 
-(bitwise-not (procedure! bitwise-not (number) number))
+(bitwise-not (#(procedure #:enforce) bitwise-not (number) number))
 
-(bitwise-xor (procedure! bitwise-xor (#!rest number) number)
+(bitwise-xor (#(procedure #:enforce) bitwise-xor (#!rest number) number)
 	     ((fixnum fixnum) (fixnum) 
 	      (##core#inline "C_fixnum_xor" #(1) #(2))))
 
-(blob->string (procedure! blob->string (blob) string))
+(blob->string (#(procedure #:enforce) blob->string (blob) string))
 
-(blob-size (procedure! blob-size (blob) fixnum)
+(blob-size (#(procedure #:enforce) blob-size (blob) fixnum)
 	   ((blob) (##sys#size #(1))))
 
-(blob? (procedure? blob blob? (*) boolean))
+(blob? (#(procedure #:predicate blob) blob? (*) boolean))
 
-(blob=? (procedure! blob=? (blob blob) boolean))
+(blob=? (#(procedure #:enforce) blob=? (blob blob) boolean))
 (build-platform (procedure build-platform () symbol))
-(call/cc (procedure! call/cc ((procedure (*) . *)) . *))
+(call/cc (#(procedure #:enforce) call/cc ((procedure (*) . *)) . *))
 (case-sensitive (procedure case-sensitive (#!optional *) *))
-(char-name (procedure! char-name ((or char symbol) #!optional char) *)) ;XXX -> (or char symbol) ?
+(char-name (#(procedure #:enforce) char-name ((or char symbol) #!optional char) *)) ;XXX -> (or char symbol) ?
 (chicken-home (procedure chicken-home () string))
 (chicken-version (procedure chicken-version (#!optional *) string))
 (command-line-arguments (procedure command-line-arguments (#!optional (list string)) (list string)))
-(condition-predicate (procedure! condition-predicate (symbol) (procedure ((struct condition)) boolean)))
-(condition-property-accessor (procedure! condition-property-accessor (symbol symbol #!optional *) (procedure ((struct condition)) *)))
+(condition-predicate (#(procedure #:enforce) condition-predicate (symbol) (procedure ((struct condition)) boolean)))
+(condition-property-accessor (#(procedure #:enforce) condition-property-accessor (symbol symbol #!optional *) (procedure ((struct condition)) *)))
 
-(condition? (procedure? (struct condition) condition? (*) boolean))
+(condition? (#(procedure #:predicate (struct condition)) condition? (*) boolean))
 
-(condition->list (procedure! condition->list ((struct condition)) (list (pair symbol *))))
-(continuation-capture (procedure! continuation-capture ((procedure ((struct continuation)) . *)) *))
-(continuation-graft (procedure! continuation-graft ((struct continuation) (procedure () . *)) *))
-(continuation-return (procedure! continuation-return (procedure #!rest) . *)) ;XXX make return type more specific?
+(condition->list (#(procedure #:enforce) condition->list ((struct condition)) (list (pair symbol *))))
+(continuation-capture (#(procedure #:enforce) continuation-capture ((procedure ((struct continuation)) . *)) *))
+(continuation-graft (#(procedure #:enforce) continuation-graft ((struct continuation) (procedure () . *)) *))
+(continuation-return (#(procedure #:enforce) continuation-return (procedure #!rest) . *)) ;XXX make return type more specific?
 
-(continuation? (procedure? (struct continuation) continuation? (*) boolean))
+(continuation? (#(procedure #:predicate (struct continuation)) continuation? (*) boolean))
 
-(copy-read-table (procedure! copy-read-table ((struct read-table)) (struct read-table)))
+(copy-read-table (#(procedure #:enforce) copy-read-table ((struct read-table)) (struct read-table)))
 (cpu-time (procedure cpu-time () fixnum fixnum))
 
 (current-error-port
- (procedure! current-error-port (#!optional port) port)
+ (#(procedure #:enforce) current-error-port (#!optional port) port)
  ((port) (let ((#(tmp1) #(1))) 
 	   (let ((#(tmp2) (set! ##sys#standard-error #(tmp1))))
 	     #(tmp1))))
  (() ##sys#standard-error))
 
 (current-exception-handler
- (procedure! current-exception-handler (#!optional (procedure (*) noreturn)) procedure)
+ (#(procedure #:enforce) current-exception-handler (#!optional (procedure (*) noreturn)) procedure)
  ((procedure) (let ((#(tmp1) #(1))) 
 		(let ((#(tmp2) (set! ##sys#current-exception-handler #(tmp1))))
 		  #(tmp1))))
@@ -729,8 +724,8 @@
  (procedure current-read-table (#!optional (struct read-table)) (struct read-table)))
 
 (current-seconds (procedure current-seconds () float))
-(define-reader-ctor (procedure! define-reader-ctor (symbol procedure) undefined))
-(delete-file (procedure! delete-file (string) string))
+(define-reader-ctor (#(procedure #:enforce) define-reader-ctor (symbol procedure) undefined))
+(delete-file (#(procedure #:enforce) delete-file (string) string))
 (enable-warnings (procedure enable-warnings (#!optional *) *))
 
 (equal=? (procedure equal=? (* *) boolean)
@@ -739,7 +734,7 @@
 	 (((or float number) (or float number)) (= #(1) #(2))))
 
 (er-macro-transformer
- (procedure! 
+ (#(procedure #:enforce) 
   er-macro-transformer
   ((procedure (* (procedure (*) *) (procedure (* *) *)) *))
   (struct transformer)))
@@ -749,17 +744,17 @@
 (##sys#error (procedure ##sys#error (* #!rest) noreturn))
 (##sys#signal-hook (procedure ##sys#signal-hook (* #!rest) noreturn))
 (exit (procedure exit (#!optional fixnum) noreturn))
-(exit-handler (procedure! exit-handler (#!optional (procedure (fixnum) . *)) procedure))
+(exit-handler (#(procedure #:enforce) exit-handler (#!optional (procedure (fixnum) . *)) procedure))
 (expand (procedure expand (* #!optional list) *))
 (extension-information (procedure extension-information (symbol) *))
 (feature? (procedure feature? (symbol) boolean))
 (features (procedure features () (list symbol)))
-(file-exists? (procedure! file-exists? (string) *))
-(directory-exists? (procedure! directory-exists? (string) *))
+(file-exists? (#(procedure #:enforce) file-exists? (string) *))
+(directory-exists? (#(procedure #:enforce) directory-exists? (string) *))
 (fixnum-bits fixnum)
 (fixnum-precision fixnum)
 
-(fixnum? (procedure? fixnum fixnum? (*) boolean))
+(fixnum? (#(procedure #:predicate fixnum) fixnum? (*) boolean))
 
 (flonum-decimal-precision fixnum)
 (flonum-epsilon float)
@@ -768,104 +763,104 @@
 (flonum-minimum-decimal-exponent fixnum)
 (flonum-minimum-exponent fixnum)
 (flonum-precision fixnum)
-(flonum-print-precision (procedure! (#!optional fixnum) fixnum))
+(flonum-print-precision (#(procedure #:enforce) (#!optional fixnum) fixnum))
 (flonum-radix fixnum)
 
-(flonum? (procedure? float flonum? (*) boolean))
+(flonum? (#(procedure #:predicate float) flonum? (*) boolean))
 
-(flush-output (procedure! flush-output (#!optional port) undefined))
+(flush-output (#(procedure #:enforce) flush-output (#!optional port) undefined))
 
-(foldl (forall (a b) (procedure! foldl ((procedure (a b) a) a (list b)) a)))
-(foldr (forall (a b) (procedure! foldr ((procedure (a b) b) b (list a)) b)))
+(foldl (forall (a b) (#(procedure #:enforce) foldl ((procedure (a b) a) a (list b)) a)))
+(foldr (forall (a b) (#(procedure #:enforce) foldr ((procedure (a b) b) b (list a)) b)))
 
 (force-finalizers (procedure force-finalizers () undefined))
 
-(fp- (procedure! fp- (float float) float)
+(fp- (#(procedure #:enforce) fp- (float float) float)
      ((float float) (##core#inline_allocate ("C_a_i_flonum_difference" 4) #(1) #(2)) ))
 
-(fp* (procedure! fp* (float float) float)
+(fp* (#(procedure #:enforce) fp* (float float) float)
      ((float float) (##core#inline_allocate ("C_a_i_flonum_times" 4) #(1) #(2)) ))
 
-(fp/ (procedure! fp/ (float float) float)
+(fp/ (#(procedure #:enforce) fp/ (float float) float)
      ((float float) (##core#inline_allocate ("C_a_i_flonum_quotient" 4) #(1) #(2)) ))
 
-(fp+ (procedure! fp+ (float float) float)
+(fp+ (#(procedure #:enforce) fp+ (float float) float)
      ((float float) (##core#inline_allocate ("C_a_i_flonum_plus" 4) #(1) #(2)) ))
 
-(fp< (procedure! fp< (float float) boolean)
+(fp< (#(procedure #:enforce) fp< (float float) boolean)
      ((float float) (##core#inline "C_flonum_lessp" #(1) #(2)) ))
 
-(fp<= (procedure! fp<= (float float) boolean)
+(fp<= (#(procedure #:enforce) fp<= (float float) boolean)
       ((float float) (##core#inline "C_flonum_less_or_equal_p" #(1) #(2)) ))
 
-(fp= (procedure! fp= (float float) boolean)
+(fp= (#(procedure #:enforce) fp= (float float) boolean)
      ((float float) (##core#inline "C_flonum_equalp" #(1) #(2)) ))
 
-(fp> (procedure! fp> (float float) boolean)
+(fp> (#(procedure #:enforce) fp> (float float) boolean)
      ((float float) (##core#inline "C_flonum_greaterp" #(1) #(2)) ))
 
-(fp>= (procedure! fp>= (float float) boolean)
+(fp>= (#(procedure #:enforce) fp>= (float float) boolean)
       ((float float) (##core#inline "C_flonum_greater_or_equal_p" #(1) #(2)) ))
 
-(fpabs (procedure! fpabs (float) float)
+(fpabs (#(procedure #:enforce) fpabs (float) float)
        ((float) (##core#inline_allocate ("C_a_i_flonum_abs" 4) #(1) )))
 
-(fpacos (procedure! fpacos (float) float)
+(fpacos (#(procedure #:enforce) fpacos (float) float)
        ((float) (##core#inline_allocate ("C_a_i_flonum_acos" 4) #(1) )))
 
-(fpasin (procedure! fpasin (float) float)
+(fpasin (#(procedure #:enforce) fpasin (float) float)
 	((float) (##core#inline_allocate ("C_a_i_flonum_asin" 4) #(1) )))
 
-(fpatan (procedure! fpatan (float) float)
+(fpatan (#(procedure #:enforce) fpatan (float) float)
 	((float) (##core#inline_allocate ("C_a_i_flonum_atan" 4) #(1) )))
 
-(fpatan2 (procedure! fpatan2 (float float) float)
+(fpatan2 (#(procedure #:enforce) fpatan2 (float float) float)
 	 ((float float) (##core#inline_allocate ("C_a_i_flonum_atan2" 4)
 						#(1) #(2))))
-(fpceiling (procedure! fpceiling (float) float)
+(fpceiling (#(procedure #:enforce) fpceiling (float) float)
 	   ((float) (##core#inline_allocate ("C_a_i_flonum_ceiling" 4) #(1) )))
 
-(fpcos (procedure! fpcos (float) float)
+(fpcos (#(procedure #:enforce) fpcos (float) float)
        ((float) (##core#inline_allocate ("C_a_i_flonum_cos" 4) #(1) )))
 
-(fpexp (procedure! fpexp (float) float)
+(fpexp (#(procedure #:enforce) fpexp (float) float)
        ((float) (##core#inline_allocate ("C_a_i_flonum_exp" 4) #(1) )))
 
-(fpexpt (procedure! fpexpt (float float) float)
+(fpexpt (#(procedure #:enforce) fpexpt (float float) float)
 	((float float) (##core#inline_allocate ("C_a_i_flonum_expt" 4)
 					       #(1) #(2))))
 
-(fpfloor (procedure! fpfloor (float) float)
+(fpfloor (#(procedure #:enforce) fpfloor (float) float)
 	 ((float) (##core#inline_allocate ("C_a_i_flonum_floor" 4) #(1) )))
 
-(fpinteger? (procedure! fpinteger? (float) boolean)
+(fpinteger? (#(procedure #:enforce) fpinteger? (float) boolean)
 	    ((float) (##core#inline "C_u_i_flonum_intergerp" #(1) )))
 
-(fplog (procedure! fplog (float) float)
+(fplog (#(procedure #:enforce) fplog (float) float)
        ((float) (##core#inline_allocate ("C_a_i_flonum_log" 4) #(1) )))
 
-(fpmax (procedure! fpmax (float float) float)
+(fpmax (#(procedure #:enforce) fpmax (float float) float)
        ((float float) (##core#inline "C_i_flonum_max" #(1) #(2))))
 
-(fpmin (procedure! fpmin (float float) float)
+(fpmin (#(procedure #:enforce) fpmin (float float) float)
        ((float float) (##core#inline "C_i_flonum_min" #(1) #(2))))
 
-(fpneg (procedure! fpneg (float) float)
+(fpneg (#(procedure #:enforce) fpneg (float) float)
        ((float) (##core#inline_allocate ("C_a_i_flonum_negate" 4) #(1) )))
 
-(fpround (procedure! fpround (float) float)
+(fpround (#(procedure #:enforce) fpround (float) float)
 	 ((float) (##core#inline_allocate ("C_a_i_flonum_round" 4) #(1) )))
 
-(fpsin (procedure! fpsin (float) float)
+(fpsin (#(procedure #:enforce) fpsin (float) float)
        ((float) (##core#inline_allocate ("C_a_i_flonum_sin" 4) #(1) )))
 
-(fpsqrt (procedure! fpsqrt (float) float)
+(fpsqrt (#(procedure #:enforce) fpsqrt (float) float)
 	((float) (##core#inline_allocate ("C_a_i_flonum_sqrt" 4) #(1) )))
 
-(fptan (procedure! fptan (float) float)
+(fptan (#(procedure #:enforce) fptan (float) float)
        ((float) (##core#inline_allocate ("C_a_i_flonum_tan" 4) #(1) )))
 
-(fptruncate (procedure! fptruncate (float) float)
+(fptruncate (#(procedure #:enforce) fptruncate (float) float)
 	    ((float) (##core#inline_allocate ("C_a_i_flonum_truncate" 4) #(1) )))
 
 (fx- (procedure fx- (fixnum fixnum) fixnum))
@@ -892,24 +887,24 @@
 (gc (procedure gc (#!optional *) fixnum))
 (gensym (procedure gensym (#!optional (or string symbol)) symbol))
 
-(get (procedure! get (symbol symbol #!optional *) *)
+(get (#(procedure #:enforce) get (symbol symbol #!optional *) *)
      ((symbol symbol *) (##core#inline "C_i_getprop" #(1) #(2) #(3))))
 
-(get-call-chain (procedure! get-call-chain (#!optional fixnum (struct thread)) (list vector)))
-(get-condition-property (procedure! get-condition-property ((struct condition) symbol symbol #!optional *) *))
-(get-environment-variable (procedure! get-environment-variable (string) *))
-(get-keyword (procedure! get-keyword (symbol list #!optional *) *))
-(get-output-string (procedure! get-output-string (port) string))
-(get-properties (procedure! get-properties (symbol list) symbol * list))
+(get-call-chain (#(procedure #:enforce) get-call-chain (#!optional fixnum (struct thread)) (list vector)))
+(get-condition-property (#(procedure #:enforce) get-condition-property ((struct condition) symbol symbol #!optional *) *))
+(get-environment-variable (#(procedure #:enforce) get-environment-variable (string) *))
+(get-keyword (#(procedure #:enforce) get-keyword (symbol list #!optional *) *))
+(get-output-string (#(procedure #:enforce) get-output-string (port) string))
+(get-properties (#(procedure #:enforce) get-properties (symbol list) symbol * list))
 
 (getter-with-setter
- (procedure!
+ (#(procedure #:enforce)
   getter-with-setter
   ((procedure (#!rest) *) (procedure (* #!rest) . *) #!optional string)
   procedure))
 
 (implicit-exit-handler
- (procedure! implicit-exit-handler (#!optional (procedure () . *)) procedure))
+ (#(procedure #:enforce) implicit-exit-handler (#!optional (procedure () . *)) procedure))
 
 (ir-macro-transformer
  (procedure
@@ -917,158 +912,160 @@
   ((procedure (* (procedure (*) *) (procedure (* *) *)) *))
   (struct transformer)))
 
-(keyword->string (procedure! keyword->string (symbol) string))
+(keyword->string (#(procedure #:enforce) keyword->string (symbol) string))
 (keyword-style (procedure keyword-style (#!optional symbol) symbol))
 (keyword? (procedure keyword? (*) boolean))
-(load-library (procedure! load-library (symbol #!optional string) undefined))
-(load-relative (procedure! load-relative (string #!optional (procedure (*) . *)) undefined))
+(load-library (#(procedure #:enforce) load-library (symbol #!optional string) undefined))
+(load-relative (#(procedure #:enforce) load-relative (string #!optional (procedure (*) . *)) undefined))
 (load-verbose (procedure load-verbose (#!optional *) *))
 (machine-byte-order (procedure machine-byte-order () symbol))
 (machine-type (procedure machine-type () symbol))
 
-(make-blob (procedure! make-blob (fixnum) blob)
+(make-blob (#(procedure #:enforce) make-blob (fixnum) blob)
 	   ((fixnum) (##sys#make-blob #(1))))
 
-(make-composite-condition (procedure! make-composite-condition (#!rest (struct condition)) (struct condition)))
-(make-parameter (procedure! make-parameter (* #!optional procedure) procedure))
-(make-property-condition (procedure! make-property-condition (symbol #!rest *) (struct condition)))
+(make-composite-condition (#(procedure #:enforce) make-composite-condition (#!rest (struct condition)) (struct condition)))
+(make-parameter (#(procedure #:enforce) make-parameter (* #!optional procedure) procedure))
+(make-property-condition (#(procedure #:enforce) make-property-condition (symbol #!rest *) (struct condition)))
 (maximum-flonum float)
 (memory-statistics (procedure memory-statistics () (vector fixnum)))
 (minimum-flonum float)
 (most-negative-fixnum fixnum)
 (most-positive-fixnum fixnum)
-(on-exit (procedure! on-exit ((procedure () . *)) undefined))
-(open-input-string (procedure! open-input-string (string #!rest) port))
+(on-exit (#(procedure #:enforce) on-exit ((procedure () . *)) undefined))
+(open-input-string (#(procedure #:enforce) open-input-string (string #!rest) port))
 (open-output-string (procedure open-output-string (#!rest) port))
 (parentheses-synonyms (procedure parentheses-synonyms (#!optional *) *))
 
-(port-name (procedure! port-name (#!optional port) *)
+(port-name (#(procedure #:enforce) port-name (#!optional port) *)
 	   ((port) (##sys#slot #(1) '3)))
 
-(port-position (procedure! port-position (#!optional port) fixnum))
+(port-position (#(procedure #:enforce) port-position (#!optional port) fixnum))
 
-(port? (procedure? port port? (*) boolean))
+(port? (#(procedure #:predicate port) port? (*) boolean))
 
 (print (procedure print (#!rest *) undefined))
-(print-call-chain (procedure! print-call-chain (#!optional port fixnum * string) undefined))
-(print-error-message (procedure! print-error-message (* #!optional port string) undefined))
+(print-call-chain (#(procedure #:enforce) print-call-chain (#!optional port fixnum * string) undefined))
+(print-error-message (#(procedure #:enforce) print-error-message (* #!optional port string) undefined))
 (print* (procedure print* (#!rest) undefined))
-(procedure-information (procedure! procedure-information (procedure) *))
-(program-name (procedure! program-name (#!optional string) string))
-(promise? (procedure? (struct promise) promise? (*) boolean))
+(procedure-information (#(procedure #:enforce) procedure-information (procedure) *))
+(program-name (#(procedure #:enforce) program-name (#!optional string) string))
+(promise? (#(procedure #:predicate (struct promise)) promise? (*) boolean))
 
-(put! (procedure! put! (symbol symbol *) undefined)
+(put! (#(procedure #:enforce) put! (symbol symbol *) undefined)
       ((symbol symbol *)
        (##core#inline_allocate ("C_a_i_putprop" 8) #(1) #(2) #(3))))
 
 (quit (procedure quit (#!optional *) noreturn))
-(register-feature! (procedure! register-feature! (#!rest symbol) undefined))
-(remprop! (procedure! remprop! (symbol symbol) undefined))
-(rename-file (procedure! rename-file (string string) string))
-(repl (procedure! repl (#!optional (procedure (*) . *)) undefined))
-(repl-prompt (procedure! repl-prompt (#!optional (procedure () string)) procedure))
+(register-feature! (#(procedure #:enforce) register-feature! (#!rest symbol) undefined))
+(remprop! (#(procedure #:enforce) remprop! (symbol symbol) undefined))
+(rename-file (#(procedure #:enforce) rename-file (string string) string))
+(repl (#(procedure #:enforce) repl (#!optional (procedure (*) . *)) undefined))
+(repl-prompt (#(procedure #:enforce) repl-prompt (#!optional (procedure () string)) procedure))
 (repository-path (procedure repository-path (#!optional *) *))
 (require (procedure require (#!rest (or string symbol)) undefined))
 (reset (procedure reset () noreturn))
-(reset-handler (procedure! reset-handler (#!optional (procedure () . *)) procedure))
+(reset-handler (#(procedure #:enforce) reset-handler (#!optional (procedure () . *)) procedure))
 (return-to-host (procedure return-to-host () . *))
-(reverse-list->string (procedure! reverse-list->string ((list char)) string))
-(set-finalizer! (procedure! set-finalizer! (* (procedure (*) . *)) *))
+(reverse-list->string (#(procedure #:enforce) reverse-list->string ((list char)) string))
+(set-finalizer! (#(procedure #:enforce) set-finalizer! (* (procedure (*) . *)) *))
 (set-gc-report! (procedure set-gc-report! (*) undefined))
 
 (set-parameterized-read-syntax!
- (procedure! set-parameterized-read-syntax! (char (procedure (port fixnum) . *)) undefined))
+ (#(procedure #:enforce) set-parameterized-read-syntax! (char (procedure (port fixnum) . *)) undefined))
 
-(set-port-name! (procedure! set-port-name! (port string) undefined)
+(set-port-name! (#(procedure #:enforce) set-port-name! (port string) undefined)
 		((port string) (##sys#setslot #(1) '3 #(2))))
 
-(set-read-syntax! (procedure! set-read-syntax! (char (procedure (port) . *)) undefined))
-(set-sharp-read-syntax! (procedure! set-sharp-read-syntax! (char (procedure (port) . *)) undefined))
-(setter (procedure! setter (procedure) procedure))
+(set-read-syntax! (#(procedure #:enforce) set-read-syntax! (char (procedure (port) . *)) undefined))
+(set-sharp-read-syntax! (#(procedure #:enforce) set-sharp-read-syntax! (char (procedure (port) . *)) undefined))
+(setter (#(procedure #:enforce) setter (procedure) procedure))
 (signal (procedure signal (*) . *))
-(signum (procedure! signum (number) number))
+(signum (#(procedure #:enforce) signum (number) number))
 (software-type (procedure software-type () symbol))
 (software-version (procedure software-version () symbol))
-(string->blob (procedure! string->blob (string) blob))
-(string->keyword (procedure! string->keyword (string) symbol))
-(string->uninterned-symbol (procedure! string->uninterned-symbol (string) symbol))
+(string->blob (#(procedure #:enforce) string->blob (string) blob))
+(string->keyword (#(procedure #:enforce) string->keyword (string) symbol))
+(string->uninterned-symbol (#(procedure #:enforce) string->uninterned-symbol (string) symbol))
 (strip-syntax (procedure strip-syntax (*) *))
 
-(sub1 (procedure! sub1 (number) number)
+(sub1 (#(procedure #:enforce) sub1 (number) number)
       ((float) (float)
        (##core#inline_allocate ("C_a_i_flonum_difference" 4) #(1) '1.0)))
 
-(subvector (forall (a) (procedure! subvector ((vector a) fixnum #!optional fixnum) (vector a))))
+(subvector (forall (a) (#(procedure #:enforce) subvector ((vector a) fixnum #!optional fixnum) (vector a))))
 (symbol-escape (procedure symbol-escape (#!optional *) *))
 
-(symbol-plist (procedure! symbol-plist (symbol) list)
+(symbol-plist (#(procedure #:enforce) symbol-plist (symbol) list)
 	      ((symbol) (##sys#slot #(1) '2)))
 
 (syntax-error (procedure syntax-error (* #!rest) noreturn))
-(system (procedure! system (string) fixnum))
-(unregister-feature! (procedure! unregister-feature! (#!rest symbol) undefined))
-(vector-resize (forall (a) (procedure! vector-resize ((vector a) fixnum) (vector a))))
+(system (#(procedure #:enforce) system (string) fixnum))
+(unregister-feature! (#(procedure #:enforce) unregister-feature! (#!rest symbol) undefined))
+(vector-resize (forall (a) (#(procedure #:enforce) vector-resize ((vector a) fixnum) (vector a))))
 (void (procedure void (#!rest) undefined))
 (warning (procedure warning (* #!rest) undefined))
 
 (with-exception-handler
- (procedure! with-exception-handler ((procedure (*) . *) (procedure () . *)) . *))
+ (#(procedure #:enforce) with-exception-handler ((procedure (*) . *) (procedure () . *)) . *))
 
 
 ;; chicken (internal)
 
-(##sys#foreign-char-argument (procedure! ##sys#foreign-char-argument (char) char)
+(##sys#foreign-char-argument (#(procedure #:enforce) ##sys#foreign-char-argument (char) char)
 			     ((char) #(1)))
-(##sys#foreign-fixnum-argument (procedure! ##sys#foreign-fixnum-argument (fixnum) fixnum)
+(##sys#foreign-fixnum-argument (#(procedure #:enforce) ##sys#foreign-fixnum-argument (fixnum) fixnum)
 			       ((fixnum) #(1)))
-(##sys#foreign-flonum-argument (procedure! ##sys#foreign-flonum-argument (number) number)
+(##sys#foreign-flonum-argument (#(procedure #:enforce) ##sys#foreign-flonum-argument (number) number)
 			       ((float) #(1)))
-(##sys#foreign-string-argument (procedure! ##sys#foreign-string-argument (string) string)
+(##sys#foreign-string-argument (#(procedure #:enforce) ##sys#foreign-string-argument (string) string)
 			       ((string) #(1)))
-(##sys#foreign-symbol-argument (procedure! ##sys#foreign-symbol-argument (symbol) symbol)
+(##sys#foreign-symbol-argument (#(procedure #:enforce) ##sys#foreign-symbol-argument (symbol) symbol)
 			       ((symbol) #(1)))
-(##sys#foreign-pointer-argument (procedure! ##sys#foreign-pointer-argument (pointer) pointer)
+(##sys#foreign-pointer-argument (#(procedure #:enforce) ##sys#foreign-pointer-argument (pointer) pointer)
 				((pointer) #(1)))
 
-(##sys#check-blob (procedure! ##sys#check-blob (blob #!optional *) *)
+(##sys#check-blob (#(procedure #:enforce) ##sys#check-blob (blob #!optional *) *)
 		  ((blob) (let ((#(tmp) #(1))) '#t))
 		  ((blob *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-pair (procedure! ##sys#check-pair (pair #!optional *) *)
+(##sys#check-pair (#(procedure #:enforce) ##sys#check-pair (pair #!optional *) *)
 		  ((pair) (let ((#(tmp) #(1))) '#t))
 		  ((pair *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-list (procedure! ##sys#check-list (list #!optional *) *)
+(##sys#check-list (#(procedure #:enforce) ##sys#check-list (list #!optional *) *)
 		  (((or null pair list)) (let ((#(tmp) #(1))) '#t))
 		  (((or null pair list) *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-string (procedure! ##sys#check-string (string #!optional *) *)
+(##sys#check-string (#(procedure #:enforce) ##sys#check-string (string #!optional *) *)
 		    ((string) (let ((#(tmp) #(1))) '#t))
 		    ((string) * (let ((#(tmp) #(1))) '#t)))
-(##sys#check-number (procedure! ##sys#check-number (number #!optional *) *)
+(##sys#check-number (#(procedure #:enforce) ##sys#check-number (number #!optional *) *)
 		    ((number) (let ((#(tmp) #(1))) '#t))
 		    ((number *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-exact (procedure! ##sys#check-exact (fixnum #!optional *) *)
+(##sys#check-exact (#(procedure #:enforce) ##sys#check-exact (fixnum #!optional *) *)
 		   ((fixnum) (let ((#(tmp) #(1))) '#t))
 		   ((fixnum *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-inexact (procedure! ##sys#check-inexact (float #!optional *) *)
+(##sys#check-inexact (#(procedure #:enforce) ##sys#check-inexact (float #!optional *) *)
 		     ((float) (let ((#(tmp) #(1))) '#t))
 		     ((float *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-symbol (procedure! ##sys#check-symbol (symbol #!optional *) *)
+(##sys#check-symbol (#(procedure #:enforce) ##sys#check-symbol (symbol #!optional *) *)
 		    ((symbol) (let ((#(tmp) #(1))) '#t))
 		    ((symbol *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-vector (procedure! ##sys#check-vector (vector #!optional *) *)
+(##sys#check-vector (#(procedure #:enforce) ##sys#check-vector (vector #!optional *) *)
 		    ((vector) (let ((#(tmp) #(1))) '#t))
 		    ((vector *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-char (procedure! ##sys#check-char (char #!optional *) *)
+(##sys#check-char (#(procedure #:enforce) ##sys#check-char (char #!optional *) *)
 		  ((char) (let ((#(tmp) #(1))) '#t))
 		  ((char *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-boolean (procedure! ##sys#check-boolean (boolean #!optional *) *)
+(##sys#check-boolean (#(procedure #:enforce) ##sys#check-boolean (boolean #!optional *) *)
 		     ((boolean) (let ((#(tmp) #(1))) '#t))
 		     ((boolean *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-locative (procedure! ##sys#check-locative (locative #!optional *) *)
+(##sys#check-locative (#(procedure #:enforce) ##sys#check-locative (locative #!optional *) *)
 		      ((locative) (let ((#(tmp) #(1))) '#t))
 		      ((locative *) (let ((#(tmp) #(1))) '#t)))
-(##sys#check-closure (procedure! ##sys#check-closure (procedure #!optional *) *)
+(##sys#check-closure (#(procedure #:enforce) ##sys#check-closure (procedure #!optional *) *)
 		     ((procedure) (let ((#(tmp) #(1))) '#t))
 		     ((procedure *) (let ((#(tmp) #(1))) '#t)))
+(##sys#setslot (#(procedure #:enforce) ##sys#setslot (* fixnum *) *)
+	       #;((* fixnum immediate) (##sys#setislot #(1) #(2) #(3)))) ; too dangerous
 
 
 ;; data-structures
@@ -1076,8 +1073,8 @@
 (->string (procedure ->string (*) string)
 	  ((string) #(1)))
 
-(alist-ref (procedure! alist-ref (* (list pair) #!optional (procedure (* *) *) *) *))
-(alist-update! (procedure! alist-update! (* * (list pair) #!optional (procedure (* *) *)) *))
+(alist-ref (#(procedure #:enforce) alist-ref (* (list pair) #!optional (procedure (* *) *) *) *))
+(alist-update! (#(procedure #:enforce) alist-update! (* * (list pair) #!optional (procedure (* *) *)) *))
 (always? deprecated)
 
 (any? (procedure any? (*) boolean)
@@ -1087,126 +1084,126 @@
        ((pair) (let ((#(tmp) #(1))) '#f))
        (((not (or pair list))) (let ((#(tmp) #(1))) '#t)))
 
-(binary-search (forall (a) (procedure! binary-search ((vector a) (procedure (a) *)) *)))
-(butlast (forall (a) (procedure! butlast ((pair a *)) (list a))))
-(chop (forall (a) (procedure! chop ((list a) fixnum) (list a))))
-(complement (procedure! complement ((procedure (#!rest) *)) (procedure (#!rest) boolean)))
-(compose (procedure! compose (#!rest procedure) procedure))
-(compress (forall (a) (procedure! compress (list (list a)) (list a))))
+(binary-search (forall (a) (#(procedure #:enforce) binary-search ((vector a) (procedure (a) *)) *)))
+(butlast (forall (a) (#(procedure #:enforce) butlast ((pair a *)) (list a))))
+(chop (forall (a) (#(procedure #:enforce) chop ((list a) fixnum) (list a))))
+(complement (#(procedure #:enforce) complement ((procedure (#!rest) *)) (procedure (#!rest) boolean)))
+(compose (#(procedure #:enforce) compose (#!rest procedure) procedure))
+(compress (forall (a) (#(procedure #:enforce) compress (list (list a)) (list a))))
 (conc (procedure conc (#!rest) string))
-(conjoin (procedure! conjoin (#!rest (procedure (*) *)) (procedure (*) *)))
+(conjoin (#(procedure #:enforce) conjoin (#!rest (procedure (*) *)) (procedure (*) *)))
 (constantly (forall (a) (procedure constantly (a) (procedure (#!rest) a))))
-(disjoin (procedure! disjoin (#!rest (procedure (*) *)) (procedure (*) *)))
-(each (procedure! each (#!rest procedure) procedure))
-(flatten (procedure! flatten (pair) list))
-(flip (procedure! flip ((procedure (* *) . *)) (procedure (* *) . *)))
+(disjoin (#(procedure #:enforce) disjoin (#!rest (procedure (*) *)) (procedure (*) *)))
+(each (#(procedure #:enforce) each (#!rest procedure) procedure))
+(flatten (#(procedure #:enforce) flatten (pair) list))
+(flip (#(procedure #:enforce) flip ((procedure (* *) . *)) (procedure (* *) . *)))
 (identity (forall (a) (procedure identity (a) a)))
-(intersperse (procedure! intersperse (list *) list))
-(join (procedure! join (list list) list))
-(list->queue (procedure! list->queue (list) (struct queue)))
-(list-of? (procedure! list-of? ((procedure (*) *)) (procedure (list) boolean)))
+(intersperse (#(procedure #:enforce) intersperse (list *) list))
+(join (#(procedure #:enforce) join (list list) list))
+(list->queue (#(procedure #:enforce) list->queue (list) (struct queue)))
+(list-of? (#(procedure #:enforce) list-of? ((procedure (*) *)) (procedure (list) boolean)))
 (make-queue (procedure make-queue () (struct queue)))
-(merge (procedure! merge (list list (procedure (* *) *)) list))
-(merge! (procedure! merge! (list list (procedure (* *) *)) list))
+(merge (#(procedure #:enforce) merge (list list (procedure (* *) *)) list))
+(merge! (#(procedure #:enforce) merge! (list list (procedure (* *) *)) list))
 (never? deprecated)
 (none? deprecated)
-(o (procedure! o (#!rest (procedure (*) *)) (procedure (*) *)))
-(queue->list (procedure! queue->list ((struct queue)) list))
-(queue-add! (procedure! queue-add! ((struct queue) *) undefined))
+(o (#(procedure #:enforce) o (#!rest (procedure (*) *)) (procedure (*) *)))
+(queue->list (#(procedure #:enforce) queue->list ((struct queue)) list))
+(queue-add! (#(procedure #:enforce) queue-add! ((struct queue) *) undefined))
 
-(queue-empty? (procedure! queue-empty? ((struct queue)) boolean)
+(queue-empty? (#(procedure #:enforce) queue-empty? ((struct queue)) boolean)
 	      (((struct queue)) (##core#inline "C_i_nullp" (##sys#slot #(1) '1))))
 
-(queue-first (procedure! queue-first ((struct queue)) *))
-(queue-last (procedure! queue-last ((struct queue)) *))
+(queue-first (#(procedure #:enforce) queue-first ((struct queue)) *))
+(queue-last (#(procedure #:enforce) queue-last ((struct queue)) *))
 
-(queue-length (procedure! queue-length ((struct queue)) fixnum)
+(queue-length (#(procedure #:enforce) queue-length ((struct queue)) fixnum)
 	      (((struct queue)) (##sys#slot #(1) '3)))
 
-(queue-push-back! (procedure! queue-push-back! ((struct queue) *) undefined))
-(queue-push-back-list! (procedure! queue-push-back-list! ((struct queue) list) undefined))
-(queue-remove! (procedure! queue-remove! ((struct queue)) *))
-(queue? (procedure? (struct queue) queue? (*) boolean))
+(queue-push-back! (#(procedure #:enforce) queue-push-back! ((struct queue) *) undefined))
+(queue-push-back-list! (#(procedure #:enforce) queue-push-back-list! ((struct queue) list) undefined))
+(queue-remove! (#(procedure #:enforce) queue-remove! ((struct queue)) *))
+(queue? (#(procedure #:predicate (struct queue)) queue? (*) boolean))
 
-(rassoc (procedure! rassoc (* (list pair) #!optional (procedure (* *) *)) *))
-(reverse-string-append (procedure! reverse-string-append ((list string)) string))
+(rassoc (#(procedure #:enforce) rassoc (* (list pair) #!optional (procedure (* *) *)) *))
+(reverse-string-append (#(procedure #:enforce) reverse-string-append ((list string)) string))
 (shuffle deprecated)
-(sort (procedure! sort ((or list vector) (procedure (* *) *)) (or list vector)))
-(sort! (procedure! sort! ((or list vector) (procedure (* *) *)) (or list vector)))
-(sorted? (procedure! sorted? ((or list vector) (procedure (* *) *)) boolean))
-(topological-sort (procedure! topological-sort ((list list) (procedure (* *) *)) list))
-(string-chomp (procedure! string-chomp (string #!optional string) string))
-(string-chop (procedure! string-chop (string fixnum) (list string)))
-(string-compare3 (procedure! string-compare3 (string string) fixnum))
-(string-compare3-ci (procedure! string-compare3-ci (string string) fixnum))
-(string-intersperse (procedure! string-intersperse ((list string) #!optional string) string))
-(string-split (procedure! string-split (string #!optional string *) (list string)))
-(string-translate (procedure! string-translate (string * #!optional *) string))
-(string-translate* (procedure! string-translate* (string (list (pair string string))) string))
-(substring-ci=? (procedure! substring-ci=? (string string #!optional fixnum fixnum fixnum) boolean))
-
-(substring-index (procedure! substring-index (string string #!optional fixnum) *)
+(sort (#(procedure #:enforce) sort ((or list vector) (procedure (* *) *)) (or list vector)))
+(sort! (#(procedure #:enforce) sort! ((or list vector) (procedure (* *) *)) (or list vector)))
+(sorted? (#(procedure #:enforce) sorted? ((or list vector) (procedure (* *) *)) boolean))
+(topological-sort (#(procedure #:enforce) topological-sort ((list list) (procedure (* *) *)) list))
+(string-chomp (#(procedure #:enforce) string-chomp (string #!optional string) string))
+(string-chop (#(procedure #:enforce) string-chop (string fixnum) (list string)))
+(string-compare3 (#(procedure #:enforce) string-compare3 (string string) fixnum))
+(string-compare3-ci (#(procedure #:enforce) string-compare3-ci (string string) fixnum))
+(string-intersperse (#(procedure #:enforce) string-intersperse ((list string) #!optional string) string))
+(string-split (#(procedure #:enforce) string-split (string #!optional string *) (list string)))
+(string-translate (#(procedure #:enforce) string-translate (string * #!optional *) string))
+(string-translate* (#(procedure #:enforce) string-translate* (string (list (pair string string))) string))
+(substring-ci=? (#(procedure #:enforce) substring-ci=? (string string #!optional fixnum fixnum fixnum) boolean))
+
+(substring-index (#(procedure #:enforce) substring-index (string string #!optional fixnum) *)
 		 ((* *) (##sys#substring-index #(1) #(2) '0))
 		 ((* * *) (##sys#substring-index #(1) #(2) #(3))))
 
-(substring-index-ci (procedure! substring-index-ci (string string #!optional fixnum) *)
+(substring-index-ci (#(procedure #:enforce) substring-index-ci (string string #!optional fixnum) *)
 		    ((* *) (##sys#substring-index-ci #(1) #(2) '0))
 		    ((* * *) (##sys#substring-index-ci #(1) #(2) #(3))))
 
-(substring=? (procedure! substring=? (string string #!optional fixnum fixnum fixnum) boolean))
+(substring=? (#(procedure #:enforce) substring=? (string string #!optional fixnum fixnum fixnum) boolean))
 (tail? (procedure tail? (* *) boolean))
 
 
 ;; extras
 
 (format (procedure format (#!rest) *))
-(fprintf (procedure! fprintf (port string #!rest) undefined))
-(pp (procedure! pp (* #!optional port) undefined))
-(pretty-print (procedure! pretty-print (* #!optional port) undefined))
+(fprintf (#(procedure #:enforce) fprintf (port string #!rest) undefined))
+(pp (#(procedure #:enforce) pp (* #!optional port) undefined))
+(pretty-print (#(procedure #:enforce) pretty-print (* #!optional port) undefined))
 (pretty-print-width (procedure pretty-print-width (#!optional fixnum) *))
-(printf (procedure! printf (string #!rest) undefined))
-(random (procedure! random (fixnum) fixnum))
-(randomize (procedure! randomize (#!optional fixnum) undefined))
-(read-buffered (procedure! read-buffered (#!optional port) string))
-(read-byte (procedure! read-byte (#!optional port) *))
-(read-file (procedure! read-file (#!optional (or port string) (procedure (port) *) fixnum) list))
-(read-line (procedure! read-line (#!optional port (or boolean fixnum)) *))
-(read-lines (procedure! read-lines (#!optional (or port string) fixnum) (list string)))
-(read-string (procedure! read-string (#!optional * port) string))
-(read-string! (procedure! read-string! (fixnum string #!optional port fixnum) fixnum))
-(read-token (procedure! read-token ((procedure (char) *) #!optional port) string))
-(sprintf (procedure! sprintf (string #!rest) string))
-
-(write-byte (procedure! write-byte (fixnum #!optional port) undefined)
+(printf (#(procedure #:enforce) printf (string #!rest) undefined))
+(random (#(procedure #:enforce) random (fixnum) fixnum))
+(randomize (#(procedure #:enforce) randomize (#!optional fixnum) undefined))
+(read-buffered (#(procedure #:enforce) read-buffered (#!optional port) string))
+(read-byte (#(procedure #:enforce) read-byte (#!optional port) *))
+(read-file (#(procedure #:enforce) read-file (#!optional (or port string) (procedure (port) *) fixnum) list))
+(read-line (#(procedure #:enforce) read-line (#!optional port (or boolean fixnum)) *))
+(read-lines (#(procedure #:enforce) read-lines (#!optional (or port string) fixnum) (list string)))
+(read-string (#(procedure #:enforce) read-string (#!optional * port) string))
+(read-string! (#(procedure #:enforce) read-string! (fixnum string #!optional port fixnum) fixnum))
+(read-token (#(procedure #:enforce) read-token ((procedure (char) *) #!optional port) string))
+(sprintf (#(procedure #:enforce) sprintf (string #!rest) string))
+
+(write-byte (#(procedure #:enforce) write-byte (fixnum #!optional port) undefined)
 	    ((fixnum port) (##sys#write-char-0 (integer->char #(1)) #(2)))
 	    ((fixnum) (##sys#write-char-0 (integer->char #(1)) ##sys#standard-output)))
 
-(write-line (procedure! write-line (string #!optional port) undefined))
-(write-string (procedure! write-string (string #!optional * port) undefined))
+(write-line (#(procedure #:enforce) write-line (string #!optional port) undefined))
+(write-string (#(procedure #:enforce) write-string (string #!optional * port) undefined))
 
 
 ;; files
 
-(delete-file* (procedure! delete-file* (string) *))
-(file-copy (procedure! file-copy (string string #!optional * fixnum) fixnum))
-(file-move (procedure! file-move (string string #!optional * fixnum) fixnum))
-(make-pathname (procedure! make-pathname (* #!optional string string) string))
-(directory-null? (procedure! directory-null? (string) boolean))
-(make-absolute-pathname (procedure! make-absolute-pathname (* #!optional string string) string))
-(create-temporary-directory (procedure! create-temporary-directory () string))
-(create-temporary-file (procedure! create-temporary-file (#!optional string) string))
-(decompose-directory (procedure! decompose-directory (string) * * *))
-(decompose-pathname (procedure! decompose-pathname (string) * * *))
-(absolute-pathname? (procedure! absolute-pathname? (string) boolean))
-(pathname-directory (procedure! pathname-directory (string) *))
-(pathname-extension (procedure! pathname-extension (string) *))
-(pathname-file (procedure! pathname-file (string) *))
-(pathname-replace-directory (procedure! pathname-replace-directory (string string) string))
-(pathname-replace-extension (procedure! pathname-replace-extension (string string) string))
-(pathname-replace-file (procedure! pathname-replace-file (string string) string))
-(pathname-strip-directory (procedure! pathname-strip-directory (string) string))
-(pathname-strip-extension (procedure! pathname-strip-extension (string) string))
-(normalize-pathname (procedure! normalize-pathname (string #!optional symbol) string))
+(delete-file* (#(procedure #:enforce) delete-file* (string) *))
+(file-copy (#(procedure #:enforce) file-copy (string string #!optional * fixnum) fixnum))
+(file-move (#(procedure #:enforce) file-move (string string #!optional * fixnum) fixnum))
+(make-pathname (#(procedure #:enforce) make-pathname (* #!optional string string) string))
+(directory-null? (#(procedure #:enforce) directory-null? (string) boolean))
+(make-absolute-pathname (#(procedure #:enforce) make-absolute-pathname (* #!optional string string) string))
+(create-temporary-directory (#(procedure #:enforce) create-temporary-directory () string))
+(create-temporary-file (#(procedure #:enforce) create-temporary-file (#!optional string) string))
+(decompose-directory (#(procedure #:enforce) decompose-directory (string) * * *))
+(decompose-pathname (#(procedure #:enforce) decompose-pathname (string) * * *))
+(absolute-pathname? (#(procedure #:enforce) absolute-pathname? (string) boolean))
+(pathname-directory (#(procedure #:enforce) pathname-directory (string) *))
+(pathname-extension (#(procedure #:enforce) pathname-extension (string) *))
+(pathname-file (#(procedure #:enforce) pathname-file (string) *))
+(pathname-replace-directory (#(procedure #:enforce) pathname-replace-directory (string string) string))
+(pathname-replace-extension (#(procedure #:enforce) pathname-replace-extension (string string) string))
+(pathname-replace-file (#(procedure #:enforce) pathname-replace-file (string string) string))
+(pathname-strip-directory (#(procedure #:enforce) pathname-strip-directory (string) string))
+(pathname-strip-extension (#(procedure #:enforce) pathname-strip-extension (string) string))
+(normalize-pathname (#(procedure #:enforce) normalize-pathname (string #!optional symbol) string))
 
 
 ;; irregex
@@ -1216,75 +1213,75 @@
 (irregex (procedure irregex (#!rest) *))
 ;irregex-apply-match
 
-(irregex-dfa (procedure! irregex-dfa ((struct regexp)) *)
+(irregex-dfa (#(procedure #:enforce) irregex-dfa ((struct regexp)) *)
 	     (((struct regexp)) (##sys#slot #(1) '1)))
 
-(irregex-dfa/extract (procedure! irregex-dfa/extract ((struct regexp)) *)
+(irregex-dfa/extract (#(procedure #:enforce) irregex-dfa/extract ((struct regexp)) *)
 		     (((struct regexp)) (##sys#slot #(1) '3)))
 
-(irregex-dfa/search (procedure! irregex-dfa/search ((struct regexp)) *)
+(irregex-dfa/search (#(procedure #:enforce) irregex-dfa/search ((struct regexp)) *)
 		    (((struct regexp)) (##sys#slot #(1) '2)))
 
-(irregex-extract (procedure! irregex-extract (* string #!optional fixnum fixnum) list))
-(irregex-flags (procedure! irregex-flags ((struct regexp)) *)
+(irregex-extract (#(procedure #:enforce) irregex-extract (* string #!optional fixnum fixnum) list))
+(irregex-flags (#(procedure #:enforce) irregex-flags ((struct regexp)) *)
 	       (((struct regexp)) (##sys#slot #(1) '5)))
 
-(irregex-fold (procedure! irregex-fold (* (procedure (fixnum (struct regexp-match) *) *) * string #!optional (procedure (fixnum *) *) fixnum fixnum) *))
+(irregex-fold (#(procedure #:enforce) irregex-fold (* (procedure (fixnum (struct regexp-match) *) *) * string #!optional (procedure (fixnum *) *) fixnum fixnum) *))
 
-(irregex-fold/chunked (procedure! irregex-fold/chunked (* (procedure (* fixnum (struct regexp-match) *) *) * procedure * #!optional (procedure (* fixnum *) *) fixnum fixnum) *))
+(irregex-fold/chunked (#(procedure #:enforce) irregex-fold/chunked (* (procedure (* fixnum (struct regexp-match) *) *) * procedure * #!optional (procedure (* fixnum *) *) fixnum fixnum) *))
 
-(irregex-lengths (procedure! irregex-lengths ((struct regexp)) *)
+(irregex-lengths (#(procedure #:enforce) irregex-lengths ((struct regexp)) *)
 		 (((struct regexp)) (##sys#slot #(1) '7)))
 
-(irregex-match (procedure! irregex-match (* string) *))
+(irregex-match (#(procedure #:enforce) irregex-match (* string) *))
 ;irregex-match?
 
-(irregex-match-data? (procedure? (struct regexp-match) irregex-match-data? (*) boolean))
+(irregex-match-data? (#(procedure #:predicate (struct regexp-match)) irregex-match-data? (*) boolean))
 
 (irregex-match-end (procedure irregex-match-end (* #!optional *) *))
 ;irregex-match-end-chunk
-(irregex-match-end-index (procedure! irregex-match-end-index ((struct regexp-match) #!optional *) fixnum))
+(irregex-match-end-index (#(procedure #:enforce) irregex-match-end-index ((struct regexp-match) #!optional *) fixnum))
 
-(irregex-match-names (procedure! irregex-match-names ((struct regexp-match)) list)
+(irregex-match-names (#(procedure #:enforce) irregex-match-names ((struct regexp-match)) list)
 		     (((struct regexp-match)) (##sys#slot #(1) '2)))
 
-(irregex-match-num-submatches (procedure! irregex-match-num-submatches ((struct regexp-match)) fixnum))
+(irregex-match-num-submatches (#(procedure #:enforce) irregex-match-num-submatches ((struct regexp-match)) fixnum))
 (irregex-match-start (procedure irregex-match-start (* #!optional *) *))
 ;irregex-match-start-chunk
-(irregex-match-start-index (procedure! irregex-match-start-index ((struct regexp-match) #!optional *) fixnum))
+(irregex-match-start-index (#(procedure #:enforce) irregex-match-start-index ((struct regexp-match) #!optional *) fixnum))
 (irregex-match-string (procedure irregex-match-string (*) *))
-(irregex-match-subchunk (procedure! irregex-match-subchunk ((struct regexp-match) #!optional *) *))
+(irregex-match-subchunk (#(procedure #:enforce) irregex-match-subchunk ((struct regexp-match) #!optional *) *))
 (irregex-match-substring (procedure irregex-match-substring (* #!optional *) *))
-(irregex-match/chunked (procedure! irregex-match/chunked (* * * #!optional fixnum) *))
+(irregex-match/chunked (#(procedure #:enforce) irregex-match/chunked (* * * #!optional fixnum) *))
 
-(irregex-names (procedure! irregex-names ((struct regexp)) *)
+(irregex-names (#(procedure #:enforce) irregex-names ((struct regexp)) *)
 	       (((struct regexp)) (##sys#slot #(1) '8)))
 
 (irregex-new-matches (procedure irregex-new-matches (*) *))
 
-(irregex-nfa (procedure! irregex-nfa ((struct regexp)) *)
+(irregex-nfa (#(procedure #:enforce) irregex-nfa ((struct regexp)) *)
 	     (((struct regexp)) (##sys#slot #(1) '4)))
 
-(irregex-num-submatches (procedure! irregex-num-submatches ((struct regexp))
+(irregex-num-submatches (#(procedure #:enforce) irregex-num-submatches ((struct regexp))
 				   fixnum)
 			(((struct regexp)) (##sys#slot #(1) '6)))
 
-(irregex-opt (procedure! irregex-opt (list) *))
-(irregex-quote (procedure! irregex-quote (string) string))
-(irregex-replace (procedure! irregex-replace (* string #!rest) *))
-(irregex-replace/all (procedure! irregex-replace/all (* string #!rest) *))
+(irregex-opt (#(procedure #:enforce) irregex-opt (list) *))
+(irregex-quote (#(procedure #:enforce) irregex-quote (string) string))
+(irregex-replace (#(procedure #:enforce) irregex-replace (* string #!rest) *))
+(irregex-replace/all (#(procedure #:enforce) irregex-replace/all (* string #!rest) *))
 (irregex-reset-matches! (procedure irregex-reset-matches! (*) *))
-(irregex-search (procedure! irregex-search (* string #!optional fixnum fixnum) *))
-(irregex-search/matches (procedure! irregex-search/matches (* string fixnum fixnum *) *))
-(irregex-split (procedure! irregex-split (* string #!optional fixnum fixnum) list))
-(irregex-search/chunked (procedure! irregex-search/chunked (* procedure * #!optional fixnum fixnum *) *))
+(irregex-search (#(procedure #:enforce) irregex-search (* string #!optional fixnum fixnum) *))
+(irregex-search/matches (#(procedure #:enforce) irregex-search/matches (* string fixnum fixnum *) *))
+(irregex-split (#(procedure #:enforce) irregex-split (* string #!optional fixnum fixnum) list))
+(irregex-search/chunked (#(procedure #:enforce) irregex-search/chunked (* procedure * #!optional fixnum fixnum *) *))
 (irregex-match-valid-index? 
- (procedure! irregex-match-valid-index? ((struct regexp-match) *) boolean))
+ (#(procedure #:enforce) irregex-match-valid-index? ((struct regexp-match) *) boolean))
 
-(irregex? (procedure? (struct regexp) irregex? (*) boolean))
+(irregex? (#(procedure #:predicate (struct regexp)) irregex? (*) boolean))
 
 (make-irregex-chunker
- (procedure! make-irregex-chunker 
+ (#(procedure #:enforce) make-irregex-chunker 
 	    ((procedure (*) *)
 	     (procedure (*) *)
 	     #!optional
@@ -1295,13 +1292,13 @@
 	    *))
 (maybe-string->sre (procedure maybe-string->sre (*) *))
 (sre->irregex (procedure sre->irregex (#!rest) *))
-(string->irregex (procedure! string->irregex (string #!rest) *))
-(string->sre (procedure! string->sre (string #!rest) *))
+(string->irregex (#(procedure #:enforce) string->irregex (string #!rest) *))
+(string->sre (#(procedure #:enforce) string->sre (string #!rest) *))
 
 
 ;; lolevel
 
-(address->pointer (procedure! address->pointer (fixnum) pointer)
+(address->pointer (#(procedure #:enforce) address->pointer (fixnum) pointer)
 		  ((fixnum) (##sys#address->pointer #(1))))
 
 (align-to-word
@@ -1310,22 +1307,22 @@
   ((or number pointer locative procedure port)) 
   (or pointer number)))
 
-(allocate (procedure! allocate (fixnum) (or boolean pointer)))
-(block-ref (procedure! block-ref (* fixnum) *))
-(block-set! (procedure! block-set! (* fixnum *) *))
-(extend-procedure (procedure! extend-procedure (procedure *) procedure))
-(extended-procedure? (procedure extended-procedure? (*) boolean))
-(free (procedure! free (pointer) undefined))
-(locative->object (procedure! locative->object (locative) *))
-(locative-ref (procedure! locative-ref (locative) *))
-(locative-set! (procedure! locative-set! (locative *) *))
-(locative? (procedure? locative locative? (*) boolean))
-(make-locative (procedure! make-locative (* #!optional fixnum) locative))
-(make-pointer-vector (procedure! make-pointer-vector (fixnum #!optional pointer) pointer-vector))
+(allocate (#(procedure #:enforce) allocate (fixnum) (or boolean pointer)))
+(block-ref (#(procedure #:enforce) block-ref (* fixnum) *))
+(block-set! (#(procedure #:enforce) block-set! (* fixnum *) *))
+(extend-procedure (#(procedure #:enforce) extend-procedure (procedure *) procedure))
+(extended-procedure? (procedure extended-procedure (*) boolean))
+(free (#(procedure #:enforce) free (pointer) undefined))
+(locative->object (#(procedure #:enforce) locative->object (locative) *))
+(locative-ref (#(procedure #:enforce) locative-ref (locative) *))
+(locative-set! (#(procedure #:enforce) locative-set! (locative *) *))
+(locative? (#(procedure #:predicate locative) locative? (*) boolean))
+(make-locative (#(procedure #:enforce) make-locative (* #!optional fixnum) locative))
+(make-pointer-vector (#(procedure #:enforce) make-pointer-vector (fixnum #!optional pointer) pointer-vector))
 (make-record-instance (procedure make-record-instance (symbol #!rest) *))
-(make-weak-locative (procedure! make-weak-locative (* #!optional fixnum) locative))
+(make-weak-locative (#(procedure #:enforce) make-weak-locative (* #!optional fixnum) locative))
 
-(move-memory! (procedure! move-memory! (* * #!optional fixnum fixnum fixnum) *)
+(move-memory! (#(procedure #:enforce) move-memory! (* * #!optional fixnum fixnum fixnum) *)
 	      ((pointer pointer fixnum)
 	       (##core#inline "C_copy_ptr_memory" #(2) #(1) #(3) '0 '0))
 	      ((pointer pointer fixnum fixnum)
@@ -1340,7 +1337,7 @@
 	       (##core#inline "C_copy_ptr_memory" #(2) #(1) #(3) #(5) #(4))))
 
 (mutate-procedure!
- (procedure! mutate-procedure (procedure (procedure (procedure) . *)) procedure))
+ (#(procedure #:enforce) mutate-procedure! (procedure (procedure (procedure) . *)) procedure))
 
 (mutate-procedure (deprecated mutate-procedure!))
 (null-pointer deprecated)
@@ -1359,113 +1356,113 @@
 (object->pointer (procedure object->pointer (*) *))
 (object-become! (procedure object-become! (list) *))
 (object-copy (procedure object-copy (*) *))
-(object-evict (procedure! object-evict (* #!optional (procedure (fixnum) pointer)) *))
-(object-evict-to-location (procedure! object-evict-to-location (* (or pointer locative procedure port) #!optional fixnum) * pointer))
+(object-evict (#(procedure #:enforce) object-evict (* #!optional (procedure (fixnum) pointer)) *))
+(object-evict-to-location (#(procedure #:enforce) object-evict-to-location (* (or pointer locative procedure port) #!optional fixnum) * pointer))
 (object-evicted? (procedure object-evicted? (*) boolean))
-(object-release (procedure! object-release (* #!optional (procedure (pointer) *)) *))
+(object-release (#(procedure #:enforce) object-release (* #!optional (procedure (pointer) *)) *))
 (object-size (procedure object-size (*) fixnum))
 (object-unevict (procedure object-unevict (* #!optional *) *))
-(pointer+ (procedure! pointer+ ((or pointer procedure port locative) fixnum) pointer))
+(pointer+ (#(procedure #:enforce) pointer+ ((or pointer procedure port locative) fixnum) pointer))
 
-(pointer->address (procedure! pointer->address ((or pointer procedure port locative)) number)
+(pointer->address (#(procedure #:enforce) pointer->address ((or pointer procedure port locative)) number)
 		  ((pointer) (##sys#pointer->address #(1))))
 
-(pointer->object (procedure! pointer->object (pointer) *)
+(pointer->object (#(procedure #:enforce) pointer->object (pointer) *)
 		 ((pointer) (##core#inline "C_pointer_to_object" #(1))))
 
 (pointer-like? (procedure pointer-like? (*) boolean)
 	       (((or pointer locative procedure port)) (let ((#(tmp) #(1))) '#t)))
 
-(pointer-f32-ref (procedure! pointer-f32-ref (pointer) number))
-(pointer-f32-set! (procedure! pointer-f32-set! (pointer number) undefined))
-(pointer-f64-ref (procedure! pointer-f64-ref (pointer) number))
-(pointer-f64-set! (procedure! pointer-f64-set! (pointer number) undefined))
-(pointer-vector (procedure! pointer-vector (#!rest pointer-vector) boolean))
+(pointer-f32-ref (#(procedure #:enforce) pointer-f32-ref (pointer) number))
+(pointer-f32-set! (#(procedure #:enforce) pointer-f32-set! (pointer number) undefined))
+(pointer-f64-ref (#(procedure #:enforce) pointer-f64-ref (pointer) number))
+(pointer-f64-set! (#(procedure #:enforce) pointer-f64-set! (pointer number) undefined))
+(pointer-vector (#(procedure #:enforce) pointer-vector (#!rest pointer-vector) boolean))
 
-(pointer-vector? (procedure? pointer-vector pointer-vector? (*) boolean))
+(pointer-vector? (#(procedure #:predicate pointer-vector) pointer-vector? (*) boolean))
 
-(pointer-vector-fill! (procedure! pointer-vector-fill! (pointer-vector pointer) undefined))
+(pointer-vector-fill! (#(procedure #:enforce) pointer-vector-fill! (pointer-vector pointer) undefined))
 
-(pointer-vector-length (procedure! pointer-vector-length (pointer-vector) fixnum)
+(pointer-vector-length (#(procedure #:enforce) pointer-vector-length (pointer-vector) fixnum)
 		       ((pointer-vector) (##sys#slot #(1) '1)))
 
-(pointer-vector-ref (procedure! pointer-vector-ref (pointer-vector fixnum) pointer))
-(pointer-vector-set! (procedure! pointer-vector-set! (pointer-vector fixnum pointer) undefined))
-(pointer-s16-ref (procedure! pointer-s16-ref (pointer) fixnum))
-(pointer-s16-set! (procedure! pointer-s16-set! (pointer fixnum) undefined))
-(pointer-s32-ref (procedure! pointer-s32-ref (pointer) number))
-(pointer-s32-set! (procedure! pointer-s32-set! (pointer number) undefined))
-(pointer-s8-ref (procedure! pointer-s8-ref (pointer) fixnum))
-(pointer-s8-set! (procedure! pointer-s8-set! (pointer fixnum) undefined))
+(pointer-vector-ref (#(procedure #:enforce) pointer-vector-ref (pointer-vector fixnum) pointer))
+(pointer-vector-set! (#(procedure #:enforce) pointer-vector-set! (pointer-vector fixnum pointer) undefined))
+(pointer-s16-ref (#(procedure #:enforce) pointer-s16-ref (pointer) fixnum))
+(pointer-s16-set! (#(procedure #:enforce) pointer-s16-set! (pointer fixnum) undefined))
+(pointer-s32-ref (#(procedure #:enforce) pointer-s32-ref (pointer) number))
+(pointer-s32-set! (#(procedure #:enforce) pointer-s32-set! (pointer number) undefined))
+(pointer-s8-ref (#(procedure #:enforce) pointer-s8-ref (pointer) fixnum))
+(pointer-s8-set! (#(procedure #:enforce) pointer-s8-set! (pointer fixnum) undefined))
 
-(pointer-tag (procedure! pointer-tag ((or pointer locative procedure port)) (or boolean number))
+(pointer-tag (#(procedure #:enforce) pointer-tag ((or pointer locative procedure port)) (or boolean number))
 	     (((or locative procedure port)) (let ((#(tmp) #(1))) '#f)))
 
-(pointer-u16-ref (procedure! pointer-u16-ref (pointer) fixnum))
-(pointer-u16-set! (procedure! pointer-u16-set! (pointer fixnum) undefined))
-(pointer-u32-ref (procedure! pointer-u32-ref (pointer) number))
-(pointer-u32-set! (procedure! pointer-u32-set! (pointer number) undefined))
-(pointer-u8-ref (procedure! pointer-u8-ref (pointer) fixnum))
-(pointer-u8-set! (procedure! pointer-u8-set! (pointer fixnum) undefined))
+(pointer-u16-ref (#(procedure #:enforce) pointer-u16-ref (pointer) fixnum))
+(pointer-u16-set! (#(procedure #:enforce) pointer-u16-set! (pointer fixnum) undefined))
+(pointer-u32-ref (#(procedure #:enforce) pointer-u32-ref (pointer) number))
+(pointer-u32-set! (#(procedure #:enforce) pointer-u32-set! (pointer number) undefined))
+(pointer-u8-ref (#(procedure #:enforce) pointer-u8-ref (pointer) fixnum))
+(pointer-u8-set! (#(procedure #:enforce) pointer-u8-set! (pointer fixnum) undefined))
 
-(pointer=? (procedure! pointer=? ((or pointer locative procedure port)
+(pointer=? (#(procedure #:enforce) pointer=? ((or pointer locative procedure port)
 				  (or pointer locative procedure port)) boolean)
 	   ((pointer pointer) (##core#inline "C_pointer_eqp" #(1) #(2))))
 
-(pointer? (procedure? pointer pointer? (*) boolean))
+(pointer? (#(procedure #:predicate pointer) pointer? (*) boolean))
 
-(procedure-data (procedure! procedure-data (procedure) *))
+(procedure-data (#(procedure #:enforce) procedure-data (procedure) *))
 (record->vector (procedure record->vector (*) vector))
 (record-instance? (procedure record-instance? (*) boolean))
 (record-instance-length (procedure record-instance-length (*) fixnum))
-(record-instance-slot (procedure! record-instance-slot (* fixnum) *))
-(record-instance-slot-set! (procedure! record-instance-slot-set! (* fixnum *) undefined))
+(record-instance-slot (#(procedure #:enforce) record-instance-slot (* fixnum) *))
+(record-instance-slot-set! (#(procedure #:enforce) record-instance-slot-set! (* fixnum *) undefined))
 (record-instance-type (procedure record-instance-type (*) *))
-(set-procedure-data! (procedure! set-procedure-data! (procedure *) undefined))
-(tag-pointer (procedure! tag-pointer (pointer *) pointer))
-(tagged-pointer? (procedure! tagged-pointer? (* #!optional *) boolean))
+(set-procedure-data! (#(procedure #:enforce) set-procedure-data! (procedure *) undefined))
+(tag-pointer (#(procedure #:enforce) tag-pointer (pointer *) pointer))
+(tagged-pointer? (#(procedure #:enforce) tagged-pointer? (* #!optional *) boolean))
 
 
 ;; ports
 
-(call-with-input-string (procedure! call-with-input-string (string (procedure (port) . *)) . *))
-(call-with-output-string (procedure! call-with-output-string ((procedure (port) . *)) string))
-(copy-port (procedure! copy-port (* * #!optional (procedure (*) *) (procedure (* port) *)) undefined)) 
-(make-input-port (procedure! make-input-port ((procedure () char) (procedure () *) (procedure () . *) #!optional * * * *) port))
-(make-output-port (procedure! make-output-port ((procedure (string) . *) (procedure () . *) #!optional (procedure () . *)) port))
-(port-for-each (procedure! port-for-each ((procedure (*) *) (procedure () . *)) undefined))
+(call-with-input-string (#(procedure #:enforce) call-with-input-string (string (procedure (port) . *)) . *))
+(call-with-output-string (#(procedure #:enforce) call-with-output-string ((procedure (port) . *)) string))
+(copy-port (#(procedure #:enforce) copy-port (* * #!optional (procedure (*) *) (procedure (* port) *)) undefined)) 
+(make-input-port (#(procedure #:enforce) make-input-port ((procedure () char) (procedure () *) (procedure () . *) #!optional * * * *) port))
+(make-output-port (#(procedure #:enforce) make-output-port ((procedure (string) . *) (procedure () . *) #!optional (procedure () . *)) port))
+(port-for-each (#(procedure #:enforce) port-for-each ((procedure (*) *) (procedure () . *)) undefined))
 
 (port-map
- (forall (a b) (procedure! port-map ((procedure (a) b) (procedure () a)) (list b))))
+ (forall (a b) (#(procedure #:enforce) port-map ((procedure (a) b) (procedure () a)) (list b))))
 
-(port-fold (procedure! port-fold ((procedure (* *) *) * (procedure () *)) *))
-(make-broadcast-port (procedure! make-broadcast-port (#!rest port) port))
-(make-concatenated-port (procedure! make-concatenated-port (port #!rest port) port))
-(with-error-output-to-port (procedure! with-error-output-to-port (port (procedure () . *)) . *))
-(with-input-from-port (procedure! with-input-from-port (port (procedure () . *)) . *))
-(with-input-from-string (procedure! with-input-from-string (string (procedure () . *)) . *))
-(with-output-to-port (procedure! with-output-to-port (port (procedure () . *)) . *))
-(with-output-to-string (procedure! with-output-to-string ((procedure () . *)) . *))
+(port-fold (#(procedure #:enforce) port-fold ((procedure (* *) *) * (procedure () *)) *))
+(make-broadcast-port (#(procedure #:enforce) make-broadcast-port (#!rest port) port))
+(make-concatenated-port (#(procedure #:enforce) make-concatenated-port (port #!rest port) port))
+(with-error-output-to-port (#(procedure #:enforce) with-error-output-to-port (port (procedure () . *)) . *))
+(with-input-from-port (#(procedure #:enforce) with-input-from-port (port (procedure () . *)) . *))
+(with-input-from-string (#(procedure #:enforce) with-input-from-string (string (procedure () . *)) . *))
+(with-output-to-port (#(procedure #:enforce) with-output-to-port (port (procedure () . *)) . *))
+(with-output-to-string (#(procedure #:enforce) with-output-to-string ((procedure () . *)) . *))
 
 
 ;; posix
 
 (_exit (procedure _exit (fixnum) noreturn))
-(call-with-input-pipe (procedure! call-with-input-pipe (string (procedure (port) . *) #!optional symbol) . *))
-(call-with-output-pipe (procedure! call-with-output-pipe (string (procedure (port) . *) #!optional symbol) . *))
-(change-directory (procedure! change-directory (string) string))
-(change-file-mode (procedure! change-file-mode (string fixnum) undefined))
-(change-file-owner (procedure! change-file-owner (string fixnum fixnum) undefined))
-(close-input-pipe (procedure! close-input-pipe (port) fixnum))
-(close-output-pipe (procedure! close-output-pipe (port) fixnum))
-(create-directory (procedure! create-directory (string #!optional *) string))
-(create-fifo (procedure! create-fifo (string #!optional fixnum) undefined))
+(call-with-input-pipe (#(procedure #:enforce) call-with-input-pipe (string (procedure (port) . *) #!optional symbol) . *))
+(call-with-output-pipe (#(procedure #:enforce) call-with-output-pipe (string (procedure (port) . *) #!optional symbol) . *))
+(change-directory (#(procedure #:enforce) change-directory (string) string))
+(change-file-mode (#(procedure #:enforce) change-file-mode (string fixnum) undefined))
+(change-file-owner (#(procedure #:enforce) change-file-owner (string fixnum fixnum) undefined))
+(close-input-pipe (#(procedure #:enforce) close-input-pipe (port) fixnum))
+(close-output-pipe (#(procedure #:enforce) close-output-pipe (port) fixnum))
+(create-directory (#(procedure #:enforce) create-directory (string #!optional *) string))
+(create-fifo (#(procedure #:enforce) create-fifo (string #!optional fixnum) undefined))
 (create-pipe (procedure create-pipe () fixnum fixnum))
 (create-session (procedure create-session () fixnum))
-(create-symbolic-link (procedure! create-symbolic-link (string string) undefined))
+(create-symbolic-link (#(procedure #:enforce) create-symbolic-link (string string) undefined))
 
 ;; extra arg for "parameterize" - ugh, what a hack...
-(current-directory (procedure! current-directory (#!optional string *) string))
+(current-directory (#(procedure #:enforce) current-directory (#!optional string *) string))
 
 (current-effective-group-id (procedure current-effective-group-id () fixnum))
 (current-effective-user-id (procedure current-effective-user-id () fixnum))
@@ -1476,10 +1473,10 @@
 (current-process-id (procedure current-process-id () fixnum))
 (current-user-id (procedure current-user-id () fixnum))
 (current-user-name (procedure current-user-name () string))
-(delete-directory (procedure! delete-directory (string) string))
-(directory (procedure! directory (string #!optional *) (list string)))
-(directory? (procedure! directory? ((or string fixnum)) boolean))
-(duplicate-fileno (procedure! duplicate-fileno (fixnum #!optional fixnum) fixnum))
+(delete-directory (#(procedure #:enforce) delete-directory (string) string))
+(directory (#(procedure #:enforce) directory (string #!optional *) (list string)))
+(directory? (#(procedure #:enforce) directory? ((or string fixnum)) boolean))
+(duplicate-fileno (#(procedure #:enforce) duplicate-fileno (fixnum #!optional fixnum) fixnum))
 (errno/2big fixnum)
 (errno/acces fixnum)
 (errno/again fixnum)
@@ -1524,55 +1521,55 @@
 (fcntl/getfl fixnum)
 (fcntl/setfd fixnum)
 (fcntl/setfl fixnum)
-(file-access-time (procedure! file-access-time ((or string fixnum)) number))
-(file-change-time (procedure! file-change-time ((or string fixnum)) number))
-(file-close (procedure! file-close (fixnum) undefined))
-(file-control (procedure! file-control (fixnum fixnum #!optional fixnum) fixnum))
-(file-creation-mode (procedure! file-creation-mode (#!optional fixnum) fixnum))
-(file-execute-access? (procedure! file-execute-access? (string) boolean))
-(file-link (procedure! file-link (string string) undefined))
-(file-lock (procedure! file-lock (port #!optional fixnum *) (struct lock)))
-(file-lock/blocking (procedure! file-lock/blocking (port #!optional fixnum *) (struct lock)))
-(file-mkstemp (procedure! file-mkstemp (string) fixnum string))
-(file-modification-time (procedure! file-modification-time ((or string fixnum)) number))
-(file-open (procedure! file-open (string fixnum #!optional fixnum) fixnum))
-(file-owner (procedure! file-owner ((or string fixnum)) fixnum))
-(file-permissions (procedure! file-permissions ((or string fixnum)) fixnum))
-(file-position (procedure! file-position ((or port fixnum)) fixnum))
-(file-read (procedure! file-read (fixnum fixnum #!optional *) list))
-(file-read-access? (procedure! file-read-access? (string) boolean))
-(file-select (procedure! file-select ((list fixnum) (list fixnum) #!optional fixnum) * *))
-(file-size (procedure! file-size ((or string fixnum)) number))
-(file-stat (procedure! file-stat ((or string fixnum) #!optional *) (vector number)))
-(file-test-lock (procedure! file-test-lock (port #!optional fixnum *) boolean))
-(file-truncate (procedure! file-truncate ((or string fixnum) fixnum) undefined))
-(file-type (procedure! ((or string fixnum) #!optional * *) symbol))
-(file-unlock (procedure! file-unlock ((struct lock)) undefined))
-(file-write (procedure! file-write (fixnum * #!optional fixnum) fixnum))
-(file-write-access? (procedure! file-write-access? (string) boolean))
+(file-access-time (#(procedure #:enforce) file-access-time ((or string fixnum)) number))
+(file-change-time (#(procedure #:enforce) file-change-time ((or string fixnum)) number))
+(file-close (#(procedure #:enforce) file-close (fixnum) undefined))
+(file-control (#(procedure #:enforce) file-control (fixnum fixnum #!optional fixnum) fixnum))
+(file-creation-mode (#(procedure #:enforce) file-creation-mode (#!optional fixnum) fixnum))
+(file-execute-access? (#(procedure #:enforce) file-execute-access? (string) boolean))
+(file-link (#(procedure #:enforce) file-link (string string) undefined))
+(file-lock (#(procedure #:enforce) file-lock (port #!optional fixnum *) (struct lock)))
+(file-lock/blocking (#(procedure #:enforce) file-lock/blocking (port #!optional fixnum *) (struct lock)))
+(file-mkstemp (#(procedure #:enforce) file-mkstemp (string) fixnum string))
+(file-modification-time (#(procedure #:enforce) file-modification-time ((or string fixnum)) number))
+(file-open (#(procedure #:enforce) file-open (string fixnum #!optional fixnum) fixnum))
+(file-owner (#(procedure #:enforce) file-owner ((or string fixnum)) fixnum))
+(file-permissions (#(procedure #:enforce) file-permissions ((or string fixnum)) fixnum))
+(file-position (#(procedure #:enforce) file-position ((or port fixnum)) fixnum))
+(file-read (#(procedure #:enforce) file-read (fixnum fixnum #!optional *) list))
+(file-read-access? (#(procedure #:enforce) file-read-access? (string) boolean))
+(file-select (#(procedure #:enforce) file-select ((list fixnum) (list fixnum) #!optional fixnum) * *))
+(file-size (#(procedure #:enforce) file-size ((or string fixnum)) number))
+(file-stat (#(procedure #:enforce) file-stat ((or string fixnum) #!optional *) (vector number)))
+(file-test-lock (#(procedure #:enforce) file-test-lock (port #!optional fixnum *) boolean))
+(file-truncate (#(procedure #:enforce) file-truncate ((or string fixnum) fixnum) undefined))
+(file-type (#(procedure #:enforce) ((or string fixnum) #!optional * *) symbol))
+(file-unlock (#(procedure #:enforce) file-unlock ((struct lock)) undefined))
+(file-write (#(procedure #:enforce) file-write (fixnum * #!optional fixnum) fixnum))
+(file-write-access? (#(procedure #:enforce) file-write-access? (string) boolean))
 (fileno/stderr fixnum)
 (fileno/stdin fixnum)
 (fileno/stdout fixnum)
-(find-files (procedure! find-files (string #!rest) list))
+(find-files (#(procedure #:enforce) find-files (string #!rest) list))
 (get-groups (procedure get-groups () list))
 (get-host-name (procedure get-host-name () string))
-(glob (procedure! glob (#!rest string) list))
-(group-information (procedure! group-information (fixnum #!optional *) *))
-(initialize-groups (procedure! initialize-groups (string fixnum) undefined))
-(local-time->seconds (procedure! local-time->seconds ((vector number)) number))
+(glob (#(procedure #:enforce) glob (#!rest string) list))
+(group-information (#(procedure #:enforce) group-information (fixnum #!optional *) *))
+(initialize-groups (#(procedure #:enforce) initialize-groups (string fixnum) undefined))
+(local-time->seconds (#(procedure #:enforce) local-time->seconds ((vector number)) number))
 (local-timezone-abbreviation (procedure local-timezone-abbreviation () string))
-(map-file-to-memory (procedure! map-file-to-memory (* fixnum fixnum fixnum fixnum #!optional fixnum) (struct mmap)))
+(map-file-to-memory (#(procedure #:enforce) map-file-to-memory (* fixnum fixnum fixnum fixnum #!optional fixnum) (struct mmap)))
 (map/anonymous fixnum)
 (map/file fixnum)
 (map/fixed fixnum)
 (map/private fixnum)
 (map/shared fixnum)
-(memory-mapped-file-pointer (procedure! memory-mapped-file-pointer ((struct mmap)) pointer))
+(memory-mapped-file-pointer (#(procedure #:enforce) memory-mapped-file-pointer ((struct mmap)) pointer))
 (memory-mapped-file? (procedure memory-mapped-file? (*) boolean))
-(open-input-file* (procedure! open-input-file* (fixnum #!optional symbol) port))
-(open-input-pipe (procedure! open-input-pipe (string #!optional symbol) port))
-(open-output-file* (procedure! open-output-file* (fixnum #!optional symbol) port))
-(open-output-pipe (procedure! open-output-pipe (string #!optional symbol) port))
+(open-input-file* (#(procedure #:enforce) open-input-file* (fixnum #!optional symbol) port))
+(open-input-pipe (#(procedure #:enforce) open-input-pipe (string #!optional symbol) port))
+(open-output-file* (#(procedure #:enforce) open-output-file* (fixnum #!optional symbol) port))
+(open-output-pipe (#(procedure #:enforce) open-output-pipe (string #!optional symbol) port))
 (open/append fixnum)
 (open/binary fixnum)
 (open/creat fixnum)
@@ -1605,43 +1602,43 @@
 (perm/ixoth fixnum)
 (perm/ixusr fixnum)
 (pipe/buf fixnum)
-(port->fileno (procedure! port->fileno (port) fixnum))
-(process (procedure! process (string #!optional (list string) (list string)) port port fixnum))
-(process* (procedure! process* (string #!optional (list string) (list string)) port port fixnum *))
+(port->fileno (#(procedure #:enforce) port->fileno (port) fixnum))
+(process (#(procedure #:enforce) process (string #!optional (list string) (list string)) port port fixnum))
+(process* (#(procedure #:enforce) process* (string #!optional (list string) (list string)) port port fixnum *))
 
 (process-execute
- (procedure! process-execute (string #!optional (list string) (list string)) noreturn))
+ (#(procedure #:enforce) process-execute (string #!optional (list string) (list string)) noreturn))
 
-(process-fork (procedure! process-fork (#!optional (procedure () . *)) fixnum))
-(process-group-id (procedure! process-group-id () fixnum))
-(process-run (procedure! process-run (string #!optional (list string)) fixnum))
-(process-signal (procedure! process-signal (fixnum #!optional fixnum) undefined))
-(process-wait (procedure! process-wait (fixnum #!optional *) fixnum fixnum fixnum))
+(process-fork (#(procedure #:enforce) process-fork (#!optional (procedure () . *)) fixnum))
+(process-group-id (#(procedure #:enforce) process-group-id () fixnum))
+(process-run (#(procedure #:enforce) process-run (string #!optional (list string)) fixnum))
+(process-signal (#(procedure #:enforce) process-signal (fixnum #!optional fixnum) undefined))
+(process-wait (#(procedure #:enforce) process-wait (fixnum #!optional *) fixnum fixnum fixnum))
 (prot/exec fixnum)
 (prot/none fixnum)
 (prot/read fixnum)
 (prot/write fixnum)
-(read-symbolic-link (procedure! read-symbolic-link (string) string))
-(regular-file? (procedure! regular-file? ((or string fixnum)) boolean))
-(seconds->local-time (procedure! seconds->local-time (#!optional number) (vector number)))
-(seconds->string (procedure! seconds->string (#!optional number) string))
-(seconds->utc-time (procedure! seconds->utc-time (#!optional number) (vector number)))
+(read-symbolic-link (#(procedure #:enforce) read-symbolic-link (string) string))
+(regular-file? (#(procedure #:enforce) regular-file? ((or string fixnum)) boolean))
+(seconds->local-time (#(procedure #:enforce) seconds->local-time (#!optional number) (vector number)))
+(seconds->string (#(procedure #:enforce) seconds->string (#!optional number) string))
+(seconds->utc-time (#(procedure #:enforce) seconds->utc-time (#!optional number) (vector number)))
 (seek/cur fixnum)
 (seek/end fixnum)
 (seek/set fixnum)
-(set-alarm! (procedure! set-alarm! (number) number))
-(set-buffering-mode! (procedure! set-buffering-mode! (port symbol #!optional fixnum) undefined))
-(set-file-position! (procedure! set-file-position! ((or port fixnum) fixnum #!optional fixnum) undefined))
-(set-groups! (procedure! set-groups! (list) undefined))
-(set-root-directory! (procedure! set-root-directory! (string) undefined))
-(set-signal-handler! (procedure! set-signal-handler! (fixnum (procedure (fixnum) . *)) undefined))
-(set-signal-mask! (procedure! set-signal-mask! ((list fixnum)) undefined))
-(setenv (procedure! setenv (string string) undefined))
-(signal-handler (procedure! signal-handler (fixnum) (procedure (fixnum) . *)))
+(set-alarm! (#(procedure #:enforce) set-alarm! (number) number))
+(set-buffering-mode! (#(procedure #:enforce) set-buffering-mode! (port symbol #!optional fixnum) undefined))
+(set-file-position! (#(procedure #:enforce) set-file-position! ((or port fixnum) fixnum #!optional fixnum) undefined))
+(set-groups! (#(procedure #:enforce) set-groups! (list) undefined))
+(set-root-directory! (#(procedure #:enforce) set-root-directory! (string) undefined))
+(set-signal-handler! (#(procedure #:enforce) set-signal-handler! (fixnum (procedure (fixnum) . *)) undefined))
+(set-signal-mask! (#(procedure #:enforce) set-signal-mask! ((list fixnum)) undefined))
+(setenv (#(procedure #:enforce) setenv (string string) undefined))
+(signal-handler (#(procedure #:enforce) signal-handler (fixnum) (procedure (fixnum) . *)))
 (signal-mask (procedure signal-mask () fixnum))
-(signal-mask! (procedure! signal-mask! (fixnum) undefined))
-(signal-masked? (procedure! signal-masked? (fixnum) boolean))
-(signal-unmask! (procedure! signal-unmask! (fixnum) undefined))
+(signal-mask! (#(procedure #:enforce) signal-mask! (fixnum) undefined))
+(signal-masked? (#(procedure #:enforce) signal-masked? (fixnum) boolean))
+(signal-unmask! (#(procedure #:enforce) signal-unmask! (fixnum) undefined))
 (signal/abrt fixnum)
 (signal/alrm fixnum)
 (signal/chld fixnum)
@@ -1668,395 +1665,395 @@
 (signal/xcpu fixnum)
 (signal/xfsz fixnum)
 (signals-list list)
-(sleep (procedure! sleep (fixnum) fixnum))
-(block-device? (procedure! block-device? ((or string fixnum)) boolean))
-(character-device? (procedure! character-device? ((or string fixnum)) boolean))
-(fifo? (procedure! fifo? ((or string fixnum)) boolean))
-(socket? (procedure! socket? ((or string fixnum)) boolean))
-(string->time (procedure! string->time (string #!optional string) vector))
-(symbolic-link? (procedure! symbolic-link? ((or string fixnum)) boolean))
+(sleep (#(procedure #:enforce) sleep (fixnum) fixnum))
+(block-device? (#(procedure #:enforce) block-device? ((or string fixnum)) boolean))
+(character-device? (#(procedure #:enforce) character-device? ((or string fixnum)) boolean))
+(fifo? (#(procedure #:enforce) fifo? ((or string fixnum)) boolean))
+(socket? (#(procedure #:enforce) socket? ((or string fixnum)) boolean))
+(string->time (#(procedure #:enforce) string->time (string #!optional string) vector))
+(symbolic-link? (#(procedure #:enforce) symbolic-link? ((or string fixnum)) boolean))
 (system-information (procedure system-information () list))
-(terminal-name (procedure! terminal-name (port) string))
-(terminal-port? (procedure! terminal-port? (port) boolean))
-(terminal-size (procedure! terminal-size (port) fixnum fixnum))
-(time->string (procedure! time->string (vector #!optional string) string))
-(unmap-file-from-memory (procedure! unmap-file-from-memory ((struct mmap) #!optional fixnum) undefined))
-(unsetenv (procedure! unsetenv (string) undefined))
-(user-information (procedure! user-information ((or string fixnum) #!optional *) *))
-(utc-time->seconds (procedure! utc-time->seconds ((vector number)) number))
-(with-input-from-pipe (procedure! with-input-from-pipe (string (procedure () . *) #!optional symbol) . *))
-(with-output-to-pipe (procedure! with-output-to-pipe (string (procedure () . *) #!optional symbol) . *))
+(terminal-name (#(procedure #:enforce) terminal-name (port) string))
+(terminal-port? (#(procedure #:enforce) terminal-port? (port) boolean))
+(terminal-size (#(procedure #:enforce) terminal-size (port) fixnum fixnum))
+(time->string (#(procedure #:enforce) time->string (vector #!optional string) string))
+(unmap-file-from-memory (#(procedure #:enforce) unmap-file-from-memory ((struct mmap) #!optional fixnum) undefined))
+(unsetenv (#(procedure #:enforce) unsetenv (string) undefined))
+(user-information (#(procedure #:enforce) user-information ((or string fixnum) #!optional *) *))
+(utc-time->seconds (#(procedure #:enforce) utc-time->seconds ((vector number)) number))
+(with-input-from-pipe (#(procedure #:enforce) with-input-from-pipe (string (procedure () . *) #!optional symbol) . *))
+(with-output-to-pipe (#(procedure #:enforce) with-output-to-pipe (string (procedure () . *) #!optional symbol) . *))
 
 
 ;; srfi-1
 
 (alist-cons (forall (a b c) (procedure alist-cons (a b (list c)) (pair a (pair b (list c))))))
-(alist-copy (forall (a) (procedure! alist-copy ((list a)) (list a))))
-(alist-delete (forall (a b) (procedure! alist-delete (a (list b) #!optional (procedure (a b) *)) list)))
-(alist-delete! (forall (a b) (procedure! alist-delete! (a (list b) #!optional (procedure (a b) *)) undefined)))
-(any (forall (a) (procedure! any ((procedure (a #!rest) *) (list a) #!rest list) *)))
-(append! (procedure! append! (#!rest list) list))
+(alist-copy (forall (a) (#(procedure #:enforce) alist-copy ((list a)) (list a))))
+(alist-delete (forall (a b) (#(procedure #:enforce) alist-delete (a (list b) #!optional (procedure (a b) *)) list)))
+(alist-delete! (forall (a b) (#(procedure #:enforce) alist-delete! (a (list b) #!optional (procedure (a b) *)) undefined)))
+(any (forall (a) (#(procedure #:enforce) any ((procedure (a #!rest) *) (list a) #!rest list) *)))
+(append! (#(procedure #:enforce) append! (#!rest list) list))
 
 (append-map
- (forall (a b) (procedure! append-map ((procedure (a #!rest) (list b)) (list a) #!rest list)
+ (forall (a b) (#(procedure #:enforce) append-map ((procedure (a #!rest) (list b)) (list a) #!rest list)
 			   (list b))))
 
 (append-map!
- (forall (a b) (procedure! append-map! ((procedure (a #!rest) (list b)) (list a) #!rest list)
+ (forall (a b) (#(procedure #:enforce) append-map! ((procedure (a #!rest) (list b)) (list a) #!rest list)
 			   (list b))))
 
-(append-reverse (procedure! append-reverse (list list) list))
-(append-reverse! (procedure! append-reverse! (list list) list))
-(break (forall (a) (procedure! break ((procedure (a) *) (list a)) (list a) (list a))))
-(break! (forall (a) (procedure! break! ((procedure (a) *) (list a)) (list a) (list a))))
-(car+cdr (forall (a b) (procedure! car+cdr ((pair a b)) a b)))
+(append-reverse (#(procedure #:enforce) append-reverse (list list) list))
+(append-reverse! (#(procedure #:enforce) append-reverse! (list list) list))
+(break (forall (a) (#(procedure #:enforce) break ((procedure (a) *) (list a)) (list a) (list a))))
+(break! (forall (a) (#(procedure #:enforce) break! ((procedure (a) *) (list a)) (list a) (list a))))
+(car+cdr (forall (a b) (#(procedure #:enforce) car+cdr ((pair a b)) a b)))
 (circular-list (procedure circular-list (#!rest) list))
 
 (circular-list? (procedure circular-list? (*) boolean)
 		((null) (let ((#(tmp) #(1))) '#f)))
 
-(concatenate (procedure! concatenate ((list list)) list))
-(concatenate! (procedure! concatenate! ((list list)) list))
+(concatenate (#(procedure #:enforce) concatenate ((list list)) list))
+(concatenate! (#(procedure #:enforce) concatenate! ((list list)) list))
 (cons* (forall (a) (procedure cons* (a #!rest) (pair a *))))
-(count (forall (a) (procedure! count ((procedure (a #!rest) *) (list a) #!rest list) fixnum)))
-(delete (forall (a b) (procedure! delete (a (list b) #!optional (procedure (a *) *)) (list b))))
-(delete! (forall (a b) (procedure! delete! (a (list b) #!optional (procedure (a *) *)) (list b))))
+(count (forall (a) (#(procedure #:enforce) count ((procedure (a #!rest) *) (list a) #!rest list) fixnum)))
+(delete (forall (a b) (#(procedure #:enforce) delete (a (list b) #!optional (procedure (a *) *)) (list b))))
+(delete! (forall (a b) (#(procedure #:enforce) delete! (a (list b) #!optional (procedure (a *) *)) (list b))))
 
 (delete-duplicates
- (forall (a) (procedure! delete-duplicates ((list a) #!optional (procedure (a *) *)) (list a))))
+ (forall (a) (#(procedure #:enforce) delete-duplicates ((list a) #!optional (procedure (a *) *)) (list a))))
 
 (delete-duplicates!
- (forall (a) (procedure! delete-duplicates! ((list a) #!optional (procedure (a *) *)) (list a))))
+ (forall (a) (#(procedure #:enforce) delete-duplicates! ((list a) #!optional (procedure (a *) *)) (list a))))
 
 (dotted-list? (procedure dotted-list? (*) boolean))
-(drop (forall (a) (procedure! drop ((list a) fixnum) (list a))))
-(drop-right (forall (a) (procedure! drop-right ((list a) fixnum) (list a))))
-(drop-right! (forall (a) (procedure! drop-right! ((list a) fixnum) (list a))))
-(drop-while (forall (a) (procedure! drop-while ((procedure (a) *) (list a)) (list a))))
-(eighth (procedure! eighth (pair) *))
+(drop (forall (a) (#(procedure #:enforce) drop ((list a) fixnum) (list a))))
+(drop-right (forall (a) (#(procedure #:enforce) drop-right ((list a) fixnum) (list a))))
+(drop-right! (forall (a) (#(procedure #:enforce) drop-right! ((list a) fixnum) (list a))))
+(drop-while (forall (a) (#(procedure #:enforce) drop-while ((procedure (a) *) (list a)) (list a))))
+(eighth (#(procedure #:enforce) eighth (pair) *))
 
 (every
- (forall (a) (procedure! every ((procedure (a #!rest) *) (list a) #!rest list) *)))
+ (forall (a) (#(procedure #:enforce) every ((procedure (a #!rest) *) (list a) #!rest list) *)))
 
-(fifth (procedure! fifth (pair) *))
-(filter (forall (a) (procedure! filter ((procedure (a) *) (list a)) (list a))))
-(filter! (forall (a) (procedure! filter! ((procedure (a) *) (list a)) (list a))))
+(fifth (#(procedure #:enforce) fifth (pair) *))
+(filter (forall (a) (#(procedure #:enforce) filter ((procedure (a) *) (list a)) (list a))))
+(filter! (forall (a) (#(procedure #:enforce) filter! ((procedure (a) *) (list a)) (list a))))
 
 (filter-map
- (forall (a b) (procedure! filter-map ((procedure (a #!rest) b) (list a) #!rest list) (list b))))
+ (forall (a b) (#(procedure #:enforce) filter-map ((procedure (a #!rest) b) (list a) #!rest list) (list b))))
 
-(find (forall (a) (procedure! find ((procedure (a) *) (list a)) *)))
-(find-tail (forall (a) (procedure! find-tail ((procedure (a) *) (list a)) *)))
+(find (forall (a) (#(procedure #:enforce) find ((procedure (a) *) (list a)) *)))
+(find-tail (forall (a) (#(procedure #:enforce) find-tail ((procedure (a) *) (list a)) *)))
 
-(first (forall (a) (procedure! first ((pair a *)) a))
+(first (forall (a) (#(procedure #:enforce) first ((pair a *)) a))
        ((pair) (##core#inline "C_u_i_car" #(1))))
 
-(fold (procedure! fold ((procedure (* #!rest) *) * #!rest list) *)) ;XXX
-(fold-right (procedure! fold-right ((procedure (* #!rest) *) * #!rest list) *)) ;XXX
+(fold (#(procedure #:enforce) fold ((procedure (* #!rest) *) * #!rest list) *)) ;XXX
+(fold-right (#(procedure #:enforce) fold-right ((procedure (* #!rest) *) * #!rest list) *)) ;XXX
 
-(fourth (forall (a) (procedure! fourth ((pair * (pair * (pair * (pair a *))))) a))
+(fourth (forall (a) (#(procedure #:enforce) fourth ((pair * (pair * (pair * (pair a *))))) a))
 	(((pair * (pair * (pair * (pair * *)))))
 	 (##core#inline "C_u_i_car" 
 			(##core#inline "C_u_i_cdr"
 				       (##core#inline "C_u_i_cdr"
 						      (##core#inline "C_u_i_cdr" #(1)))))))
 
-(iota (procedure! iota (fixnum #!optional fixnum fixnum) (list number)))
-(last (procedure! last (pair) *))
-(last-pair (procedure! last-pair (pair) *))
-(length+ (procedure! length+ (list) *))
-(list-copy (forall (a) (procedure! list-copy ((list a)) (list a))))
-(list-index (forall (a) (procedure! list-index ((procedure (a #!rest) *) (list a) #!rest list) *)))
-(list-tabulate (forall (a) (procedure! list-tabulate (fixnum (procedure (fixnum) a)) (list a))))
-(list= (procedure! list= (#!rest list) boolean))
+(iota (#(procedure #:enforce) iota (fixnum #!optional fixnum fixnum) (list number)))
+(last (#(procedure #:enforce) last (pair) *))
+(last-pair (#(procedure #:enforce) last-pair (pair) *))
+(length+ (#(procedure #:enforce) length+ (list) *))
+(list-copy (forall (a) (#(procedure #:enforce) list-copy ((list a)) (list a))))
+(list-index (forall (a) (#(procedure #:enforce) list-index ((procedure (a #!rest) *) (list a) #!rest list) *)))
+(list-tabulate (forall (a) (#(procedure #:enforce) list-tabulate (fixnum (procedure (fixnum) a)) (list a))))
+(list= (#(procedure #:enforce) list= (#!rest list) boolean))
 
 (lset-adjoin 
- (forall (a) (procedure! lset-adjoin ((procedure (a a) *) (list a) #!rest a) (list a))))
+ (forall (a) (#(procedure #:enforce) lset-adjoin ((procedure (a a) *) (list a) #!rest a) (list a))))
 
 (lset-diff+intersection
  (forall (a)
-	 (procedure! lset-diff+intersection ((procedure (a a) *) (list a) #!rest (list a))
+	 (#(procedure #:enforce) lset-diff+intersection ((procedure (a a) *) (list a) #!rest (list a))
 		     (list a))))
 
 (lset-diff+intersection! 
  (forall (a)
-	 (procedure! lset-diff+intersection! ((procedure (a a) *) (list a) #!rest (list a))
+	 (#(procedure #:enforce) lset-diff+intersection! ((procedure (a a) *) (list a) #!rest (list a))
 		     (list a))))
 
 (lset-difference
- (forall (a) (procedure! lset-difference ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
+ (forall (a) (#(procedure #:enforce) lset-difference ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
 
 (lset-difference!
- (forall (a) (procedure! lset-difference! ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
+ (forall (a) (#(procedure #:enforce) lset-difference! ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
 
 (lset-intersection
- (forall (a) (procedure! lset-intersection ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
+ (forall (a) (#(procedure #:enforce) lset-intersection ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
 
 (lset-intersection!
- (forall (a) (procedure! lset-intersection! ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
+ (forall (a) (#(procedure #:enforce) lset-intersection! ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
 
 (lset-union
- (forall (a) (procedure! lset-union ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
+ (forall (a) (#(procedure #:enforce) lset-union ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
 
 (lset-union!
- (forall (a) (procedure! lset-union! ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
+ (forall (a) (#(procedure #:enforce) lset-union! ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
 
 (lset-xor
- (forall (a) (procedure! lset-xor ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
+ (forall (a) (#(procedure #:enforce) lset-xor ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
 
 (lset-xor!
- (forall (a) (procedure! lset-xor! ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
+ (forall (a) (#(procedure #:enforce) lset-xor! ((procedure (a a) *) (list a) #!rest (list a)) (list a))))
 
 (lset<=
- (forall (a) (procedure! lset<= ((procedure (a a) *) (list a) #!rest (list a)) boolean)))
+ (forall (a) (#(procedure #:enforce) lset<= ((procedure (a a) *) (list a) #!rest (list a)) boolean)))
 
 (lset=
- (forall (a) (procedure! lset= ((procedure (a a) *) (list a) #!rest (list a)) boolean)))
+ (forall (a) (#(procedure #:enforce) lset= ((procedure (a a) *) (list a) #!rest (list a)) boolean)))
 
 ;; see note about "make-vector", above
-(make-list (forall (a) (procedure! make-list (fixnum #!optional a) list)))
+(make-list (forall (a) (#(procedure #:enforce) make-list (fixnum #!optional a) list)))
 
 (map!
- (forall (a b) (procedure! map! ((procedure (a #!rest) b) (list a) #!rest list) (list b))))
+ (forall (a b) (#(procedure #:enforce) map! ((procedure (a #!rest) b) (list a) #!rest list) (list b))))
 
 (map-in-order
  (forall 
   (a b)
-  (procedure! map-in-order ((procedure (a #!rest) b) (list a) #!rest list) (list b))))
+  (#(procedure #:enforce) map-in-order ((procedure (a #!rest) b) (list a) #!rest list) (list b))))
 
-(ninth (procedure! ninth (pair) *))
+(ninth (#(procedure #:enforce) ninth (pair) *))
 
 (not-pair? (procedure not-pair? (*) boolean)
 	   ((pair) (let ((#(tmp) #(1))) '#f))
 	   (((not (or pair list))) (let ((#(tmp) #(1))) '#t)))
 
-(null-list? (procedure! null-list? (list) boolean)
+(null-list? (#(procedure #:enforce) null-list? (list) boolean)
 	    ((pair) (let ((#(tmp) #(1))) '#f))
 	    ((list) (let ((#(tmp) #(1))) '#f))
 	    ((null) (let ((#(tmp) #(1))) '#t)))
 
-(pair-fold (procedure! pair-fold (procedure * list #!rest list) *)) ;XXX do this
-(pair-fold-right (procedure! pair-fold-right (procedure * list #!rest list) *)) ;XXX
-(pair-for-each (procedure! pair-for-each ((procedure (#!rest) . *) list #!rest list) undefined)) ;XXX
-(partition (forall (a) (procedure! partition ((procedure (a) *) (list a)) (list a) (list a))))
-(partition! (forall (a) (procedure! partition! ((procedure (a) *) (list a)) (list a) (list a))))
+(pair-fold (#(procedure #:enforce) pair-fold (procedure * list #!rest list) *)) ;XXX do this
+(pair-fold-right (#(procedure #:enforce) pair-fold-right (procedure * list #!rest list) *)) ;XXX
+(pair-for-each (#(procedure #:enforce) pair-for-each ((procedure (#!rest) . *) list #!rest list) undefined)) ;XXX
+(partition (forall (a) (#(procedure #:enforce) partition ((procedure (a) *) (list a)) (list a) (list a))))
+(partition! (forall (a) (#(procedure #:enforce) partition! ((procedure (a) *) (list a)) (list a) (list a))))
 
 (proper-list? (procedure proper-list? (*) boolean)
 	      ((null) (let ((#(tmp) #(1))) '#t)))
 
-(reduce (procedure! reduce ((procedure (* *) *) * list) *)) ;XXX
-(reduce-right (procedure! reduce-right ((procedure (* *) *) * list) *)) ;XXX
-(remove (forall (a) (procedure! remove ((procedure (a) *) (list a)) (list a))))
-(remove! (forall (a) (procedure! remove! ((procedure (a) *) (list a)) (list a))))
-(reverse! (forall (a) (procedure! reverse! ((list a)) (list a))))
+(reduce (#(procedure #:enforce) reduce ((procedure (* *) *) * list) *)) ;XXX
+(reduce-right (#(procedure #:enforce) reduce-right ((procedure (* *) *) * list) *)) ;XXX
+(remove (forall (a) (#(procedure #:enforce) remove ((procedure (a) *) (list a)) (list a))))
+(remove! (forall (a) (#(procedure #:enforce) remove! ((procedure (a) *) (list a)) (list a))))
+(reverse! (forall (a) (#(procedure #:enforce) reverse! ((list a)) (list a))))
 
-(second (forall (a) (procedure! second ((pair * (pair a *))) a))
+(second (forall (a) (#(procedure #:enforce) second ((pair * (pair a *))) a))
 	(((pair * (pair * *))) (##core#inline "C_u_i_car" (##core#inline "C_u_i_cdr" #(1)))))
 
-(seventh (procedure! seventh (pair) *))
-(sixth (procedure! sixth (pair) *))
-(span (forall (a) (procedure! span ((procedure (a) *) (list a)) (list a) (list a))))
-(span! (forall (a) (procedure! span! ((procedure (a) *) (list a)) (list a) (list a))))
-(split-at (forall (a) (procedure! split-at ((list a) fixnum) (list a) (list a))))
-(split-at! (forall (a) (procedure! split-at! ((list a) fixnum) (list a) (list a))))
-(take (forall (a) (procedure! take ((list a) fixnum) (list a))))
-(take! (forall (a) (procedure! take! ((list a) fixnum) (list a))))
-(take-right (forall (a) (procedure! take-right ((list a) fixnum) (list a))))
-(take-while (forall (a) (procedure! take-while ((procedure (a) *) (list a)) (list a))))
-(take-while! (forall (a) (procedure! take-while! ((procedure (a) *) (list a)) (list a))))
-(tenth (procedure! tenth (pair) *))
-
-(third (forall (a) (procedure! third ((pair * (pair * (pair a *)))) a))
+(seventh (#(procedure #:enforce) seventh (pair) *))
+(sixth (#(procedure #:enforce) sixth (pair) *))
+(span (forall (a) (#(procedure #:enforce) span ((procedure (a) *) (list a)) (list a) (list a))))
+(span! (forall (a) (#(procedure #:enforce) span! ((procedure (a) *) (list a)) (list a) (list a))))
+(split-at (forall (a) (#(procedure #:enforce) split-at ((list a) fixnum) (list a) (list a))))
+(split-at! (forall (a) (#(procedure #:enforce) split-at! ((list a) fixnum) (list a) (list a))))
+(take (forall (a) (#(procedure #:enforce) take ((list a) fixnum) (list a))))
+(take! (forall (a) (#(procedure #:enforce) take! ((list a) fixnum) (list a))))
+(take-right (forall (a) (#(procedure #:enforce) take-right ((list a) fixnum) (list a))))
+(take-while (forall (a) (#(procedure #:enforce) take-while ((procedure (a) *) (list a)) (list a))))
+(take-while! (forall (a) (#(procedure #:enforce) take-while! ((procedure (a) *) (list a)) (list a))))
+(tenth (#(procedure #:enforce) tenth (pair) *))
+
+(third (forall (a) (#(procedure #:enforce) third ((pair * (pair * (pair a *)))) a))
        (((pair * (pair * (pair * *))))
 	(##core#inline "C_u_i_car" 
 		       (##core#inline "C_u_i_cdr" (##core#inline "C_u_i_cdr" #(1))))))
 
-(unfold (procedure! unfold ((procedure (*) *) (procedure (*) *) (procedure (*) *) * #!optional (procedure (*) *)) *)) ;XXX
-(unfold-right (procedure! unfold-right ((procedure (*) *) (procedure (*) *) (procedure (*) *) * #!optional (procedure (*) *)) *)) ;XXX
-(unzip1 (forall (a) (procedure! unzip1 ((list (pair a *))) (list a))))
-(unzip2 (forall (a b) (procedure! unzip2 ((list (pair a (pair b *)))) (list a) (list b))))
+(unfold (#(procedure #:enforce) unfold ((procedure (*) *) (procedure (*) *) (procedure (*) *) * #!optional (procedure (*) *)) *)) ;XXX
+(unfold-right (#(procedure #:enforce) unfold-right ((procedure (*) *) (procedure (*) *) (procedure (*) *) * #!optional (procedure (*) *)) *)) ;XXX
+(unzip1 (forall (a) (#(procedure #:enforce) unzip1 ((list (pair a *))) (list a))))
+(unzip2 (forall (a b) (#(procedure #:enforce) unzip2 ((list (pair a (pair b *)))) (list a) (list b))))
 
 (unzip3
- (forall (a b c) (procedure! unzip3 ((list (pair a (pair b (pair c *))))) (list a) (list b) (list c))))
+ (forall (a b c) (#(procedure #:enforce) unzip3 ((list (pair a (pair b (pair c *))))) (list a) (list b) (list c))))
 
-(unzip4 (procedure! unzip4 (list) list list list list)) ; yeah
-(unzip5 (procedure! unzip5 (list) list list list list list)) ; yeah, too
+(unzip4 (#(procedure #:enforce) unzip4 (list) list list list list)) ; yeah
+(unzip5 (#(procedure #:enforce) unzip5 (list) list list list list list)) ; yeah, too
 (xcons (forall (a b) (procedure xcons (a b) (pair b a))))
-(zip (forall (a) (procedure! zip ((list a) #!rest list) (list (pair a *)))))
+(zip (forall (a) (#(procedure #:enforce) zip ((list a) #!rest list) (list (pair a *)))))
 
 
 ;; srfi-13
 
-(check-substring-spec (procedure! check-substring-spec (* string fixnum fixnum) undefined))
-(kmp-step (procedure! kmp-step (string vector char fixnum (procedure (char char) *) fixnum) fixnum))
-(make-kmp-restart-vector (procedure! make-kmp-restart-vector (string #!optional (procedure (* *) *) fixnum fixnum) vector))
+(check-substring-spec (#(procedure #:enforce) check-substring-spec (* string fixnum fixnum) undefined))
+(kmp-step (#(procedure #:enforce) kmp-step (string vector char fixnum (procedure (char char) *) fixnum) fixnum))
+(make-kmp-restart-vector (#(procedure #:enforce) make-kmp-restart-vector (string #!optional (procedure (* *) *) fixnum fixnum) vector))
 
 (string-any
- (procedure!
+ (#(procedure #:enforce)
   string-any
   ((or char (struct char-set) (procedure (char) *)) string #!optional fixnum fixnum)
   boolean))
 
-(string-append/shared (procedure! string-append/shared (#!rest string) string)
+(string-append/shared (#(procedure #:enforce) string-append/shared (#!rest string) string)
 		      ((string string) (##sys#string-append #(1) #(2))))
 
-(string-ci< (procedure! string-ci< (string string #!optional fixnum fixnum) boolean)
+(string-ci< (#(procedure #:enforce) string-ci< (string string #!optional fixnum fixnum) boolean)
 	    ((string string) (string-ci<? #(1) #(2))))
 
-(string-ci<= (procedure! string-ci<= (string string #!optional fixnum fixnum) boolean)
+(string-ci<= (#(procedure #:enforce) string-ci<= (string string #!optional fixnum fixnum) boolean)
 	     ((string string) (string-ci<=? #(1) #(2))))
 
-(string-ci<> (procedure! string-ci<> (string string #!optional fixnum fixnum) boolean)
+(string-ci<> (#(procedure #:enforce) string-ci<> (string string #!optional fixnum fixnum) boolean)
 	     ((string string) (not (##core#inline "C_i_string_ci_equal_p" #(1) #(2)))))
 
-(string-ci= (procedure! string-ci= (string string #!optional fixnum fixnum) boolean)
+(string-ci= (#(procedure #:enforce) string-ci= (string string #!optional fixnum fixnum) boolean)
 	    ((string string) (##core#inline "C_i_string_ci_equal_p" #(1) #(2))))
 
-(string-ci> (procedure! string-ci> (string string #!optional fixnum fixnum) boolean)
+(string-ci> (#(procedure #:enforce) string-ci> (string string #!optional fixnum fixnum) boolean)
 	    ((string string) (string-ci>? #(1) #(2))))
 
-(string-ci>= (procedure! string-ci>= (string string #!optional fixnum fixnum) boolean)
+(string-ci>= (#(procedure #:enforce) string-ci>= (string string #!optional fixnum fixnum) boolean)
 	     ((string string) (string-ci>=? #(1) #(2))))
 
-(string-compare (procedure! string-compare (string string (procedure (fixnum) *) (procedure (fixnum) *) (procedure (fixnum) *) #!optional fixnum fixnum fixnum fixnum) *))
-(string-compare-ci (procedure! string-compare (string string (procedure (fixnum) *) (procedure (fixnum) *) (procedure (fixnum) *) #!optional fixnum fixnum fixnum fixnum) *))
-(string-concatenate (procedure! string-concatenate ((list string)) string))
-(string-concatenate-reverse (procedure! string-concatenate-reverse ((list string) #!optional string fixnum) string))
-(string-concatenate-reverse/shared (procedure! string-concatenate-reverse/shared ((list string) #!optional string fixnum) string))
-(string-concatenate/shared (procedure! string-concatenate/shared ((list string)) string))
-(string-contains (procedure! string-contains (string string #!optional fixnum fixnum fixnum fixnum) (or fixnum boolean)))
-(string-contains-ci (procedure! string-contains-ci (string string #!optional fixnum fixnum fixnum fixnum) (or fixnum boolean)))
-(string-copy (procedure! string-copy (string #!optional fixnum fixnum) string))
-(string-copy! (procedure! string-copy! (string fixnum string #!optional fixnum fixnum) undefined))
-(string-count (procedure! string-count (string * #!optional fixnum fixnum) fixnum))
-(string-delete (procedure! string-delete (* string #!optional fixnum fixnum) string))
-(string-downcase (procedure! string-downcase (string #!optional fixnum fixnum) string))
-(string-downcase! (procedure! string-downcase! (string #!optional fixnum fixnum) string))
-(string-drop (procedure! string-drop (string fixnum) string))
-(string-drop-right (procedure! string-drop-right (string fixnum) string))
+(string-compare (#(procedure #:enforce) string-compare (string string (procedure (fixnum) *) (procedure (fixnum) *) (procedure (fixnum) *) #!optional fixnum fixnum fixnum fixnum) *))
+(string-compare-ci (#(procedure #:enforce) string-compare (string string (procedure (fixnum) *) (procedure (fixnum) *) (procedure (fixnum) *) #!optional fixnum fixnum fixnum fixnum) *))
+(string-concatenate (#(procedure #:enforce) string-concatenate ((list string)) string))
+(string-concatenate-reverse (#(procedure #:enforce) string-concatenate-reverse ((list string) #!optional string fixnum) string))
+(string-concatenate-reverse/shared (#(procedure #:enforce) string-concatenate-reverse/shared ((list string) #!optional string fixnum) string))
+(string-concatenate/shared (#(procedure #:enforce) string-concatenate/shared ((list string)) string))
+(string-contains (#(procedure #:enforce) string-contains (string string #!optional fixnum fixnum fixnum fixnum) (or fixnum boolean)))
+(string-contains-ci (#(procedure #:enforce) string-contains-ci (string string #!optional fixnum fixnum fixnum fixnum) (or fixnum boolean)))
+(string-copy (#(procedure #:enforce) string-copy (string #!optional fixnum fixnum) string))
+(string-copy! (#(procedure #:enforce) string-copy! (string fixnum string #!optional fixnum fixnum) undefined))
+(string-count (#(procedure #:enforce) string-count (string * #!optional fixnum fixnum) fixnum))
+(string-delete (#(procedure #:enforce) string-delete (* string #!optional fixnum fixnum) string))
+(string-downcase (#(procedure #:enforce) string-downcase (string #!optional fixnum fixnum) string))
+(string-downcase! (#(procedure #:enforce) string-downcase! (string #!optional fixnum fixnum) string))
+(string-drop (#(procedure #:enforce) string-drop (string fixnum) string))
+(string-drop-right (#(procedure #:enforce) string-drop-right (string fixnum) string))
 
 (string-every
- (procedure!
+ (#(procedure #:enforce)
   string-every
   ((or char (struct char-set) (procedure (char) *)) string #!optional fixnum fixnum) 
   boolean))
 
-(string-fill! (procedure! string-fill! (string char #!optional fixnum fixnum) string))
+(string-fill! (#(procedure #:enforce) string-fill! (string char #!optional fixnum fixnum) string))
 
 (string-filter
- (procedure! 
+ (#(procedure #:enforce) 
   string-filter
   ((or char (struct char-set) (procedure (char) *)) string #!optional fixnum fixnum) 
   string))
 
-(string-fold (procedure! string-fold ((procedure (char *) *) * string #!optional fixnum fixnum) *)) ;XXX
+(string-fold (#(procedure #:enforce) string-fold ((procedure (char *) *) * string #!optional fixnum fixnum) *)) ;XXX
 
-(string-fold-right (procedure! string-fold-right ((procedure (char *) *) * string #!optional fixnum fixnum) *)) ;XXX
-(string-for-each (procedure! string-for-each ((procedure (char) . *) string #!optional fixnum fixnum) undefined))
-(string-for-each-index (procedure! string-for-each-index ((procedure (fixnum) . *) string #!optional fixnum fixnum) undefined))
+(string-fold-right (#(procedure #:enforce) string-fold-right ((procedure (char *) *) * string #!optional fixnum fixnum) *)) ;XXX
+(string-for-each (#(procedure #:enforce) string-for-each ((procedure (char) . *) string #!optional fixnum fixnum) undefined))
+(string-for-each-index (#(procedure #:enforce) string-for-each-index ((procedure (fixnum) . *) string #!optional fixnum fixnum) undefined))
 
 (string-index
- (procedure! 
+ (#(procedure #:enforce) 
   string-index
   (string (or char (struct char-set) (procedure (char) *)) #!optional fixnum fixnum)
   (or fixnum boolean)))
 
 (string-index-right
- (procedure! 
+ (#(procedure #:enforce) 
   string-index-right
   (string (or char (struct char-set) (procedure (char) *)) #!optional fixnum fixnum)
   (or fixnum boolean)))
 
-(string-join (procedure! string-join (list #!optional string symbol) string))
-(string-kmp-partial-search (procedure! string-kmp-partial-search (string vector string fixnum #!optional (procedure (char char) *) fixnum fixnum fixnum) fixnum))
-(string-map (procedure! string-map ((procedure (char) char) string #!optional fixnum fixnum) string))
-(string-map! (procedure! string-map! ((procedure (char) char) string #!optional fixnum fixnum) string))
+(string-join (#(procedure #:enforce) string-join (list #!optional string symbol) string))
+(string-kmp-partial-search (#(procedure #:enforce) string-kmp-partial-search (string vector string fixnum #!optional (procedure (char char) *) fixnum fixnum fixnum) fixnum))
+(string-map (#(procedure #:enforce) string-map ((procedure (char) char) string #!optional fixnum fixnum) string))
+(string-map! (#(procedure #:enforce) string-map! ((procedure (char) char) string #!optional fixnum fixnum) string))
 
-(string-null? (procedure! string-null? (string) boolean)
+(string-null? (#(procedure #:enforce) string-null? (string) boolean)
 	      ((string) (##core#inline "C_zero_length_p" #(1))))
 
-(string-pad (procedure! string-pad (string fixnum #!optional char fixnum fixnum) string))
-(string-pad-right (procedure! string-pad-right (string fixnum #!optional char fixnum fixnum) string))
-(string-parse-final-start+end (procedure! string-parse-final-start+end (procedure string #!rest) . *))
-(string-parse-start+end (procedure! string-parse-start+end (procedure string #!rest) . *))
-(string-prefix-ci? (procedure! string-prefix-ci? (string string #!optional fixnum fixnum fixnum fixnum) boolean))
-(string-prefix-length (procedure! string-prefix-length (string string #!optional fixnum fixnum fixnum fixnum) fixnum))
-(string-prefix-length-ci (procedure! string-prefix-length-ci (string string #!optional fixnum fixnum fixnum fixnum) fixnum))
-(string-prefix? (procedure! string-prefix? (string string #!optional fixnum fixnum fixnum fixnum) boolean))
-(string-replace (procedure! string-replace (string string fixnum fixnum #!optional fixnum fixnum) string))
-(string-reverse (procedure! string-reverse (string #!optional fixnum fixnum) string))
-(string-reverse! (procedure! string-reverse! (string #!optional fixnum fixnum) string))
+(string-pad (#(procedure #:enforce) string-pad (string fixnum #!optional char fixnum fixnum) string))
+(string-pad-right (#(procedure #:enforce) string-pad-right (string fixnum #!optional char fixnum fixnum) string))
+(string-parse-final-start+end (#(procedure #:enforce) string-parse-final-start+end (procedure string #!rest) . *))
+(string-parse-start+end (#(procedure #:enforce) string-parse-start+end (procedure string #!rest) . *))
+(string-prefix-ci? (#(procedure #:enforce) string-prefix-ci? (string string #!optional fixnum fixnum fixnum fixnum) boolean))
+(string-prefix-length (#(procedure #:enforce) string-prefix-length (string string #!optional fixnum fixnum fixnum fixnum) fixnum))
+(string-prefix-length-ci (#(procedure #:enforce) string-prefix-length-ci (string string #!optional fixnum fixnum fixnum fixnum) fixnum))
+(string-prefix? (#(procedure #:enforce) string-prefix? (string string #!optional fixnum fixnum fixnum fixnum) boolean))
+(string-replace (#(procedure #:enforce) string-replace (string string fixnum fixnum #!optional fixnum fixnum) string))
+(string-reverse (#(procedure #:enforce) string-reverse (string #!optional fixnum fixnum) string))
+(string-reverse! (#(procedure #:enforce) string-reverse! (string #!optional fixnum fixnum) string))
 
 (string-skip
- (procedure! 
+ (#(procedure #:enforce) 
   string-skip
   (string (or char (struct char-set) (procedure (char) *)) #!optional fixnum fixnum)
   (or fixnum boolean)))
 
 (string-skip-right
- (procedure! 
+ (#(procedure #:enforce) 
   string-skip-right
   (string (or char (struct char-set) (procedure (char) *)) #!optional fixnum fixnum)
   (or fixnum boolean)))
 
-(string-suffix-ci? (procedure! string-suffix-ci? (string string #!optional fixnum fixnum fixnum fixnum) boolean))
-(string-suffix-length (procedure! string-suffix-length (string string #!optional fixnum fixnum fixnum fixnum) fixnum))
-(string-suffix-length-ci (procedure! string-suffix-length-ci (string string #!optional fixnum fixnum fixnum fixnum) fixnum))
-(string-suffix? (procedure! string-suffix? (string string #!optional fixnum fixnum fixnum fixnum) boolean))
-(string-tabulate (procedure! string-tabulate ((procedure (fixnum) char) fixnum) string))
-(string-take (procedure! string-take (string fixnum) string))
-(string-take-right (procedure! string-take-right (string fixnum) string))
-(string-titlecase (procedure! string-titlecase (string #!optional fixnum fixnum) string))
-(string-titlecase! (procedure! string-titlecase! (string #!optional fixnum fixnum) string))
+(string-suffix-ci? (#(procedure #:enforce) string-suffix-ci? (string string #!optional fixnum fixnum fixnum fixnum) boolean))
+(string-suffix-length (#(procedure #:enforce) string-suffix-length (string string #!optional fixnum fixnum fixnum fixnum) fixnum))
+(string-suffix-length-ci (#(procedure #:enforce) string-suffix-length-ci (string string #!optional fixnum fixnum fixnum fixnum) fixnum))
+(string-suffix? (#(procedure #:enforce) string-suffix? (string string #!optional fixnum fixnum fixnum fixnum) boolean))
+(string-tabulate (#(procedure #:enforce) string-tabulate ((procedure (fixnum) char) fixnum) string))
+(string-take (#(procedure #:enforce) string-take (string fixnum) string))
+(string-take-right (#(procedure #:enforce) string-take-right (string fixnum) string))
+(string-titlecase (#(procedure #:enforce) string-titlecase (string #!optional fixnum fixnum) string))
+(string-titlecase! (#(procedure #:enforce) string-titlecase! (string #!optional fixnum fixnum) string))
 
 (string-tokenize
- (procedure! string-tokenize (string #!optional (struct char-set) fixnum fixnum) list))
+ (#(procedure #:enforce) string-tokenize (string #!optional (struct char-set) fixnum fixnum) list))
 
 (string-trim
- (procedure! 
+ (#(procedure #:enforce) 
   string-trim
   (string #!optional (or char (struct char-set) (procedure (char) *)) fixnum fixnum) 
   string))
 
 (string-trim-both
- (procedure! 
+ (#(procedure #:enforce) 
   string-trim-both
   (string #!optional (or char (struct char-set) (procedure (char) *)) fixnum fixnum) 
   string))
 
 (string-trim-right
- (procedure! 
+ (#(procedure #:enforce) 
   string-trim-right
   (string #!optional (or char (struct char-set) (procedure (char) *)) fixnum fixnum) 
   string))
 
-(string-unfold (procedure! string-unfold (procedure procedure procedure * #!optional * procedure) string)) ;XXX
-(string-unfold-right (procedure! string-unfold-right (procedure procedure procedure * #!optional * procedure) string)) ;XXX
-(string-upcase (procedure! string-upcase (string #!optional fixnum fixnum) string))
-(string-upcase! (procedure! string-upcase! (string #!optional fixnum fixnum) string))
-(string-xcopy! (procedure! string-xcopy! (string string string fixnum #!optional fixnum fixnum fixnum) string))
+(string-unfold (#(procedure #:enforce) string-unfold (procedure procedure procedure * #!optional * procedure) string)) ;XXX
+(string-unfold-right (#(procedure #:enforce) string-unfold-right (procedure procedure procedure * #!optional * procedure) string)) ;XXX
+(string-upcase (#(procedure #:enforce) string-upcase (string #!optional fixnum fixnum) string))
+(string-upcase! (#(procedure #:enforce) string-upcase! (string #!optional fixnum fixnum) string))
+(string-xcopy! (#(procedure #:enforce) string-xcopy! (string string string fixnum #!optional fixnum fixnum fixnum) string))
 
-(string< (procedure! string< (string string #!optional fixnum fixnum fixnum fixnum) boolean)
+(string< (#(procedure #:enforce) string< (string string #!optional fixnum fixnum fixnum fixnum) boolean)
 	 ((string string) (string<? #(1) #(2))))
 
-(string<= (procedure! string<= (string string #!optional fixnum fixnum fixnum fixnum) boolean)
+(string<= (#(procedure #:enforce) string<= (string string #!optional fixnum fixnum fixnum fixnum) boolean)
 	  ((string string) (string<=? #(1) #(2))))
 
-(string<> (procedure! string<> (string string #!optional fixnum fixnum fixnum fixnum) boolean)
+(string<> (#(procedure #:enforce) string<> (string string #!optional fixnum fixnum fixnum fixnum) boolean)
 	  ((string string) (not (##core#inline "C_i_string_equal_p" #(1) #(2)))))
 
-(string= (procedure! string= (string string #!optional fixnum fixnum fixnum fixnum) boolean)
+(string= (#(procedure #:enforce) string= (string string #!optional fixnum fixnum fixnum fixnum) boolean)
 	 ((string string) (##core#inline "C_i_string_equal_p" #(1) #(2))))
 
-(string> (procedure! string> (string string #!optional fixnum fixnum fixnum fixnum) boolean)
+(string> (#(procedure #:enforce) string> (string string #!optional fixnum fixnum fixnum fixnum) boolean)
 	 ((string string) (string>? #(1) #(2))))
 
-(string>= (procedure! string>= (string string #!optional fixnum fixnum fixnum fixnum) boolean)
+(string>= (#(procedure #:enforce) string>= (string string #!optional fixnum fixnum fixnum fixnum) boolean)
 	  ((string string) (string>=? #(1) #(2))))
 
-(substring-spec-ok? (procedure! substring-spec-ok? (string fixnum fixnum) boolean))
-(substring/shared (procedure! substring/shared (string fixnum #!optional fixnum) string))
-(xsubstring (procedure! xsubstring (string fixnum #!optional fixnum fixnum fixnum) string))
+(substring-spec-ok? (#(procedure #:enforce) substring-spec-ok? (string fixnum fixnum) boolean))
+(substring/shared (#(procedure #:enforce) substring/shared (string fixnum #!optional fixnum) string))
+(xsubstring (#(procedure #:enforce) xsubstring (string fixnum #!optional fixnum fixnum fixnum) string))
 
 
 ;; srfi-14
@@ -2066,42 +2063,42 @@
 	    ((string) (string->char-set #(1)))
 	    ((char) (char-set #(1))))
 
-(char-set (procedure! char-set (#!rest char) (struct char-set)))
-(char-set->list (procedure! char-set->list ((struct char-set)) list))
-(char-set->string (procedure! char-set->string ((struct char-set)) string))
-(char-set-adjoin (procedure! char-set-adjoin ((struct char-set) #!rest char) (struct char-set)))
-(char-set-adjoin! (procedure! char-set-adjoin! ((struct char-set) #!rest char) (struct char-set)))
-(char-set-any (procedure! char-set-any ((procedure (char) *) (struct char-set)) *))
-(char-set-complement (procedure! char-set-complement ((struct char-set)) (struct char-set)))
-(char-set-complement! (procedure! char-set-complement! ((struct char-set)) (struct char-set)))
-(char-set-contains? (procedure! char-set-contains? ((struct char-set) char) boolean))
-(char-set-copy (procedure! char-set-copy ((struct char-set)) (struct char-set)))
-(char-set-count (procedure! char-set-count ((procedure (char) *) (struct char-set)) fixnum))
-(char-set-cursor (procedure! char-set-cursor ((struct char-set)) fixnum))
-(char-set-cursor-next (procedure! char-set-cursor-next ((struct char-set) fixnum) fixnum))
-(char-set-delete (procedure! char-set-delete ((struct char-set) #!rest char) (struct char-set)))
-(char-set-delete! (procedure! char-set-delete! ((struct char-set) #!rest char) (struct char-set)))
-(char-set-diff+intersection (procedure! char-set-diff+intersection ((struct char-set) #!rest (struct char-set)) (struct char-set) (struct char-set)))
-(char-set-diff+intersection! (procedure! char-set-diff+intersection! ((struct char-set) #!rest (struct char-set)) (struct char-set) (struct char-set)))
-(char-set-difference (procedure! char-set-difference ((struct char-set) #!rest (struct char-set)) (struct char-set)))
-(char-set-difference! (procedure! char-set-difference! ((struct char-set) #!rest (struct char-set)) (struct char-set)))
-(char-set-every (procedure! char-set-every ((procedure (char) *) (struct char-set)) boolean))
-(char-set-filter (procedure! char-set-filter ((procedure (char) *) (struct char-set) #!optional (struct char-set)) (struct char-set)))
-(char-set-filter! (procedure! char-set-filter! ((procedure (char) *) (struct char-set) #!optional (struct char-set)) (struct char-set)))
-(char-set-fold (procedure! char-set-fold ((procedure (char *) *) * (struct char-set)) *))
-(char-set-for-each (procedure! char-set-for-each ((procedure (char) . *) (struct char-set)) undefined))
-(char-set-hash (procedure! char-set-hash ((struct char-set) #!optional number) number))
-(char-set-intersection (procedure! char-set-intersection (#!rest (struct char-set)) (struct char-set)))
-(char-set-intersection! (procedure! char-set-intersection! (#!rest (struct char-set)) (struct char-set)))
-(char-set-map (procedure! char-set-map ((procedure (char) char) (struct char-set)) (struct char-set)))
-(char-set-ref (procedure! char-set-ref ((struct char-set) fixnum) char))
-(char-set-size (procedure! char-set-size ((struct char-set)) fixnum))
-(char-set-unfold (procedure! char-set-unfold (procedure procedure procedure * #!optional (struct char-set)) (struct char-set)))
-(char-set-unfold! (procedure! char-set-unfold! (procedure procedure procedure * (struct char-set)) (struct char-set)))
-(char-set-union (procedure! char-set-union (#!rest (struct char-set)) (struct char-set)))
-(char-set-union! (procedure! char-set-union! (#!rest (struct char-set)) (struct char-set)))
-(char-set-xor (procedure! char-set-xor (#!rest (struct char-set)) (struct char-set)))
-(char-set-xor! (procedure! char-set-xor! (#!rest (struct char-set)) (struct char-set)))
+(char-set (#(procedure #:enforce) char-set (#!rest char) (struct char-set)))
+(char-set->list (#(procedure #:enforce) char-set->list ((struct char-set)) list))
+(char-set->string (#(procedure #:enforce) char-set->string ((struct char-set)) string))
+(char-set-adjoin (#(procedure #:enforce) char-set-adjoin ((struct char-set) #!rest char) (struct char-set)))
+(char-set-adjoin! (#(procedure #:enforce) char-set-adjoin! ((struct char-set) #!rest char) (struct char-set)))
+(char-set-any (#(procedure #:enforce) char-set-any ((procedure (char) *) (struct char-set)) *))
+(char-set-complement (#(procedure #:enforce) char-set-complement ((struct char-set)) (struct char-set)))
+(char-set-complement! (#(procedure #:enforce) char-set-complement! ((struct char-set)) (struct char-set)))
+(char-set-contains? (#(procedure #:enforce) char-set-contains? ((struct char-set) char) boolean))
+(char-set-copy (#(procedure #:enforce) char-set-copy ((struct char-set)) (struct char-set)))
+(char-set-count (#(procedure #:enforce) char-set-count ((procedure (char) *) (struct char-set)) fixnum))
+(char-set-cursor (#(procedure #:enforce) char-set-cursor ((struct char-set)) fixnum))
+(char-set-cursor-next (#(procedure #:enforce) char-set-cursor-next ((struct char-set) fixnum) fixnum))
+(char-set-delete (#(procedure #:enforce) char-set-delete ((struct char-set) #!rest char) (struct char-set)))
+(char-set-delete! (#(procedure #:enforce) char-set-delete! ((struct char-set) #!rest char) (struct char-set)))
+(char-set-diff+intersection (#(procedure #:enforce) char-set-diff+intersection ((struct char-set) #!rest (struct char-set)) (struct char-set) (struct char-set)))
+(char-set-diff+intersection! (#(procedure #:enforce) char-set-diff+intersection! ((struct char-set) #!rest (struct char-set)) (struct char-set) (struct char-set)))
+(char-set-difference (#(procedure #:enforce) char-set-difference ((struct char-set) #!rest (struct char-set)) (struct char-set)))
+(char-set-difference! (#(procedure #:enforce) char-set-difference! ((struct char-set) #!rest (struct char-set)) (struct char-set)))
+(char-set-every (#(procedure #:enforce) char-set-every ((procedure (char) *) (struct char-set)) boolean))
+(char-set-filter (#(procedure #:enforce) char-set-filter ((procedure (char) *) (struct char-set) #!optional (struct char-set)) (struct char-set)))
+(char-set-filter! (#(procedure #:enforce) char-set-filter! ((procedure (char) *) (struct char-set) #!optional (struct char-set)) (struct char-set)))
+(char-set-fold (#(procedure #:enforce) char-set-fold ((procedure (char *) *) * (struct char-set)) *))
+(char-set-for-each (#(procedure #:enforce) char-set-for-each ((procedure (char) . *) (struct char-set)) undefined))
+(char-set-hash (#(procedure #:enforce) char-set-hash ((struct char-set) #!optional number) number))
+(char-set-intersection (#(procedure #:enforce) char-set-intersection (#!rest (struct char-set)) (struct char-set)))
+(char-set-intersection! (#(procedure #:enforce) char-set-intersection! (#!rest (struct char-set)) (struct char-set)))
+(char-set-map (#(procedure #:enforce) char-set-map ((procedure (char) char) (struct char-set)) (struct char-set)))
+(char-set-ref (#(procedure #:enforce) char-set-ref ((struct char-set) fixnum) char))
+(char-set-size (#(procedure #:enforce) char-set-size ((struct char-set)) fixnum))
+(char-set-unfold (#(procedure #:enforce) char-set-unfold (procedure procedure procedure * #!optional (struct char-set)) (struct char-set)))
+(char-set-unfold! (#(procedure #:enforce) char-set-unfold! (procedure procedure procedure * (struct char-set)) (struct char-set)))
+(char-set-union (#(procedure #:enforce) char-set-union (#!rest (struct char-set)) (struct char-set)))
+(char-set-union! (#(procedure #:enforce) char-set-union! (#!rest (struct char-set)) (struct char-set)))
+(char-set-xor (#(procedure #:enforce) char-set-xor (#!rest (struct char-set)) (struct char-set)))
+(char-set-xor! (#(procedure #:enforce) char-set-xor! (#!rest (struct char-set)) (struct char-set)))
 (char-set:ascii (struct char-set))
 (char-set:blank (struct char-set))
 (char-set:digit (struct char-set))
@@ -2119,31 +2116,32 @@
 (char-set:title-case (struct char-set))
 (char-set:upper-case (struct char-set))
 (char-set:whitespace (struct char-set))
-(char-set<= (procedure! char-set<= (#!rest (struct char-set)) boolean))
-(char-set= (procedure! char-set= (#!rest (struct char-set)) boolean))
+(char-set<= (#(procedure #:enforce) char-set<= (#!rest (struct char-set)) boolean))
+(char-set= (#(procedure #:enforce) char-set= (#!rest (struct char-set)) boolean))
 
-(char-set? (procedure? (struct char-set) char-set? (*) boolean))
+(char-set? (#(procedure #:predicate (struct char-set)) char-set? (*) boolean))
 
-(end-of-char-set? (procedure! end-of-char-set? (fixnum) boolean))
-(list->char-set (procedure! list->char-set (list #!optional (struct char-set)) (struct char-set)))
-(list->char-set! (procedure! list->char-set! (list #!optional (struct char-set)) (struct char-set)))
-(string->char-set (procedure! string->char-set (string #!optional (struct char-set)) (struct char-set)))
-(string->char-set! (procedure! string->char-set! (string #!optional (struct char-set)) (struct char-set)))
-(ucs-range->char-set (procedure! ucs-range->char-set (fixnum fixnum #!optional * (struct char-set)) (struct char-set)))
-(ucs-range->char-set! (procedure! ucs-range->char-set! (fixnum fixnum #!optional * (struct char-set)) (struct char-set)))
+(end-of-char-set? (#(procedure #:enforce) end-of-char-set? (fixnum) boolean))
+(list->char-set (#(procedure #:enforce) list->char-set (list #!optional (struct char-set)) (struct char-set)))
+(list->char-set! (#(procedure #:enforce) list->char-set! (list #!optional (struct char-set)) (struct char-set)))
+(string->char-set (#(procedure #:enforce) string->char-set (string #!optional (struct char-set)) (struct char-set)))
+(string->char-set! (#(procedure #:enforce) string->char-set! (string #!optional (struct char-set)) (struct char-set)))
+(ucs-range->char-set (#(procedure #:enforce) ucs-range->char-set (fixnum fixnum #!optional * (struct char-set)) (struct char-set)))
+(ucs-range->char-set! (#(procedure #:enforce) ucs-range->char-set! (fixnum fixnum #!optional * (struct char-set)) (struct char-set)))
 
 
 ;; srfi-18
 
 (abandoned-mutex-exception? (procedure abandoned-mutex-exception? (*) boolean))
-(condition-variable-broadcast! (procedure! condition-variable-broadcast! ((struct condition-variable)) undefined))
-(condition-variable-name (procedure! condition-variable-name ((struct condition-variable)) *))
-(condition-variable-signal! (procedure! condition-variable-signal! ((struct condition-variable)) undefined))
-(condition-variable-specific (procedure! condition-variable-specific ((struct condition-variable)) *))
-(condition-variable-specific-set! (procedure! condition-variable-specific-set! ((struct condition-variable) *) undefined))
+(condition-variable-broadcast! (#(procedure #:enforce) condition-variable-broadcast! ((struct condition-variable)) undefined))
+(condition-variable-name (#(procedure #:enforce) condition-variable-name ((struct condition-variable)) *))
+(condition-variable-signal! (#(procedure #:enforce) condition-variable-signal! ((struct condition-variable)) undefined))
+(condition-variable-specific (#(procedure #:enforce) condition-variable-specific ((struct condition-variable)) *))
+(condition-variable-specific-set! (#(procedure #:enforce) condition-variable-specific-set! ((struct condition-variable) *) undefined))
 
-(condition-variable? (procedure? (struct condition-variable) condition-variable? (*) 
-				 boolean))
+(condition-variable? (#(procedure #:predicate (struct condition-variable))
+		      condition-variable? (*) 
+		      boolean))
 
 (current-thread (procedure current-thread () (struct thread))) ;XXX
 
@@ -2151,322 +2149,322 @@
 (join-timeout-exception? (procedure join-timeout-exception? (*) boolean))
 (make-condition-variable (procedure make-condition-variable (#!optional *) (struct condition-variable)))
 (make-mutex (procedure make-mutex (#!optional *) (struct mutex)))
-(make-thread (procedure! make-thread ((procedure () . *) #!optional *) (struct thread)))
+(make-thread (#(procedure #:enforce) make-thread ((procedure () . *) #!optional *) (struct thread)))
 (milliseconds->time deprecated)
-(mutex-lock! (procedure! mutex-lock! ((struct mutex) #!optional * (struct thread)) boolean))
+(mutex-lock! (#(procedure #:enforce) mutex-lock! ((struct mutex) #!optional * (struct thread)) boolean))
 
-(mutex-name (procedure! mutex-name ((struct mutex)) *)
+(mutex-name (#(procedure #:enforce) mutex-name ((struct mutex)) *)
 	    (((struct mutex)) (##sys#slot #(1) '1)))
 
-(mutex-specific (procedure! mutex-specific ((struct mutex)) *)
+(mutex-specific (#(procedure #:enforce) mutex-specific ((struct mutex)) *)
 		(((struct mutex)) (##sys#slot #(1) '6)))
 
-(mutex-specific-set! (procedure! mutex-specific-set! ((struct mutex) *) undefined)
+(mutex-specific-set! (#(procedure #:enforce) mutex-specific-set! ((struct mutex) *) undefined)
 		     (((struct mutex) *) (##sys#setslot #(1) '6 #(2))))
 
-(mutex-state (procedure! mutex-state ((struct mutex)) symbol))
-(mutex-unlock! (procedure! mutex-unlock! ((struct mutex) #!optional (struct condition-variable) *) undefined))
+(mutex-state (#(procedure #:enforce) mutex-state ((struct mutex)) symbol))
+(mutex-unlock! (#(procedure #:enforce) mutex-unlock! ((struct mutex) #!optional (struct condition-variable) *) undefined))
 
-(mutex? (procedure? (struct mutex) mutex? (*) boolean))
+(mutex? (#(procedure #:predicate (struct mutex)) mutex? (*) boolean))
 
 (raise (procedure raise (*) noreturn))
-(seconds->time (procedure! seconds->time (number) (struct time)))
+(seconds->time (#(procedure #:enforce) seconds->time (number) (struct time)))
 (terminated-thread-exception? (procedure terminated-thread-exception? (*) boolean))
-(thread-join! (procedure! thread-join! ((struct thread) #!optional * *) *))
+(thread-join! (#(procedure #:enforce) thread-join! ((struct thread) #!optional * *) *))
 
-(thread-name (procedure! thread-name ((struct thread)) *)
+(thread-name (#(procedure #:enforce) thread-name ((struct thread)) *)
 	     (((struct thread)) (##sys#slot #(1) '6)))
 
-(thread-quantum (procedure! thread-quantum ((struct thread)) fixnum)
+(thread-quantum (#(procedure #:enforce) thread-quantum ((struct thread)) fixnum)
 		(((struct thread)) (##sys#slot #(1) '9)))
 
-(thread-quantum-set! (procedure! thread-quantum-set! ((struct thread) fixnum) undefined))
-(thread-resume! (procedure! thread-resume! ((struct thread)) undefined))
-(thread-signal! (procedure! thread-signal! ((struct thread) *) undefined))
+(thread-quantum-set! (#(procedure #:enforce) thread-quantum-set! ((struct thread) fixnum) undefined))
+(thread-resume! (#(procedure #:enforce) thread-resume! ((struct thread)) undefined))
+(thread-signal! (#(procedure #:enforce) thread-signal! ((struct thread) *) undefined))
 (thread-sleep! (procedure thread-sleep! (*) undefined))
 
-(thread-specific (procedure! thread-specific ((struct thread)) *)
+(thread-specific (#(procedure #:enforce) thread-specific ((struct thread)) *)
 		 (((struct thread)) (##sys#slot #(1) '10)))
 
-(thread-specific-set! (procedure! thread-specific-set! ((struct thread) *) undefined)
+(thread-specific-set! (#(procedure #:enforce) thread-specific-set! ((struct thread) *) undefined)
 		      (((struct thread) *) (##sys#setslot #(1) '10 #(2))))
 
-(thread-start! (procedure! thread-start! ((or (struct thread) (procedure () . *))) (struct thread)))
+(thread-start! (#(procedure #:enforce) thread-start! ((or (struct thread) (procedure () . *))) (struct thread)))
 
-(thread-state (procedure! thread-state ((struct thread)) symbol)
+(thread-state (#(procedure #:enforce) thread-state ((struct thread)) symbol)
 	      (((struct thread)) (##sys#slot #(1) '3)))
 
-(thread-suspend! (procedure! thread-suspend! ((struct thread)) undefined))
-(thread-terminate! (procedure! thread-terminate! ((struct thread)) undefined))
-(thread-wait-for-i/o! (procedure! thread-wait-for-i/o! (fixnum #!optional symbol) undefined))
+(thread-suspend! (#(procedure #:enforce) thread-suspend! ((struct thread)) undefined))
+(thread-terminate! (#(procedure #:enforce) thread-terminate! ((struct thread)) undefined))
+(thread-wait-for-i/o! (#(procedure #:enforce) thread-wait-for-i/o! (fixnum #!optional symbol) undefined))
 (thread-yield! (procedure thread-yield! () undefined))
 
-(thread? (procedure? (struct thread) thread? (*) boolean))
+(thread? (#(procedure #:predicate (struct thread)) thread? (*) boolean))
 
 (time->milliseconds deprecated)
-(time->seconds (procedure! time->seconds ((struct time)) number))
+(time->seconds (#(procedure #:enforce) time->seconds ((struct time)) number))
 
-(time? (procedure? (struct time) time? (*) boolean))
+(time? (#(procedure #:predicate (struct time)) time? (*) boolean))
 
-(uncaught-exception-reason (procedure! uncaught-exception-reason ((struct condition)) *))
+(uncaught-exception-reason (#(procedure #:enforce) uncaught-exception-reason ((struct condition)) *))
 (uncaught-exception? (procedure uncaught-exception? (*) boolean))
 
 
 ;; srfi-4
 
-(blob->f32vector (procedure! blob->f32vector (blob) (struct f32vector)))
-(blob->f32vector/shared (procedure! blob->f32vector/shared (blob) (struct f32vector)))
-(blob->f64vector (procedure! blob->f64vector (blob) (struct f64vector)))
-(blob->f64vector/shared (procedure! blob->f64vector/shared (blob) (struct f64vector)))
-(blob->s16vector (procedure! blob->s16vector (blob) (struct s16vector)))
-(blob->s16vector/shared (procedure! blob->s16vector/shared (blob) (struct s16vector)))
-(blob->s32vector (procedure! blob->s32vector (blob) (struct s32vector)))
-(blob->s32vector/shared (procedure! blob->s32vector/shared (blob) (struct s32vector)))
-(blob->s8vector (procedure! blob->s8vector (blob) (struct u8vector)))
-(blob->s8vector/shared (procedure! blob->s8vector/shared (blob) (struct u8vector)))
-(blob->u16vector (procedure! blob->u16vector (blob) (struct u16vector)))
-(blob->u16vector/shared (procedure! blob->u16vector/shared (blob) (struct u16vector)))
-(blob->u32vector (procedure! blob->u32vector (blob) (struct u32vector)))
-(blob->u32vector/shared (procedure! blob->u32vector/shared (blob) (struct u32vector)))
-(blob->u8vector (procedure! blob->u8vector (blob) (struct u8vector)))
-(blob->u8vector/shared (procedure! blob->u8vector/shared (blob) (struct u8vector)))
-(f32vector (procedure! f32vector (#!rest number) (struct f32vector)))
-(f32vector->blob (procedure! f32vector->blob ((struct f32vector)) blob))
-(f32vector->blob/shared (procedure! f32vector->blob/shared ((struct f32vector)) blob))
-(f32vector->list (procedure! f32vector->list ((struct f32vector)) list))
-
-(f32vector-length (procedure! f32vector-length ((struct f32vector)) fixnum)
+(blob->f32vector (#(procedure #:enforce) blob->f32vector (blob) (struct f32vector)))
+(blob->f32vector/shared (#(procedure #:enforce) blob->f32vector/shared (blob) (struct f32vector)))
+(blob->f64vector (#(procedure #:enforce) blob->f64vector (blob) (struct f64vector)))
+(blob->f64vector/shared (#(procedure #:enforce) blob->f64vector/shared (blob) (struct f64vector)))
+(blob->s16vector (#(procedure #:enforce) blob->s16vector (blob) (struct s16vector)))
+(blob->s16vector/shared (#(procedure #:enforce) blob->s16vector/shared (blob) (struct s16vector)))
+(blob->s32vector (#(procedure #:enforce) blob->s32vector (blob) (struct s32vector)))
+(blob->s32vector/shared (#(procedure #:enforce) blob->s32vector/shared (blob) (struct s32vector)))
+(blob->s8vector (#(procedure #:enforce) blob->s8vector (blob) (struct u8vector)))
+(blob->s8vector/shared (#(procedure #:enforce) blob->s8vector/shared (blob) (struct u8vector)))
+(blob->u16vector (#(procedure #:enforce) blob->u16vector (blob) (struct u16vector)))
+(blob->u16vector/shared (#(procedure #:enforce) blob->u16vector/shared (blob) (struct u16vector)))
+(blob->u32vector (#(procedure #:enforce) blob->u32vector (blob) (struct u32vector)))
+(blob->u32vector/shared (#(procedure #:enforce) blob->u32vector/shared (blob) (struct u32vector)))
+(blob->u8vector (#(procedure #:enforce) blob->u8vector (blob) (struct u8vector)))
+(blob->u8vector/shared (#(procedure #:enforce) blob->u8vector/shared (blob) (struct u8vector)))
+(f32vector (#(procedure #:enforce) f32vector (#!rest number) (struct f32vector)))
+(f32vector->blob (#(procedure #:enforce) f32vector->blob ((struct f32vector)) blob))
+(f32vector->blob/shared (#(procedure #:enforce) f32vector->blob/shared ((struct f32vector)) blob))
+(f32vector->list (#(procedure #:enforce) f32vector->list ((struct f32vector)) list))
+
+(f32vector-length (#(procedure #:enforce) f32vector-length ((struct f32vector)) fixnum)
 		  (((struct f32vector)) (##core#inline "C_u_i_32vector_length" #(1))))
 
-(f32vector-ref (procedure! f32vector-ref ((struct f32vector) fixnum) float))
-(f32vector-set! (procedure! f32vector-set! ((struct f32vector) fixnum number) undefined))
+(f32vector-ref (#(procedure #:enforce) f32vector-ref ((struct f32vector) fixnum) float))
+(f32vector-set! (#(procedure #:enforce) f32vector-set! ((struct f32vector) fixnum number) undefined))
 
-(f32vector? (procedure? (struct f32vector) f32vector? (*) boolean))
+(f32vector? (#(procedure #:predicate (struct f32vector)) f32vector? (*) boolean))
 
-(f64vector (procedure! f64vector (#!rest number) (struct f64vector)))
-(f64vector->blob (procedure! f64vector->blob ((struct f32vector)) blob))
-(f64vector->blob/shared (procedure! f64vector->blob/shared ((struct f64vector)) blob))
-(f64vector->list (procedure! f64vector->list ((struct f64vector)) blob))
+(f64vector (#(procedure #:enforce) f64vector (#!rest number) (struct f64vector)))
+(f64vector->blob (#(procedure #:enforce) f64vector->blob ((struct f32vector)) blob))
+(f64vector->blob/shared (#(procedure #:enforce) f64vector->blob/shared ((struct f64vector)) blob))
+(f64vector->list (#(procedure #:enforce) f64vector->list ((struct f64vector)) blob))
 
-(f64vector-length (procedure! f64vector-length ((struct f64vector)) fixnum)
+(f64vector-length (#(procedure #:enforce) f64vector-length ((struct f64vector)) fixnum)
 		  (((struct f32vector)) (##core#inline "C_u_i_64vector_length" #(1))))
 
-(f64vector-ref (procedure! f64vector-ref ((struct f64vector) fixnum) float))
-(f64vector-set! (procedure! f64vector-set! ((struct f64vector) fixnum number) undefined))
-
-(f64vector? (procedure? (struct f64vector) f64vector? (*) boolean))
-
-(list->f32vector (procedure! list->f32vector ((list number)) (struct f32vector)))
-(list->f64vector (procedure! list->f64vector ((list number)) (struct f64vector)))
-(list->s16vector (procedure! list->s16vector ((list fixnum)) (struct s16vector)))
-(list->s32vector (procedure! list->s32vector ((list number)) (struct s32vector)))
-(list->s8vector (procedure! list->s8vector ((list fixnum)) (struct s8vector)))
-(list->u16vector (procedure! list->u16vector ((list fixnum)) (struct u16vector)))
-(list->u32vector (procedure! list->u32vector ((list number)) (struct u32vector)))
-(list->u8vector (procedure! list->u8vector ((list fixnum)) (struct u8vector)))
-(make-f32vector (procedure! make-f32vector (fixnum #!optional * * *) (struct f32vector)))
-(make-f64vector (procedure! make-f64vector (fixnum #!optional * * *) (struct f64vector)))
-(make-s16vector (procedure! make-s16vector (fixnum #!optional * * *) (struct s16vector)))
-(make-s32vector (procedure! make-s32vector (fixnum #!optional * * *) (struct s32vector)))
-(make-s8vector (procedure! make-s8vector (fixnum #!optional * * *) (struct s8vector)))
-(make-u16vector (procedure! make-u16vector (fixnum #!optional * * *) (struct u16vector)))
-(make-u32vector (procedure! make-u32vector (fixnum #!optional * * *) (struct u32vector)))
-(make-u8vector (procedure! make-u8vector (fixnum #!optional * * *) (struct u8vector)))
-(read-u8vector (procedure! read-u8vector (#!optional fixnum port) (struct u8vector)))
-(read-u8vector! (procedure! read-u8vector! (fixnum (struct u8vector) #!optional port fixnum) number))
+(f64vector-ref (#(procedure #:enforce) f64vector-ref ((struct f64vector) fixnum) float))
+(f64vector-set! (#(procedure #:enforce) f64vector-set! ((struct f64vector) fixnum number) undefined))
+
+(f64vector? (#(procedure #:predicate (struct f64vector)) f64vector? (*) boolean))
+
+(list->f32vector (#(procedure #:enforce) list->f32vector ((list number)) (struct f32vector)))
+(list->f64vector (#(procedure #:enforce) list->f64vector ((list number)) (struct f64vector)))
+(list->s16vector (#(procedure #:enforce) list->s16vector ((list fixnum)) (struct s16vector)))
+(list->s32vector (#(procedure #:enforce) list->s32vector ((list number)) (struct s32vector)))
+(list->s8vector (#(procedure #:enforce) list->s8vector ((list fixnum)) (struct s8vector)))
+(list->u16vector (#(procedure #:enforce) list->u16vector ((list fixnum)) (struct u16vector)))
+(list->u32vector (#(procedure #:enforce) list->u32vector ((list number)) (struct u32vector)))
+(list->u8vector (#(procedure #:enforce) list->u8vector ((list fixnum)) (struct u8vector)))
+(make-f32vector (#(procedure #:enforce) make-f32vector (fixnum #!optional * * *) (struct f32vector)))
+(make-f64vector (#(procedure #:enforce) make-f64vector (fixnum #!optional * * *) (struct f64vector)))
+(make-s16vector (#(procedure #:enforce) make-s16vector (fixnum #!optional * * *) (struct s16vector)))
+(make-s32vector (#(procedure #:enforce) make-s32vector (fixnum #!optional * * *) (struct s32vector)))
+(make-s8vector (#(procedure #:enforce) make-s8vector (fixnum #!optional * * *) (struct s8vector)))
+(make-u16vector (#(procedure #:enforce) make-u16vector (fixnum #!optional * * *) (struct u16vector)))
+(make-u32vector (#(procedure #:enforce) make-u32vector (fixnum #!optional * * *) (struct u32vector)))
+(make-u8vector (#(procedure #:enforce) make-u8vector (fixnum #!optional * * *) (struct u8vector)))
+(read-u8vector (#(procedure #:enforce) read-u8vector (#!optional fixnum port) (struct u8vector)))
+(read-u8vector! (#(procedure #:enforce) read-u8vector! (fixnum (struct u8vector) #!optional port fixnum) number))
 (release-number-vector (procedure release-number-vector (*) undefined))
-(s16vector (procedure! s16vector (#!rest fixnum) (struct s16vector)))
-(s16vector->blob (procedure! s16vector->blob ((struct s16vector)) blob))
-(s16vector->blob/shared (procedure! s16vector->blob/shared ((struct s16vector)) blob))
-(s16vector->list (procedure! s16vector->list ((struct s16vector)) (list fixnum)))
+(s16vector (#(procedure #:enforce) s16vector (#!rest fixnum) (struct s16vector)))
+(s16vector->blob (#(procedure #:enforce) s16vector->blob ((struct s16vector)) blob))
+(s16vector->blob/shared (#(procedure #:enforce) s16vector->blob/shared ((struct s16vector)) blob))
+(s16vector->list (#(procedure #:enforce) s16vector->list ((struct s16vector)) (list fixnum)))
 
-(s16vector-length (procedure! s16vector-length ((struct s16vector)) fixnum)
+(s16vector-length (#(procedure #:enforce) s16vector-length ((struct s16vector)) fixnum)
 		  (((struct s16vector)) (##core#inline "C_u_i_16vector_length" #(1))))
 
-(s16vector-ref (procedure! s16vector-ref ((struct s16vector) fixnum) fixnum))
-(s16vector-set! (procedure! s16vector-set! ((struct s16vector) fixnum fixnum) undefined))
+(s16vector-ref (#(procedure #:enforce) s16vector-ref ((struct s16vector) fixnum) fixnum))
+(s16vector-set! (#(procedure #:enforce) s16vector-set! ((struct s16vector) fixnum fixnum) undefined))
 
-(s16vector? (procedure? (struct s16vector) s16vector? (*) boolean))
+(s16vector? (#(procedure #:predicate (struct s16vector)) s16vector? (*) boolean))
 
-(s32vector (procedure! s32vector (#!rest number) (struct s32vector)))
-(s32vector->blob (procedure! s32vector->blob ((struct 32vector)) blob))
-(s32vector->blob/shared (procedure! s32vector->blob/shared ((struct s32vector)) blob))
-(s32vector->list (procedure! s32vector->list ((struct s32vector)) (list number)))
+(s32vector (#(procedure #:enforce) s32vector (#!rest number) (struct s32vector)))
+(s32vector->blob (#(procedure #:enforce) s32vector->blob ((struct 32vector)) blob))
+(s32vector->blob/shared (#(procedure #:enforce) s32vector->blob/shared ((struct s32vector)) blob))
+(s32vector->list (#(procedure #:enforce) s32vector->list ((struct s32vector)) (list number)))
 
-(s32vector-length (procedure! s32vector-length ((struct s32vector)) fixnum)
+(s32vector-length (#(procedure #:enforce) s32vector-length ((struct s32vector)) fixnum)
 		  (((struct s32vector)) (##core#inline "C_u_i_32vector_length" #(1))))
 
-(s32vector-ref (procedure! s32vector-ref ((struct s32vector) fixnum) number))
-(s32vector-set! (procedure! s32vector-set! ((struct s32vector) fixnum number) undefined))
+(s32vector-ref (#(procedure #:enforce) s32vector-ref ((struct s32vector) fixnum) number))
+(s32vector-set! (#(procedure #:enforce) s32vector-set! ((struct s32vector) fixnum number) undefined))
 
-(s32vector? (procedure? (struct s32vector) s32vector? (*) boolean))
+(s32vector? (#(procedure #:predicate (struct s32vector)) s32vector? (*) boolean))
 
-(s8vector (procedure! s8vector (#!rest fixnum) (struct s8vector)))
-(s8vector->blob (procedure! s8vector->blob ((struct s8vector)) blob))
-(s8vector->blob/shared (procedure! s8vector->blob/shared ((struct s8vector)) blob))
-(s8vector->list (procedure! s8vector->list ((struct s8vector)) (list fixnum)))
+(s8vector (#(procedure #:enforce) s8vector (#!rest fixnum) (struct s8vector)))
+(s8vector->blob (#(procedure #:enforce) s8vector->blob ((struct s8vector)) blob))
+(s8vector->blob/shared (#(procedure #:enforce) s8vector->blob/shared ((struct s8vector)) blob))
+(s8vector->list (#(procedure #:enforce) s8vector->list ((struct s8vector)) (list fixnum)))
 
-(s8vector-length (procedure! s8vector-length ((struct s8vector)) fixnum)
+(s8vector-length (#(procedure #:enforce) s8vector-length ((struct s8vector)) fixnum)
 		 (((struct s8vector)) (##core#inline "C_u_i_8vector_length" #(1))))
 
-(s8vector-ref (procedure! s8vector-ref ((struct s8vector) fixnum) fixnum))
-(s8vector-set! (procedure! s8vector-set! ((struct s8vector) fixnum fixnum) undefined))
-
-(s8vector? (procedure? (struct s8vector) s8vector? (*) boolean))
-
-(subf32vector (procedure! subf32vector ((struct f32vector) fixnum fixnum) (struct f32vector)))
-(subf64vector (procedure! subf64vector ((struct f64vector) fixnum fixnum) (struct f64vector)))
-(subs16vector (procedure! subs16vector ((struct s16vector) fixnum fixnum) (struct s16vector)))
-(subs32vector (procedure! subs32vector ((struct s32vector) fixnum fixnum) (struct s32vector)))
-(subs8vector (procedure! subs8vector  ((struct s8vector) fixnum fixnum) (struct s8vector)))
-(subu16vector (procedure! subu16vector ((struct u16vector) fixnum fixnum) (struct u16vector)))
-(subu32vector (procedure! subu32vector ((struct u32vector) fixnum fixnum) (struct u32vector)))
-(subu8vector (procedure! subu8vector ((struct u8vector) fixnum fixnum) (struct u8vector)))
-(u16vector (procedure! u16vector (#!rest fixnum) (struct u16vector)))
-(u16vector->blob (procedure! u16vector->blob ((struct u16vector)) blob))
-(u16vector->blob/shared (procedure! u16vector->blob/shared ((struct u16vector)) blob))
-(u16vector->list (procedure! u16vector->list ((struct u16vector)) (list fixnum)))
-
-(u16vector-length (procedure! u16vector-length ((struct u16vector)) fixnum)
+(s8vector-ref (#(procedure #:enforce) s8vector-ref ((struct s8vector) fixnum) fixnum))
+(s8vector-set! (#(procedure #:enforce) s8vector-set! ((struct s8vector) fixnum fixnum) undefined))
+
+(s8vector? (#(procedure #:predicate (struct s8vector)) s8vector? (*) boolean))
+
+(subf32vector (#(procedure #:enforce) subf32vector ((struct f32vector) fixnum fixnum) (struct f32vector)))
+(subf64vector (#(procedure #:enforce) subf64vector ((struct f64vector) fixnum fixnum) (struct f64vector)))
+(subs16vector (#(procedure #:enforce) subs16vector ((struct s16vector) fixnum fixnum) (struct s16vector)))
+(subs32vector (#(procedure #:enforce) subs32vector ((struct s32vector) fixnum fixnum) (struct s32vector)))
+(subs8vector (#(procedure #:enforce) subs8vector  ((struct s8vector) fixnum fixnum) (struct s8vector)))
+(subu16vector (#(procedure #:enforce) subu16vector ((struct u16vector) fixnum fixnum) (struct u16vector)))
+(subu32vector (#(procedure #:enforce) subu32vector ((struct u32vector) fixnum fixnum) (struct u32vector)))
+(subu8vector (#(procedure #:enforce) subu8vector ((struct u8vector) fixnum fixnum) (struct u8vector)))
+(u16vector (#(procedure #:enforce) u16vector (#!rest fixnum) (struct u16vector)))
+(u16vector->blob (#(procedure #:enforce) u16vector->blob ((struct u16vector)) blob))
+(u16vector->blob/shared (#(procedure #:enforce) u16vector->blob/shared ((struct u16vector)) blob))
+(u16vector->list (#(procedure #:enforce) u16vector->list ((struct u16vector)) (list fixnum)))
+
+(u16vector-length (#(procedure #:enforce) u16vector-length ((struct u16vector)) fixnum)
 		  (((struct u16vector)) (##core#inline "C_u_i_16vector_length" #(1))))
 
-(u16vector-ref (procedure! u16vector-ref ((struct u16vector) fixnum) fixnum))
-(u16vector-set! (procedure! u16vector-set! ((struct u16vector) fixnum fixnum) undefined))
+(u16vector-ref (#(procedure #:enforce) u16vector-ref ((struct u16vector) fixnum) fixnum))
+(u16vector-set! (#(procedure #:enforce) u16vector-set! ((struct u16vector) fixnum fixnum) undefined))
 
-(u16vector? (procedure? (struct u16vector) u16vector? (*) boolean))
+(u16vector? (#(procedure #:predicate (struct u16vector)) u16vector? (*) boolean))
 
-(u32vector (procedure! u32vector (#!rest number) (struct u32vector)))
-(u32vector->blob (procedure! u32vector->blob ((struct u32vector)) blob))
-(u32vector->blob/shared (procedure! u32vector->blob/shared ((struct u32vector)) blob))
-(u32vector->list (procedure! u32vector->list ((struct u32vector)) (list number)))
+(u32vector (#(procedure #:enforce) u32vector (#!rest number) (struct u32vector)))
+(u32vector->blob (#(procedure #:enforce) u32vector->blob ((struct u32vector)) blob))
+(u32vector->blob/shared (#(procedure #:enforce) u32vector->blob/shared ((struct u32vector)) blob))
+(u32vector->list (#(procedure #:enforce) u32vector->list ((struct u32vector)) (list number)))
 
-(u32vector-length (procedure! u32vector-length ((struct u32vector)) fixnum)
+(u32vector-length (#(procedure #:enforce) u32vector-length ((struct u32vector)) fixnum)
 		  (((struct u32vector)) (##core#inline "C_u_i_32vector_length" #(1))))
 
-(u32vector-ref (procedure! u32vector-ref ((struct u32vector) fixnum) number))
-(u32vector-set! (procedure! u32vector-set! ((struct u32vector) fixnum number) undefined))
+(u32vector-ref (#(procedure #:enforce) u32vector-ref ((struct u32vector) fixnum) number))
+(u32vector-set! (#(procedure #:enforce) u32vector-set! ((struct u32vector) fixnum number) undefined))
 
-(u32vector? (procedure? (struct u32vector) u32vector? (*) boolean))
+(u32vector? (#(procedure #:predicate (struct u32vector)) u32vector? (*) boolean))
 
-(u8vector (procedure! u8vector (#!rest fixnum) (struct u8vector)))
-(u8vector->blob (procedure! u8vector->blob ((struct u8vector)) blob))
-(u8vector->blob/shared (procedure! u8vector->blob/shared ((struct u8vector)) blob))
-(u8vector->list (procedure! u8vector->list ((struct u8vector)) (list fixnum)))
+(u8vector (#(procedure #:enforce) u8vector (#!rest fixnum) (struct u8vector)))
+(u8vector->blob (#(procedure #:enforce) u8vector->blob ((struct u8vector)) blob))
+(u8vector->blob/shared (#(procedure #:enforce) u8vector->blob/shared ((struct u8vector)) blob))
+(u8vector->list (#(procedure #:enforce) u8vector->list ((struct u8vector)) (list fixnum)))
 
-(u8vector-length (procedure! u8vector-length ((struct u8vector)) fixnum)
+(u8vector-length (#(procedure #:enforce) u8vector-length ((struct u8vector)) fixnum)
 		 (((struct u8vector)) (##core#inline "C_u_i_8vector_length" #(1))))
 
-(u8vector-ref (procedure! u8vector-ref ((struct u8vector) fixnum) fixnum))
-(u8vector-set! (procedure! u8vector-set! ((struct u8vector) fixnum fixnum) undefined))
+(u8vector-ref (#(procedure #:enforce) u8vector-ref ((struct u8vector) fixnum) fixnum))
+(u8vector-set! (#(procedure #:enforce) u8vector-set! ((struct u8vector) fixnum fixnum) undefined))
 
-(u8vector? (procedure? (struct u8vector) u8vector? (*) boolean))
+(u8vector? (#(procedure #:predicate (struct u8vector)) u8vector? (*) boolean))
 
-(write-u8vector (procedure! write-u8vector ((struct u8vector) #!optional port fixnum fixnum) undefined))
+(write-u8vector (#(procedure #:enforce) write-u8vector ((struct u8vector) #!optional port fixnum fixnum) undefined))
 
 
 ;; srfi-69
 
-(alist->hash-table (procedure! alist->hash-table ((list pair) #!rest) (struct hash-table)))
-(eq?-hash (procedure! eq?-hash (* #!optional fixnum) fixnum))
-(equal?-hash (procedure! equal?-hash (* #!optional fixnum) fixnum))
-(eqv?-hash (procedure! eqv?-hash (* #!optional fixnum) fixnum))
-(hash (procedure! hash (* #!optional fixnum) fixnum))
-(hash-by-identity (procedure! hash-by-identity (* #!optional fixnum) fixnum))
-(hash-table->alist (procedure! hash-table->alist ((struct hash-table)) (list pair)))
-(hash-table-clear! (procedure! hash-table-clear! ((struct hash-table)) undefined))
-(hash-table-copy (procedure! hash-table-copy ((struct hash-table)) (struct hash-table)))
-(hash-table-delete! (procedure! hash-table-delete! ((struct hash-table) *) boolean))
-(hash-table-equivalence-function (procedure! hash-table-equivalence-function ((struct hash-table)) (procedure (* *) *)))
-(hash-table-exists? (procedure! hash-table-exists? ((struct hash-table) *) boolean))
-(hash-table-fold (procedure! hash-table-fold ((struct hash-table) (procedure (* * *) *) *) *))
-(hash-table-for-each (procedure! hash-table-for-each ((struct hash-table) (procedure (* *) . *)) undefined))
-
-(hash-table-has-initial? (procedure! hash-table-has-initial? ((struct hash-table)) boolean)
+(alist->hash-table (#(procedure #:enforce) alist->hash-table ((list pair) #!rest) (struct hash-table)))
+(eq?-hash (#(procedure #:enforce) eq?-hash (* #!optional fixnum) fixnum))
+(equal?-hash (#(procedure #:enforce) equal?-hash (* #!optional fixnum) fixnum))
+(eqv?-hash (#(procedure #:enforce) eqv?-hash (* #!optional fixnum) fixnum))
+(hash (#(procedure #:enforce) hash (* #!optional fixnum) fixnum))
+(hash-by-identity (#(procedure #:enforce) hash-by-identity (* #!optional fixnum) fixnum))
+(hash-table->alist (#(procedure #:enforce) hash-table->alist ((struct hash-table)) (list pair)))
+(hash-table-clear! (#(procedure #:enforce) hash-table-clear! ((struct hash-table)) undefined))
+(hash-table-copy (#(procedure #:enforce) hash-table-copy ((struct hash-table)) (struct hash-table)))
+(hash-table-delete! (#(procedure #:enforce) hash-table-delete! ((struct hash-table) *) boolean))
+(hash-table-equivalence-function (#(procedure #:enforce) hash-table-equivalence-function ((struct hash-table)) (procedure (* *) *)))
+(hash-table-exists? (#(procedure #:enforce) hash-table-exists? ((struct hash-table) *) boolean))
+(hash-table-fold (#(procedure #:enforce) hash-table-fold ((struct hash-table) (procedure (* * *) *) *) *))
+(hash-table-for-each (#(procedure #:enforce) hash-table-for-each ((struct hash-table) (procedure (* *) . *)) undefined))
+
+(hash-table-has-initial? (#(procedure #:enforce) hash-table-has-initial? ((struct hash-table)) boolean)
 			 (((struct hash-table)) (##sys#slot #(1) '9))) ;XXX might return other than #t
 
-(hash-table-hash-function (procedure! hash-table-hash-function ((struct hash-table)) (procedure (* fixnum) fixnum))
+(hash-table-hash-function (#(procedure #:enforce) hash-table-hash-function ((struct hash-table)) (procedure (* fixnum) fixnum))
 			  (((struct hash-table)) (##sys#slot #(1) '4)))
 
-(hash-table-initial (procedure! hash-table-initial ((struct hash-table)) *))
-(hash-table-keys (procedure! hash-table-keys ((struct hash-table)) list))
-(hash-table-map (procedure! hash-table-map ((struct hash-table) (procedure (* *) *)) list))
+(hash-table-initial (#(procedure #:enforce) hash-table-initial ((struct hash-table)) *))
+(hash-table-keys (#(procedure #:enforce) hash-table-keys ((struct hash-table)) list))
+(hash-table-map (#(procedure #:enforce) hash-table-map ((struct hash-table) (procedure (* *) *)) list))
 
-(hash-table-max-load (procedure! hash-table-max-load ((struct hash-table)) fixnum)
+(hash-table-max-load (#(procedure #:enforce) hash-table-max-load ((struct hash-table)) fixnum)
 		     (((struct hash-table)) (##sys#slot #(1) '6)))
 
-(hash-table-merge (procedure! hash-table-merge ((struct hash-table) (struct hash-table)) (struct hash-table)))
-(hash-table-merge! (procedure! hash-table-merge! ((struct hash-table) (struct hash-table)) undefined))
+(hash-table-merge (#(procedure #:enforce) hash-table-merge ((struct hash-table) (struct hash-table)) (struct hash-table)))
+(hash-table-merge! (#(procedure #:enforce) hash-table-merge! ((struct hash-table) (struct hash-table)) undefined))
 
-(hash-table-min-load (procedure! hash-table-min-load ((struct hash-table)) fixnum)
+(hash-table-min-load (#(procedure #:enforce) hash-table-min-load ((struct hash-table)) fixnum)
 		     (((struct hash-table)) (##sys#slot #(1) '5)))
 
-(hash-table-ref (procedure! hash-table-ref ((struct hash-table) * #!optional (procedure () *)) *))
-(hash-table-ref/default (procedure! hash-table-ref/default ((struct hash-table) * *) *))
-(hash-table-remove! (procedure! hash-table-remove! ((struct hash-table) (procedure (* *) *)) undefined))
-(hash-table-set! (procedure! hash-table-set! ((struct hash-table) * *) undefined))
+(hash-table-ref (#(procedure #:enforce) hash-table-ref ((struct hash-table) * #!optional (procedure () *)) *))
+(hash-table-ref/default (#(procedure #:enforce) hash-table-ref/default ((struct hash-table) * *) *))
+(hash-table-remove! (#(procedure #:enforce) hash-table-remove! ((struct hash-table) (procedure (* *) *)) undefined))
+(hash-table-set! (#(procedure #:enforce) hash-table-set! ((struct hash-table) * *) undefined))
 
-(hash-table-size (procedure! hash-table-size ((struct hash-table)) fixnum)
+(hash-table-size (#(procedure #:enforce) hash-table-size ((struct hash-table)) fixnum)
 		 (((struct hash-table)) (##sys#slot #(1) '2)))
 
-(hash-table-update! (procedure! hash-table-update! ((struct hash-table) * (procedure (*) *) #!optional (procedure () *)) *))
-(hash-table-update!/default (procedure! hash-table-update!/default ((struct hash-table) * (procedure (*) *) *) *))
-(hash-table-values (procedure! hash-table-values ((struct hash-table)) list))
-(hash-table-walk (procedure! hash-table-walk ((struct hash-table) (procedure (* *) . *)) undefined))
+(hash-table-update! (#(procedure #:enforce) hash-table-update! ((struct hash-table) * (procedure (*) *) #!optional (procedure () *)) *))
+(hash-table-update!/default (#(procedure #:enforce) hash-table-update!/default ((struct hash-table) * (procedure (*) *) *) *))
+(hash-table-values (#(procedure #:enforce) hash-table-values ((struct hash-table)) list))
+(hash-table-walk (#(procedure #:enforce) hash-table-walk ((struct hash-table) (procedure (* *) . *)) undefined))
 
-(hash-table-weak-keys (procedure! hash-table-weak-keys ((struct hash-table)) boolean)
+(hash-table-weak-keys (#(procedure #:enforce) hash-table-weak-keys ((struct hash-table)) boolean)
 		      (((struct hash-table)) (##sys#slot #(1) '7)))
 
-(hash-table-weak-values (procedure! hash-table-weak-values ((struct hash-table)) boolean)
+(hash-table-weak-values (#(procedure #:enforce) hash-table-weak-values ((struct hash-table)) boolean)
 			(((struct hash-table)) (##sys#slot #(1) '8)))
 
-(hash-table? (procedure? (struct hash-table) hash-table? (*) boolean))
+(hash-table? (#(procedure #:predicate (struct hash-table)) hash-table? (*) boolean))
 
 ;;XXX if we want to hardcode hash-default-bound here, we could rewrite the 1-arg case...
 ;     (applies to all hash-functions)
-(keyword-hash (procedure! keyword-hash (* #!optional fixnum) fixnum))
+(keyword-hash (#(procedure #:enforce) keyword-hash (* #!optional fixnum) fixnum))
 
-(make-hash-table (procedure! make-hash-table (#!rest) (struct hash-table)))
-(number-hash (procedure! number-hash (fixnum #!optional fixnum) fixnum))
-(object-uid-hash (procedure! object-uid-hash (* #!optional fixnum) fixnum))
-(symbol-hash (procedure! symbol-hash (symbol #!optional fixnum) fixnum))
-(string-hash (procedure! string-hash (string #!optional fixnum fixnum fixnum) number))
-(string-hash-ci (procedure! string-hash-ci (string #!optional fixnum fixnum fixnum) number))
-(string-ci-hash (procedure! string-ci-hash (string #!optional fixnum fixnum fixnum) number))
+(make-hash-table (#(procedure #:enforce) make-hash-table (#!rest) (struct hash-table)))
+(number-hash (#(procedure #:enforce) number-hash (fixnum #!optional fixnum) fixnum))
+(object-uid-hash (#(procedure #:enforce) object-uid-hash (* #!optional fixnum) fixnum))
+(symbol-hash (#(procedure #:enforce) symbol-hash (symbol #!optional fixnum) fixnum))
+(string-hash (#(procedure #:enforce) string-hash (string #!optional fixnum fixnum fixnum) number))
+(string-hash-ci (#(procedure #:enforce) string-hash-ci (string #!optional fixnum fixnum fixnum) number))
+(string-ci-hash (#(procedure #:enforce) string-ci-hash (string #!optional fixnum fixnum fixnum) number))
 
 
 ;; tcp
 
-(tcp-abandon-port (procedure! tcp-abandon-port (port) undefined))
-(tcp-accept (procedure! tcp-accept ((struct tcp-listener)) port port))
-(tcp-accept-ready? (procedure! tcp-accept-ready? ((struct tcp-listener)) boolean))
-(tcp-accept-timeout (procedure! tcp-accept-timeout (#!optional number) number))
-(tcp-addresses (procedure! tcp-addresses (port) string string))
-(tcp-buffer-size (procedure! tcp-buffer-size (#!optional fixnum) fixnum))
-(tcp-close (procedure! tcp-close ((struct tcp-listener)) undefined))
-(tcp-connect (procedure! tcp-connect (string #!optional fixnum) port port))
-(tcp-connect-timeout (procedure! tcp-connect-timeout (#!optional number) number))
-(tcp-listen (procedure! tcp-listen (fixnum #!optional fixnum *) (struct tcp-listener)))
-
-(tcp-listener-fileno (procedure! tcp-listener-fileno ((struct tcp-listener)) fixnum)
+(tcp-abandon-port (#(procedure #:enforce) tcp-abandon-port (port) undefined))
+(tcp-accept (#(procedure #:enforce) tcp-accept ((struct tcp-listener)) port port))
+(tcp-accept-ready? (#(procedure #:enforce) tcp-accept-ready? ((struct tcp-listener)) boolean))
+(tcp-accept-timeout (#(procedure #:enforce) tcp-accept-timeout (#!optional number) number))
+(tcp-addresses (#(procedure #:enforce) tcp-addresses (port) string string))
+(tcp-buffer-size (#(procedure #:enforce) tcp-buffer-size (#!optional fixnum) fixnum))
+(tcp-close (#(procedure #:enforce) tcp-close ((struct tcp-listener)) undefined))
+(tcp-connect (#(procedure #:enforce) tcp-connect (string #!optional fixnum) port port))
+(tcp-connect-timeout (#(procedure #:enforce) tcp-connect-timeout (#!optional number) number))
+(tcp-listen (#(procedure #:enforce) tcp-listen (fixnum #!optional fixnum *) (struct tcp-listener)))
+
+(tcp-listener-fileno (#(procedure #:enforce) tcp-listener-fileno ((struct tcp-listener)) fixnum)
 		     (((struct tcp-listener)) (##sys#slot #(1) '1)))
 
-(tcp-listener-port (procedure! tcp-listener-port ((struct tcp-listener)) fixnum))
+(tcp-listener-port (#(procedure #:enforce) tcp-listener-port ((struct tcp-listener)) fixnum))
 
-(tcp-listener? (procedure? (struct tcp-listener) tcp-listener? (*) boolean))
+(tcp-listener? (#(procedure #:predicate (struct tcp-listener)) tcp-listener? (*) boolean))
 
-(tcp-port-numbers (procedure! tcp-port-numbers (port) fixnum fixnum))
-(tcp-read-timeout (procedure! tcp-read-timeout (#!optional number) number))
-(tcp-write-timeout (procedure! tcp-write-timeout (#!optional number) number))
+(tcp-port-numbers (#(procedure #:enforce) tcp-port-numbers (port) fixnum fixnum))
+(tcp-read-timeout (#(procedure #:enforce) tcp-read-timeout (#!optional number) number))
+(tcp-write-timeout (#(procedure #:enforce) tcp-write-timeout (#!optional number) number))
 
 
 ;; utils
 
 (for-each-argv-line deprecated)
 (for-each-line deprecated)
-(read-all (procedure! read-all (#!optional (or port string)) string))
-(system* (procedure! system* (string #!rest) undefined))
-(qs (procedure! qs (string) string))
-(compile-file (procedure! compile-file (string #!rest) (or boolean string)))
-(compile-file-options (procedure! compile-file-options (#!optional (list string)) (list string)))
-(scan-input-lines (procedure! scan-input-lines (* #!optional port) *))
-(yes-or-no? (procedure! yes-or-no? (string #!rest) *))
+(read-all (#(procedure #:enforce) read-all (#!optional (or port string)) string))
+(system* (#(procedure #:enforce) system* (string #!rest) undefined))
+(qs (#(procedure #:enforce) qs (string) string))
+(compile-file (#(procedure #:enforce) compile-file (string #!rest) (or boolean string)))
+(compile-file-options (#(procedure #:enforce) compile-file-options (#!optional (list string)) (list string)))
+(scan-input-lines (#(procedure #:enforce) scan-input-lines (* #!optional port) *))
+(yes-or-no? (#(procedure #:enforce) yes-or-no? (string #!rest) *))
Trap