use SCHEME-WITH-SCSH instead of SCSH and SCHEME

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)

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))))

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

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

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

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

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
 	)

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.

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.

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.

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

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
     

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