diff --git a/collects/syntax-color/module-lexer.rkt b/collects/syntax-color/module-lexer.rkt
index 82f733a8a8..50d62272de 100644
--- a/collects/syntax-color/module-lexer.rkt
+++ b/collects/syntax-color/module-lexer.rkt
@@ -1,65 +1,52 @@
-#lang racket/base
-(require racket/port
+#lang scheme/base
+(require scheme/port
          "scheme-lexer.rkt")
 
 (provide module-lexer)
 
-;; mode = (or/c #f 'before-lang-line -- 
-;;              'no-lang-line
-;;              (cons lexer mode)
-;;              lexer)
-
-(define count 0)
-
 (define (module-lexer in offset mode)
-  (set! count (+ count 1))
-  (printf "~a ~s\n" count (list 'module-lexer in offset mode))
   (cond
-    [(or (not mode) (eq? mode 'before-lang-line))
-     (define-values (lexeme type data new-token-start new-token-end) (scheme-lexer in))
-     (printf "before-lang-line lexeme ~s type ~s\n" lexeme type)
-     (cond
-       [(or (eq? type 'comment) (eq? type 'whitespace))
-        (values lexeme 'other data new-token-start new-token-end 0 'before-lang-line)]
-       [else
-        ;; look for #lang:
-        (define p (peeking-input-port in))
-        (port-count-lines! p)
-        (define init (file-position p))
-        (define get-info (with-handlers ([exn:fail:read? values]) (read-language p (λ () 'fail))))
-        (printf "get-info ~s\n" get-info)
+   [(not mode)
+    ;; Starting out: look for #lang:
+    (let*-values ([(p) (peeking-input-port in)]
+                  [(init) (file-position p)]
+                  [(start-line start-col start-pos) (port-next-location p)])
+      (let ([get-info (with-handlers ([exn:fail? (lambda (exn) 'fail)])
+                        (read-language p (lambda () #f)))]
+            [sync-ports (lambda ()
+                          (read-bytes (- (file-position p) init) in))])
         (cond
-          [(not (procedure? get-info))
-           ;(or (exn? get-info) (eq? get-info 'fail))
-           (values lexeme type data new-token-start new-token-end 0 'no-lang-line)]
-          [(procedure? get-info)
-           (define end-pos (file-position p))
-           (read-bytes (- end-pos init) in) ;; sync ports
-           ;; Produce language as first token:
-           (values
-            "#lang"
-            'other
-            #f
-            1 ;; start-pos
-            (+ end-pos 1)
-            0
-            (or (let ([v (get-info 'color-lexer #f)])
-                  (and v
-                       (if (procedure-arity-includes? v 3)
-                           (cons v #f)
-                           v)))
-                scheme-lexer))])])]
-    [(eq? mode 'no-lang-line)
-     (let-values ([(lexeme type data new-token-start new-token-end) 
-                   (scheme-lexer in)])
-       (values lexeme type data new-token-start new-token-end 0 'no-lang-line))]
-    [(pair? mode)
-     ;; #lang-selected language consumes and produces a mode:
-     (let-values ([(lexeme type data new-token-start new-token-end backup-delta new-mode) 
-                   ((car mode) in offset (cdr mode))])
-       (values lexeme type data new-token-start new-token-end backup-delta (cons (car mode) new-mode)))]
-    [else
-     ;; #lang-selected language (or default) doesn't deal with modes:
-     (let-values ([(lexeme type data new-token-start new-token-end) 
-                   (mode in)])
-       (values lexeme type data new-token-start new-token-end 0 mode))]))
+         [(procedure? get-info)
+          ;; Produce language as first token:
+          (sync-ports)
+          (let-values ([(end-line end-col end-pos) (port-next-location in)])
+            (values
+             "#lang"
+             'other
+             #f
+             start-pos
+             end-pos
+             0
+             (or (let ([v (get-info 'color-lexer #f)])
+                   (and v
+                        (if (procedure-arity-includes? v 3)
+                            (cons v #f)
+                            v)))
+                 scheme-lexer)))]
+         [(eq? 'fail get-info)
+          (sync-ports)
+          (let*-values ([(end-line end-col end-pos) (port-next-location in)])
+            (values #f 'error #f start-pos end-pos 0 scheme-lexer))]
+         [else
+          ;; Start over using the Scheme lexer
+          (module-lexer in offset scheme-lexer)])))]
+   [(pair? mode)
+    ;; #lang-selected language consumes and produces a mode:
+    (let-values ([(lexeme type data new-token-start new-token-end backup-delta new-mode) 
+                  ((car mode) in offset (cdr mode))])
+      (values lexeme type data new-token-start new-token-end backup-delta (cons (car mode) new-mode)))]
+   [else
+    ;; #lang-selected language (or default) doesn't deal with modes:
+    (let-values ([(lexeme type data new-token-start new-token-end) 
+                  (mode in)])
+      (values lexeme type data new-token-start new-token-end 0 mode))]))