diff --git a/scheme/httpd/cgi-server.scm b/scheme/httpd/cgi-server.scm
index 4dda10e..0cdd873 100644
--- a/scheme/httpd/cgi-server.scm
+++ b/scheme/httpd/cgi-server.scm
@@ -270,12 +270,11 @@
 	 ctype
 	 extra-headers
 	 (make-writer-body
-	  (lambda (out options)		; what about status?
+	  (lambda (out options)
 	    (copy-inport->outport script-port out)
 	    (close-input-port script-port)))))))
 
 
-;; shouldn't this be in uri?
 (define (uri-has-protocol? loc)
   (receive (proto path search frag)
       (parse-uri loc)
@@ -284,7 +283,7 @@
 (define (extract-status-code-and-text stat-lines req)
   (cond 
    ((not (pair? stat-lines))	    ; No status header.
-    (cons 200 "The idiot CGI script left out the status line."))
+    (cons http-status/ok "The idiot CGI script left out the status line."))
    ((null? (cdr stat-lines)) 	    ; One line status header.
     (with-fatal-error-handler*
        (lambda (c d)