use scheme-with-scsh where appropriate.

scheme/httpd/surflets/packages.scm

@@ -208,8 +208,7 @@
 	let-opt				;:OPTIONAL
 	handle-fatal-error
 	(subset sunet-utilities (get-header)) ; GET-HEADER
-	scsh
-	scheme)
+	scheme-with-scsh)
   (files surflets))
 
 (define-interface surflet-interface
@@ -268,8 +267,7 @@
 	srfi-13
 	srfi-1
 	locks
-	scsh
-	scheme)
+	scheme-with-scsh)
   (files profile))
 
 (define-interface simple-surflet-api-interface
@@ -287,8 +285,7 @@
 	  extract))
 
 (define-structure simple-surflet-api simple-surflet-api-interface
-  (open scsh
-	scheme
+  (open scheme-with-scsh
 	define-record-types
 	let-opt
 	surflets