diff --git a/scheme/httpd/surflets/web-server/root/surflets/add.scm b/scheme/httpd/surflets/web-server/root/surflets/add.scm
index ce4d166..65a4a5b 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/add.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/add.scm
@@ -3,8 +3,7 @@
 	httpd-requests
 	httpd-responses
 	url
-	scsh
-	scheme)
+	scheme-with-scsh)
   (begin
 
     (define (get-number input-text . maybe-title)
diff --git a/scheme/httpd/surflets/web-server/root/surflets/add2.scm b/scheme/httpd/surflets/web-server/root/surflets/add2.scm
index 6b2e295..7b1fc5e 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/add2.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/add2.scm
@@ -4,8 +4,7 @@
 	url
 	handle-fatal-error
 	let-opt
-	scsh
-	scheme)
+	scheme-with-scsh)
   (begin
 
     (define number-input-field (make-number-input-field '(@ (maxlength 10))))
diff --git a/scheme/httpd/surflets/web-server/root/surflets/admin-handler.scm b/scheme/httpd/surflets/web-server/root/surflets/admin-handler.scm
index 48bc97a..1c4262d 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/admin-handler.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/admin-handler.scm
@@ -1,6 +1,5 @@
 (define-structure servlet servlet-interface
-  (open scsh
-	scheme
+  (open scheme-with-scsh
 	handle-fatal-error
 	let-opt
 	servlets
diff --git a/scheme/httpd/surflets/web-server/root/surflets/admin-profiling.scm b/scheme/httpd/surflets/web-server/root/surflets/admin-profiling.scm
index 671ca9e..39778c4 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/admin-profiling.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/admin-profiling.scm
@@ -1,6 +1,5 @@
 (define-structure servlet servlet-interface
-  (open scsh
-	scheme
+  (open scheme-with-scsh
 	servlets
 	servlet-handler/admin
 	profiling
diff --git a/scheme/httpd/surflets/web-server/root/surflets/admin-servlets-cb.scm b/scheme/httpd/surflets/web-server/root/surflets/admin-servlets-cb.scm
index a13ceb5..0b29baa 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/admin-servlets-cb.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/admin-servlets-cb.scm
@@ -1,6 +1,5 @@
 (define-structure servlet servlet-interface
-  (open scsh
-	scheme
+  (open scheme-with-scsh
 	servlets
 	servlet-handler/admin
 	httpd-responses
diff --git a/scheme/httpd/surflets/web-server/root/surflets/admin-servlets.scm b/scheme/httpd/surflets/web-server/root/surflets/admin-servlets.scm
index d347c38..999e317 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/admin-servlets.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/admin-servlets.scm
@@ -1,6 +1,5 @@
 (define-structure servlet servlet-interface
-  (open scsh
-	scheme
+  (open scheme-with-scsh
 	servlets
 	servlet-handler/admin
 	httpd-responses
diff --git a/scheme/httpd/surflets/web-server/root/surflets/admin.scm b/scheme/httpd/surflets/web-server/root/surflets/admin.scm
index 5d374f2..5a0b7cd 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/admin.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/admin.scm
@@ -1,6 +1,5 @@
 (define-structure servlet servlet-interface
-  (open scsh
-	scheme
+  (open scheme-with-scsh
 	servlets
 	servlet-handler/admin
 	)
diff --git a/scheme/httpd/surflets/web-server/root/surflets/byte-input.scm b/scheme/httpd/surflets/web-server/root/surflets/byte-input.scm
index 818da67..c2032bf 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/byte-input.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/byte-input.scm
@@ -3,8 +3,7 @@
 	httpd-requests
 	handle-fatal-error
 	url
-	scsh
-	scheme)
+	scheme-with-scsh)
   (begin
 
     ;; This doesn't use c-a-l-l-b-a-c-k-s anymore.
diff --git a/scheme/httpd/surflets/web-server/root/surflets/calculate-cb.scm b/scheme/httpd/surflets/web-server/root/surflets/calculate-cb.scm
index 66442d9..8a0ccba 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/calculate-cb.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/calculate-cb.scm
@@ -3,8 +3,7 @@
 	httpd-requests
 	handle-fatal-error
 	let-opt
-	scsh
-	scheme)
+	scheme-with-scsh)
   (begin
 
     ;; This uses callbacks.
diff --git a/scheme/httpd/surflets/web-server/root/surflets/calculate.scm b/scheme/httpd/surflets/web-server/root/surflets/calculate.scm
index 4b58dd4..0df69f5 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/calculate.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/calculate.scm
@@ -3,8 +3,7 @@
 	httpd-requests
 	handle-fatal-error
 	let-opt
-	scsh
-	scheme)
+	scheme-with-scsh)
   (begin
 
     ;; This doesn't use c-a-l-l-b-a-c-k-s anymore.
diff --git a/scheme/httpd/surflets/web-server/root/surflets/news.scm b/scheme/httpd/surflets/web-server/root/surflets/news.scm
index bb0a879..1f794ed 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/news.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/news.scm
@@ -1,6 +1,5 @@
 (define-structure servlet servlet-interface
-  (open scsh
-	scheme
+  (open scheme-with-scsh
 	servlets
 	crlf-io)
   (begin
diff --git a/scheme/httpd/surflets/web-server/root/surflets/simple-servlet.scm b/scheme/httpd/surflets/web-server/root/surflets/simple-servlet.scm
index 77f3c63..82489c3 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/simple-servlet.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/simple-servlet.scm
@@ -1,6 +1,5 @@
 (define-structure servlet servlet-interface
-  (open scsh
-	scheme
+  (open scheme-with-scsh
 	simple-servlet-api)
   (begin
     
diff --git a/scheme/httpd/surflets/web-server/root/surflets/spaceship.scm b/scheme/httpd/surflets/web-server/root/surflets/spaceship.scm
index 55b7839..2a76976 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/spaceship.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/spaceship.scm
@@ -1,6 +1,5 @@
 (define-structure servlet servlet-interface
-  (open scsh
-	scheme
+  (open scheme-with-scsh
 	servlets
 	let-opt
 	receiving