diff -rN -u old-termite/termite.scm new-termite/termite.scm
--- old-termite/termite.scm	2008-04-30 03:31:41.000000000 +0200
+++ new-termite/termite.scm	2008-04-30 03:31:41.000000000 +0200
@@ -4,7 +4,7 @@
 
 ;; this is the main file for the Termite system
 
-(declare (block))
+(declare (block) (standard-bindings) (extended-bindings))
 
 ;; ----------------------------------------------------------------------------
 
@@ -154,7 +154,7 @@
   (make-upid service-name node))
 
 (define (base-exception-handler e)
-  (##continuation-capture
+  (continuation-capture
    (lambda (k)
      (let ((log-crash 
             (lambda (e)
@@ -163,11 +163,11 @@
                (call-with-output-string ""
                  (lambda (port)
                    (display "#|\n" port)
-                   (##display-exception-in-context
+                   (display-exception-in-context
                     e
                     k
                     port)
-                   (##cmd-b 0 k port)
+                   (##cmd-b k port 0) ;; todo offer safe access?
                    (display "|#\n" port)))))))
        (cond
         ;; Propagated Termite exception?
@@ -934,7 +934,7 @@
 (define (init-from-shell-script)
   (with-exception-catcher
    (lambda (e)
-     (##display-exception e (current-error-port))
+     (display-exception e (current-error-port))
      (error (string-append "usage: "
                            (car (command-line))
                            " [ip-address [tcp port#]]")))

