diff --git a/collects/web-server/prototype-web-server/servlets/add01.ss b/collects/web-server/prototype-web-server/servlets/add01.ss
index 2b7a83cc3d..a68c40d852 100644
--- a/collects/web-server/prototype-web-server/servlets/add01.ss
+++ b/collects/web-server/prototype-web-server/servlets/add01.ss
@@ -1,10 +1,10 @@
 (module add01 mzscheme
   (require (lib "session.ss" "web-server" "prototype-web-server")
-           (lib "request.ss" "web-server" "private")
            (lib "request-structs.ss" "web-server")
            (lib "url.ss" "net"))
+  (provide start)
 
-  (define (dispatch req)
+  (define (start req)
     (let* ([uri (request-uri req)]
            [qry (url-query uri)])
       (cond
@@ -35,8 +35,4 @@
                         [method "get"] [enctype "application/x-www-form-urlencoded"])
                          "Enter the first number to add: "
                          (input ([type "text"] [name "first"] [value ""]))
-                         (input ([type "submit"] [name "enter"] [value "Enter"])))))])))
-
-  (start-session dispatch))
-
-    
\ No newline at end of file
+                         (input ([type "submit"] [name "enter"] [value "Enter"])))))]))))
\ No newline at end of file
diff --git a/collects/web-server/prototype-web-server/servlets/add02.ss b/collects/web-server/prototype-web-server/servlets/add02.ss
index 1946dcd2e7..c5a7b5a2a4 100644
--- a/collects/web-server/prototype-web-server/servlets/add02.ss
+++ b/collects/web-server/prototype-web-server/servlets/add02.ss
@@ -1,13 +1,15 @@
-(module add02 (lib "web-interaction.ss" "web-server" "prototype-web-server")
+(module add02 (lib "lang.ss" "web-server" "prototype-web-server")
   (require (lib "url.ss" "net")
-           (lib "request.ss" "web-server" "private")
            (lib "request-structs.ss" "web-server"))
+  (provide start)
+  
+  ;; XXX This demonstrates that if we hide the K in a query, it will be overridden.
   
   ;; get-number-from-user: string -> number
   ;; ask the user for a number
   (define (gn msg)
     (let ([req
-           (send/suspend
+           (send/suspend/url
             (lambda (k-url)
               `(hmtl (head (title ,(format "Get ~a number" msg)))
                      (body
@@ -20,7 +22,7 @@
       (string->number
        (cdr (assoc 'number (url-query (request-uri req)))))))
   
-  (let ([initial-request (start-servlet)])
+  (define (start initial-request)
     `(html (head (title "Final Page"))
            (body
             (h1 "Final Page")
diff --git a/collects/web-server/prototype-web-server/servlets/add03.ss b/collects/web-server/prototype-web-server/servlets/add03.ss
index 5457699399..f5dcdfc4e8 100644
--- a/collects/web-server/prototype-web-server/servlets/add03.ss
+++ b/collects/web-server/prototype-web-server/servlets/add03.ss
@@ -1,7 +1,7 @@
-(module add03 (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server")
+(module add03 (lib "lang.ss" "web-server" "prototype-web-server")
   (require (lib "url.ss" "net")
-           (lib "servlet-helpers.ss" "web-server" "private")
-           (lib "request-structs.ss" "web-server"))
+           (lib "servlet-helpers.ss" "web-server" "private"))
+  (provide start)
   
   ;; get-number-from-user: string -> number
   ;; ask the user for a number
@@ -23,7 +23,7 @@
         'number
         (request-bindings req)))))
   
-  (let ([initial-request (start-servlet)])
+  (define (start initial-request)
     `(html (head (title "Final Page"))
            (body
             (h1 "Final Page")
diff --git a/collects/web-server/prototype-web-server/servlets/add04.ss b/collects/web-server/prototype-web-server/servlets/add04.ss
index bc9fdd86e5..9790fec723 100644
--- a/collects/web-server/prototype-web-server/servlets/add04.ss
+++ b/collects/web-server/prototype-web-server/servlets/add04.ss
@@ -1,6 +1,7 @@
-(module add04 (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server")
+(module add04 (lib "lang.ss" "web-server" "prototype-web-server")
   (require (lib "url.ss" "net")
            (lib "servlet-helpers.ss" "web-server" "private"))
+  (provide start)
   
   ;; get-number-from-user: string -> number
   ;; ask the user for a number
@@ -21,7 +22,7 @@
         'number
         (request-bindings req)))))
   
-  (let ([initial-request (start-servlet)])
+  (define (start initial-request)
     `(html (head (title "Final Page"))
            (body
             (h1 "Final Page")
diff --git a/collects/web-server/prototype-web-server/servlets/add05.ss b/collects/web-server/prototype-web-server/servlets/add05.ss
index 64072a5f8f..88cf8c16c0 100644
--- a/collects/web-server/prototype-web-server/servlets/add05.ss
+++ b/collects/web-server/prototype-web-server/servlets/add05.ss
@@ -1,6 +1,7 @@
-(module add05 (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server")
+(module add05 (lib "lang.ss" "web-server" "prototype-web-server")
   (require (lib "url.ss" "net")
            (lib "servlet-helpers.ss" "web-server" "private"))
+  (provide start)
   
   ;; get-number-from-user: string -> number
   ;; ask the user for a number
@@ -24,7 +25,7 @@
                       (input ([type "text"] [name "number"] [value ""]))
                       (input ([type "submit"])))))))))  
   
-  (let ([initial-request (start-servlet)])
+  (define (start initial-request)
     `(html (head (title "Final Page"))
            (body
             (h1 "Final Page")
diff --git a/collects/web-server/prototype-web-server/servlets/check-dir.ss b/collects/web-server/prototype-web-server/servlets/check-dir.ss
index e23241e1ed..485e537216 100644
--- a/collects/web-server/prototype-web-server/servlets/check-dir.ss
+++ b/collects/web-server/prototype-web-server/servlets/check-dir.ss
@@ -1,16 +1,16 @@
-(module check-dir (lib "web-interaction.ss" "web-server" "prototype-web-server")
+(module check-dir (lib "lang.ss" "web-server" "prototype-web-server")
   (require (lib "url.ss" "net"))
+  (provide start)
   
   (define (directory-page n)
-    (let ([throw-away
-           (send/suspend
-            (lambda (k-url)
-              `(html (head (title ,(format "Page ~a" n)))
-                     (body
-                      (h1 ,(format "Page ~a" n))
-                      (h2 ,(format "The current directory: ~a" (current-directory)))
-                      (p "Click " (a ([href ,(url->string k-url)]) "here") " to continue.")))))])
-      (directory-page (add1 n))))
+    (send/suspend/url
+     (lambda (k-url)
+       `(html (head (title ,(format "Page ~a" n)))
+              (body
+               (h1 ,(format "Page ~a" n))
+               (h2 ,(format "The current directory: ~a" (current-directory)))
+               (p "Click " (a ([href ,(url->string k-url)]) "here") " to continue.")))))
+    (directory-page (add1 n)))
   
-  (let ([req0 (start-servlet)])
+  (define (start initial-request)
     (directory-page 1)))
\ No newline at end of file
diff --git a/collects/web-server/prototype-web-server/servlets/quiz-lib.ss b/collects/web-server/prototype-web-server/servlets/quiz-lib.ss
index 4b04221270..344c094be2 100644
--- a/collects/web-server/prototype-web-server/servlets/quiz-lib.ss
+++ b/collects/web-server/prototype-web-server/servlets/quiz-lib.ss
@@ -82,5 +82,4 @@
        "love"
        "angular momentum"
        "sex")
-      0)
-     )))
\ No newline at end of file
+      0))))
\ No newline at end of file
diff --git a/collects/web-server/prototype-web-server/servlets/quiz01.ss b/collects/web-server/prototype-web-server/servlets/quiz01.ss
index 9f6026733b..199ea59284 100644
--- a/collects/web-server/prototype-web-server/servlets/quiz01.ss
+++ b/collects/web-server/prototype-web-server/servlets/quiz01.ss
@@ -1,7 +1,7 @@
-(module quiz01 (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server")
+(module quiz01 (lib "lang.ss" "web-server" "prototype-web-server")
   (require "quiz-lib.ss"
-           (lib "url.ss" "net")
            (lib "servlet-helpers.ss" "web-server" "private"))
+  (provide start)
   
   ;; get-answer: mc-question -> number
   ;; get an answer for a multiple choice question
@@ -35,12 +35,11 @@
        (add1 (tally-results (cdr mc-qs) (cdr answs)))]
       [else (tally-results (cdr mc-qs) (cdr answs))]))
   
-  (let ([initial-request (start-servlet)])
+  (define (start initial-request)
     `(html (head (title "Final Page"))
            (body
             (h1 "Quiz Results")
             (p ,(format "You got ~a correct out of ~a questions."
                         (tally-results quiz (get-answers quiz))
                         (length quiz)))
-            (p "Thank you for taking the quiz"))))
-  )
\ No newline at end of file
+            (p "Thank you for taking the quiz")))))
\ No newline at end of file
diff --git a/collects/web-server/prototype-web-server/servlets/quiz02.ss b/collects/web-server/prototype-web-server/servlets/quiz02.ss
index a4726d4d26..feb888e616 100644
--- a/collects/web-server/prototype-web-server/servlets/quiz02.ss
+++ b/collects/web-server/prototype-web-server/servlets/quiz02.ss
@@ -1,6 +1,7 @@
-(module quiz02 (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server")
+(module quiz02 (lib "lang.ss" "web-server" "prototype-web-server")
   (require "quiz-lib.ss"
            (lib "servlet-helpers.ss" "web-server" "private"))
+  (provide start)
   
   ;; get-answer: mc-question -> number
   ;; get an answer for a multiple choice question
@@ -34,12 +35,11 @@
        (add1 (tally-results (cdr mc-qs) (cdr answs)))]
       [else (tally-results (cdr mc-qs) (cdr answs))]))
   
-  (let ([initial-request (start-servlet)])
+  (define (start initial-request)
     `(html (head (title "Final Page"))
            (body
             (h1 "Quiz Results")
             (p ,(format "You got ~a correct out of ~a questions."
                         (tally-results quiz (get-answers (lambda () quiz)))
                         (length quiz)))
-            (p "Thank you for taking the quiz"))))
-  )
\ No newline at end of file
+            (p "Thank you for taking the quiz")))))
\ No newline at end of file
diff --git a/collects/web-server/prototype-web-server/servlets/toobig.ss b/collects/web-server/prototype-web-server/servlets/toobig.ss
index 51eb8ba242..124af0c76a 100644
--- a/collects/web-server/prototype-web-server/servlets/toobig.ss
+++ b/collects/web-server/prototype-web-server/servlets/toobig.ss
@@ -1,6 +1,7 @@
-(module toobig (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server")
+(module toobig (lib "lang.ss" "web-server" "prototype-web-server")
   (require (lib "url.ss" "net")
            (lib "servlet-helpers.ss" "web-server" "private"))
+  (provide start)
   
   (define (get-n)
     (let ([req
@@ -31,7 +32,7 @@
                        (a ([href ,(url->string k-url)]) "OK!")))))])
       the-bytes))
   
-  (let ([initial-request (start-servlet)])
+  (define (start initial-request)
     `(html (head (title "You got here!"))
            (body
             (h1 ,(bytes->string/utf-8 (get-bytes)))))))
\ No newline at end of file