diff --git a/drracket/browser/external.rkt b/drracket/browser/external.rkt
index 2fba81299..52b9c0cac 100644
--- a/drracket/browser/external.rkt
+++ b/drracket/browser/external.rkt
@@ -40,10 +40,11 @@
   ;; sync-current-proxy-servers : proxy-pref -> void
   ;; syncs current-proxy-servers parameter with the proxy-pref-val
   (define (sync-current-proxy-servers pref-val)
-    (let* ([ops (current-proxy-servers)]
-           [removed (remove-all-proxies "http" ops)])
-      (current-proxy-servers
-       (if pref-val (cons pref-val removed) removed))))
+    (define ops (current-proxy-servers))
+    (define removed (remove-all-proxies "http" ops))
+    (current-proxy-servers (if pref-val
+                               (cons pref-val removed)
+                               removed)))
 
   (define (remove-all-proxies scheme proxies)
     (filter (lambda (x) (and (pair? x) (not (equal? (car x) scheme))))
@@ -84,9 +85,8 @@
                            (loop (add1 tries)))))))
 
   (define unix-browser-names
-    (map (lambda (s)
-           (string-titlecase (regexp-replace* #rx"-" (symbol->string s) " ")))
-         raw:unix-browser-list))
+    (for/list ([s (in-list raw:unix-browser-list)])
+      (string-titlecase (regexp-replace* #rx"-" (symbol->string s) " "))))
 
   ;; : (U str #f) -> (U symbol #f)
   ;; to prompt the user for a browser preference
@@ -94,38 +94,37 @@
   ;;  and in that case, the user can choose to use the internal
   ;;  broswer.
   (define (choose-browser url)
-    (let* ([title (string-constant choose-browser)]
-           [d (make-object dialog% title)]
-           [main-pane (make-object vertical-pane% d)]
-           [internal-ok? (not url)]
-           [ok? #f]
-           [orig-external (fw:preferences:get 'external-browser)])
-      (make-object message% title main-pane)
-      ;; No need to show the URL (it can be very long)
-      ;; (when url
-      ;;   (make-object message% (format "URL: ~a" url) main-pane))
-      (let-values ([(panel callbacks) (make-help-browser-preference-panel internal-ok? #f (lambda (f) (f main-pane)))])
-        (let*-values ([(button-pane) (instantiate horizontal-panel% (main-pane)
-                                                  (alignment '(right center)))]
-                      [(ok-button cancel-button)
-                       (fw:gui-utils:ok/cancel-buttons
-                        button-pane
-                        (lambda (b e) (set! ok? #t) (send d show #f))
-                        (lambda (b e)
-                          (fw:preferences:set 'external-browser orig-external)
-                          (send d show #f)))]
-                      [(enable-button) (lambda (_n _v)
-                                         (queue-callback
-                                          (lambda ()
-                                            (send ok-button enable (fw:preferences:get 'external-browser)))))])
-          (send ok-button enable #f)
-          (set! callbacks
-                (cons
-                 (fw:preferences:add-callback 'external-browser enable-button)
-                 callbacks)))
-        (send d show #t)
-        (map (lambda (f) (f)) callbacks)
-        ok?)))
+    (define title (string-constant choose-browser))
+    (define d (make-object dialog% title))
+    (define main-pane (make-object vertical-pane% d))
+    (define internal-ok? (not url))
+    (define ok? #f)
+    (define orig-external (fw:preferences:get 'external-browser))
+    (make-object message% title main-pane)
+    ;; No need to show the URL (it can be very long)
+    ;; (when url
+    ;;   (make-object message% (format "URL: ~a" url) main-pane))
+    (define-values (panel callbacks)
+      (make-help-browser-preference-panel internal-ok? #f (lambda (f) (f main-pane))))
+    (let*-values ([(button-pane) (instantiate horizontal-panel% (main-pane)
+                                   [alignment '(right center)])]
+                  [(ok-button cancel-button) (fw:gui-utils:ok/cancel-buttons
+                                              button-pane
+                                              (lambda (b e)
+                                                (set! ok? #t)
+                                                (send d show #f))
+                                              (lambda (b e)
+                                                (fw:preferences:set 'external-browser orig-external)
+                                                (send d show #f)))]
+                  [(enable-button)
+                   (lambda (_n _v)
+                     (queue-callback
+                      (lambda () (send ok-button enable (fw:preferences:get 'external-browser)))))])
+      (send ok-button enable #f)
+      (set! callbacks (cons (fw:preferences:add-callback 'external-browser enable-button) callbacks)))
+    (send d show #t)
+    (map (lambda (f) (f)) callbacks)
+    ok?)
 
   (define panel-installed? #f)
   (define prefs-panel #f)
@@ -140,11 +139,11 @@
        (lambda (f) (fw:preferences:add-panel
                     (string-constant browser)
                     (lambda (parent)
-                      (let-values ([(panel cbs) (f parent)])
-                        (set! prefs-panel panel)
-                        (map (lambda (f) (f panel)) additions)
-                        (set! additions null)
-                        panel)))))))
+                      (define-values (panel cbs) (f parent))
+                      (set! prefs-panel panel)
+                      (map (lambda (f) (f panel)) additions)
+                      (set! additions null)
+                      panel))))))
 
   (define (add-to-browser-prefs-panel proc)
     (if prefs-panel
@@ -155,150 +154,157 @@
     (mk
      (lambda (parent)
        (define callbacks null)
-       (let ([pref-panel (instantiate vertical-panel% ()
-                                      [parent parent]
-                                      [alignment '(left center)])])
-
-         ;; -------------------- external browser for Unix --------------------
-         (when (unix-browser?)
-           (unless synchronized?
-             ;; Keep 'external-browser in sync
-             (fw:preferences:add-callback 'external-browser
-               (lambda (name browser)
-                 (try-put-preferences (list 'external-browser) (list browser)))))
-
-           (letrec ([v-panel (instantiate group-box-panel% ()
-                                          (parent pref-panel)
-                                          (alignment '(right center))
-                                          (stretchable-height #f)
-                                          (label (string-constant external-browser-choice-title)))]
-                    [h-panel (instantiate horizontal-panel% ()
-                                          (parent v-panel)
-                                          (alignment '(center bottom)))]
-                    [none-index (length raw:unix-browser-list)]
-                    [custom-index (add1 none-index)]
-                    [r (instantiate radio-box% ()
-                                    (label #f)
-                                    (choices (append unix-browser-names
-                                                     (list (string-constant no-browser)
-                                                           (string-constant browser-command-line-label))))
-                                    (parent h-panel)
-                                    (callback
-                                     (lambda (radio event)
-                                       (let ([n (send radio get-selection)])
-                                         (set-browser!
-                                          (cond
-                                            [(= n none-index) #f]
-                                            [(= n custom-index) (get-custom)]
-                                            [else (list-ref raw:unix-browser-list n)]))))))]
-                    [select-custom
-                     (lambda (_ __)
-                       (send r set-selection custom-index)
-                       (set-browser! (get-custom)))]
-                    [get-custom
-                     (lambda () (cons (send pre get-value) (send post get-value)))]
-                    [template-panel (instantiate horizontal-panel% (h-panel)
-                                                 (spacing 0)
-                                                 (stretchable-height #f))]
-                    [pre (instantiate text-field% ()
-                                      (label #f) (parent template-panel) (callback select-custom)
-                                      (horiz-margin 0))]
-                    [mess (instantiate message% () (label "<URL>") (parent template-panel)
-                                       (horiz-margin 0))]
-                    [post (instantiate text-field% ()
-                                       (label #f) (parent template-panel) (callback select-custom)
-                                       (horiz-margin 0))]
-                    [note1 (instantiate message% ((string-constant browser-cmdline-expl-line-1)
-                                                  v-panel))]
-                    [note2 (instantiate message% ((string-constant browser-cmdline-expl-line-2)
-                                                  v-panel))]
-                    [refresh-controls (lambda (pref)
-                                        (if (pair? pref)
-                                          (begin
-                                            (send r set-selection custom-index)
-                                            (send pre set-value (car pref))
-                                            (send post set-value (cdr pref)))
-                                          (let init ([x raw:unix-browser-list] [n 0])
-                                            (cond
-                                              [(null? x) (send r set-selection n)]
-                                              [else (if (eq? pref (car x))
-                                                      (send r set-selection n)
-                                                      (init (cdr x) (add1 n)))]))))])
-
-             (unless ask-later?
-               (send r enable none-index #f))
-
-             (refresh-controls (fw:preferences:get 'external-browser))
-             (set! callbacks
-                   (cons (fw:preferences:add-callback 'external-browser
-                           (lambda (name browser) (refresh-controls browser)))
-                    callbacks))))
-
-         ;; -------------------- proxy for doc downloads --------------------
-         (when set-help?
-           (letrec ([p (instantiate group-box-panel% ()
-                                    [label (string-constant http-proxy)]
-                                    [parent pref-panel]
-                                    [stretchable-height #f]
-                                    [alignment '(left top)])]
-                    [rb (make-object radio-box%
-                                     #f (list (string-constant proxy-direct-connection)
-                                              (string-constant proxy-use-proxy))
-                                     p
-                                     (lambda (r e)
-                                       (let ([proxy? (= 1 (send r get-selection))])
-                                         (send proxy-spec enable proxy?)
-                                         (if proxy?
-                                             (update-proxy)
-                                             (fw:preferences:set http-proxy-preference #f)))))]
-                    [proxy-spec (instantiate horizontal-panel% (p)
-                                             [stretchable-width #f]
-                                             [stretchable-height #f]
-                                             [alignment '(left center)])]
-                    [update-proxy (lambda ()
-                                    (let ([host (send host get-value)]
-                                          [port (send port get-value)])
-                                      (let ([ok? (and (regexp-match? #rx"^[-0-9a-zA-Z.]+$" host)
-                                                      (regexp-match? #rx"^[0-9]+$" port)
-                                                      (string->number port)
-                                                      (<= 1 (string->number port) 65535))])
-                                        (when ok?
-                                          (fw:preferences:set
-                                           http-proxy-preference
-                                           (list "http" host (string->number port))))
-                                        (send bad-host show (not ok?)))))]
-                    [host (make-object text-field%
-                                       (string-constant proxy-host)
-                                       proxy-spec (lambda (x y) (update-proxy))
-                                       "www.someplacethatisaproxy.domain.com")]
-                    [port (make-object text-field%
-                                       (string-constant proxy-port)
-                                       proxy-spec (lambda (x y) (update-proxy)) "65535")]
-                    [bad-host (make-object message%
-                                           (string-constant proxy-bad-host)
-                                           p)]
-                    [update-gui
-                     (lambda (proxy-val)
-                       (send bad-host show #f)
-                       (if proxy-val
-                           (begin
-                             (send rb set-selection 1)
-                             (send proxy-spec enable #t)
-                             (unless (string=? (cadr proxy-val) (send host get-value))
-                               (send host set-value (cadr proxy-val)))
-                             (unless (equal? (caddr proxy-val) (string->number (send port get-value)))
-                               (send port set-value (number->string (caddr proxy-val)))))
-                           (begin
-                             (send rb set-selection 0)
-                             (send proxy-spec enable #f)
-                             (send host set-value "")
-                             (send port set-value ""))))])
-
-             (fw:preferences:add-callback http-proxy-preference
-                                          (lambda (name val)
-                                            (update-gui val)))
-             (update-gui (fw:preferences:get http-proxy-preference))
-             (send bad-host show #f)))
-
-         (set! synchronized? #t)
-         (values pref-panel callbacks)))))
+       (define pref-panel
+         (instantiate vertical-panel% ()
+           [parent parent]
+           [alignment '(left center)]))
+       
+       ;; -------------------- external browser for Unix --------------------
+       (when (unix-browser?)
+         (unless synchronized?
+           ;; Keep 'external-browser in sync
+           (fw:preferences:add-callback
+            'external-browser
+            (lambda (name browser) (try-put-preferences (list 'external-browser) (list browser)))))
+       
+         (letrec
+             ([v-panel (instantiate group-box-panel% ()
+                         [parent pref-panel]
+                         [alignment '(right center)]
+                         [stretchable-height #f]
+                         [label (string-constant external-browser-choice-title)])]
+              [h-panel (instantiate horizontal-panel% ()
+                         [parent v-panel]
+                         [alignment '(center bottom)])]
+              [none-index (length raw:unix-browser-list)]
+              [custom-index (add1 none-index)]
+              [r (instantiate radio-box% ()
+                   [label #f]
+                   [choices
+                    (append unix-browser-names
+                            (list (string-constant no-browser)
+                                  (string-constant browser-command-line-label)))]
+                   [parent h-panel]
+                   [callback
+                    (lambda (radio event)
+                      (let ([n (send radio get-selection)])
+                        (set-browser! (cond
+                                        [(= n none-index) #f]
+                                        [(= n custom-index) (get-custom)]
+                                        [else (list-ref raw:unix-browser-list n)]))))])]
+              [select-custom (lambda (_ __)
+                               (send r set-selection custom-index)
+                               (set-browser! (get-custom)))]
+              [get-custom (lambda () (cons (send pre get-value) (send post get-value)))]
+              [template-panel (instantiate horizontal-panel% (h-panel)
+                                [spacing 0]
+                                [stretchable-height #f])]
+              [pre (instantiate text-field% ()
+                     [label #f]
+                     [parent template-panel]
+                     [callback select-custom]
+                     [horiz-margin 0])]
+              [mess (instantiate message% ()
+                      [label "<URL>"]
+                      [parent template-panel]
+                      [horiz-margin 0])]
+              [post (instantiate text-field% ()
+                      [label #f]
+                      [parent template-panel]
+                      [callback select-custom]
+                      [horiz-margin 0])]
+              [note1 (instantiate message% ((string-constant browser-cmdline-expl-line-1) v-panel))]
+              [note2 (instantiate message% ((string-constant browser-cmdline-expl-line-2) v-panel))]
+              [refresh-controls (lambda (pref)
+                                  (if (pair? pref)
+                                      (begin
+                                        (send r set-selection custom-index)
+                                        (send pre set-value (car pref))
+                                        (send post set-value (cdr pref)))
+                                      (let init ([x raw:unix-browser-list]
+                                                 [n 0])
+                                        (cond
+                                          [(null? x) (send r set-selection n)]
+                                          [else
+                                           (if (eq? pref (car x))
+                                               (send r set-selection n)
+                                               (init (cdr x)
+                                                     (add1 n)))]))))])
+       
+           (unless ask-later?
+             (send r enable none-index #f))
+       
+           (refresh-controls (fw:preferences:get 'external-browser))
+           (set! callbacks
+                 (cons (fw:preferences:add-callback 'external-browser
+                                                    (lambda (name browser)
+                                                      (refresh-controls browser)))
+                       callbacks))))
+       
+       ;; -------------------- proxy for doc downloads --------------------
+       (when set-help?
+         (letrec ([p (instantiate group-box-panel% ()
+                       [label (string-constant http-proxy)]
+                       [parent pref-panel]
+                       [stretchable-height #f]
+                       [alignment '(left top)])]
+                  [rb (make-object radio-box%
+                                   #f
+                                   (list (string-constant proxy-direct-connection)
+                                         (string-constant proxy-use-proxy))
+                                   p
+                                   (lambda (r e)
+                                     (let ([proxy? (= 1 (send r get-selection))])
+                                       (send proxy-spec enable proxy?)
+                                       (if proxy?
+                                           (update-proxy)
+                                           (fw:preferences:set http-proxy-preference #f)))))]
+                  [proxy-spec (instantiate horizontal-panel% (p)
+                                [stretchable-width #f]
+                                [stretchable-height #f]
+                                [alignment '(left center)])]
+                  [update-proxy (lambda ()
+                                  (let ([host (send host get-value)]
+                                        [port (send port get-value)])
+                                    (let ([ok? (and (regexp-match? #rx"^[-0-9a-zA-Z.]+$" host)
+                                                    (regexp-match? #rx"^[0-9]+$" port)
+                                                    (string->number port)
+                                                    (<= 1 (string->number port) 65535))])
+                                      (when ok?
+                                        (fw:preferences:set http-proxy-preference
+                                                            (list "http" host (string->number port))))
+                                      (send bad-host show (not ok?)))))]
+                  [host (make-object text-field%
+                                     (string-constant proxy-host)
+                                     proxy-spec
+                                     (lambda (x y) (update-proxy))
+                                     "www.someplacethatisaproxy.domain.com")]
+                  [port (make-object text-field%
+                                     (string-constant proxy-port)
+                                     proxy-spec
+                                     (lambda (x y) (update-proxy))
+                                     "65535")]
+                  [bad-host (make-object message% (string-constant proxy-bad-host) p)]
+                  [update-gui (lambda (proxy-val)
+                                (send bad-host show #f)
+                                (if proxy-val
+                                    (begin
+                                      (send rb set-selection 1)
+                                      (send proxy-spec enable #t)
+                                      (unless (string=? (cadr proxy-val) (send host get-value))
+                                        (send host set-value (cadr proxy-val)))
+                                      (unless (equal? (caddr proxy-val)
+                                                      (string->number (send port get-value)))
+                                        (send port set-value (number->string (caddr proxy-val)))))
+                                    (begin
+                                      (send rb set-selection 0)
+                                      (send proxy-spec enable #f)
+                                      (send host set-value "")
+                                      (send port set-value ""))))])
+       
+           (fw:preferences:add-callback http-proxy-preference (lambda (name val) (update-gui val)))
+           (update-gui (fw:preferences:get http-proxy-preference))
+           (send bad-host show #f)))
+       
+       (set! synchronized? #t)
+       (values pref-panel callbacks))))
diff --git a/drracket/browser/private/bullet.rkt b/drracket/browser/private/bullet.rkt
index 3ec528198..10703d7f3 100644
--- a/drracket/browser/private/bullet.rkt
+++ b/drracket/browser/private/bullet.rkt
@@ -11,8 +11,7 @@
 
 (define bullet-size 
   (make-parameter
-   (let ([s (send (send (send (make-object text%) get-style-list) basic-style)
-                  get-size)])
+   (let ([s (send+ (make-object text%) (get-style-list) (basic-style) (get-size))])
      (max 7 (quotient s 2)))))
 
 (define (get-bullet-width)
@@ -51,16 +50,15 @@
                           [(0) (values (lambda (x y w h) (send dc draw-ellipse x y w h)) #t)]
                           [(1) (values (lambda (x y w h) (send dc draw-ellipse x y w h)) #f)]
                           [else (values (lambda (x y w h) (send dc draw-rectangle x y w h)) #f)])])
-            (let ([b (send dc get-brush)])
-              (send dc set-brush
-                    (if solid?
-                        (send the-brush-list
-                              find-or-create-brush
-                              (send (send dc get-pen) get-color)
-                              'solid)
-                        transparent-brush))
-              (draw x y bsize bsize)
-              (send dc set-brush b)))))]
+            (define b (send dc get-brush))
+            (send
+             dc
+             set-brush
+             (if solid?
+                 (send the-brush-list find-or-create-brush (send (send dc get-pen) get-color) 'solid)
+                 transparent-brush))
+            (draw x y bsize bsize)
+            (send dc set-brush b))))]
     [define/override copy
       (lambda ()
         (make-object bullet-snip% depth))]
@@ -69,11 +67,10 @@
         (send stream put depth))]
     [define/override get-text
       (lambda (offset num flattened?)
-        (if (< num 1)
-            ""
-            (if flattened?
-                "* "
-                "*")))]
+        (cond
+          [(< num 1) ""]
+          [flattened? "* "]
+          [else "*"]))]
     (super-new)
     (set-snipclass bullet-snip-class)
     (set-count 1)))
diff --git a/drracket/browser/private/entity-names.rkt b/drracket/browser/private/entity-names.rkt
index 0095cff99..9809e7099 100644
--- a/drracket/browser/private/entity-names.rkt
+++ b/drracket/browser/private/entity-names.rkt
@@ -256,6 +256,6 @@
           (euro . 8364)))
 
 (define (entity-name->integer s)
-  (hash-ref table s (lambda () #f)))
+  (hash-ref table s #f))
 
 
diff --git a/drracket/browser/private/html.rkt b/drracket/browser/private/html.rkt
index 0f97992d7..1334b7e85 100644
--- a/drracket/browser/private/html.rkt
+++ b/drracket/browser/private/html.rkt
@@ -41,13 +41,17 @@
 
 ;; load-status : boolean string (union #f url) -> void
 (define (load-status push? what url)
-  (let ([s (format "Loading ~a ~a..." 
-                   what 
-                   (if url
-                       (trim 150 (url->string url))
-                       "unknown url"))])
-    (status-stack (cons s (if push? (status-stack) null)))
-    (status "~a" s)))
+  (define s
+    (format "Loading ~a ~a..."
+            what
+            (if url
+                (trim 150 (url->string url))
+                "unknown url")))
+  (status-stack (cons s
+                      (if push?
+                          (status-stack)
+                          null)))
+  (status "~a" s))
 
 (define (pop-status)
   (status-stack (cdr (status-stack)))
@@ -86,52 +90,45 @@
         (cond
          [(null? rects) #f]
          [else
-          (let ([rect (car rects)])
-            (if (and (<= (image-map-rect-left rect) x (image-map-rect-right rect))
-                     (<= (image-map-rect-top rect) y (image-map-rect-bottom rect)))
-                rect
-                (loop (cdr rects))))])))
+          (define rect (car rects))
+          (if (and (<= (image-map-rect-left rect) x (image-map-rect-right rect))
+                   (<= (image-map-rect-top rect) y (image-map-rect-bottom rect)))
+              rect
+              (loop (cdr rects)))])))
     
     ;; add-area : string (listof number) string -> void
     ;; currently only supports rect shapes
     (define/public (add-area shape coords href)
       (when (and (equal? shape "rect")
                  (= 4 (length coords)))
-        (let ([x1 (car coords)]
-              [y1 (cadr coords)]
-              [x2 (caddr coords)]
-              [y2 (cadddr coords)])
-          (set! rects (cons (make-image-map-rect
-                             href
-                             (min x1 x2)
-                             (min y1 y2)
-                             (max x1 x2)
-                             (max y1 y2))
-                            rects)))))
+        (define x1 (car coords))
+        (define y1 (cadr coords))
+        (define x2 (caddr coords))
+        (define y2 (cadddr coords))
+        (set! rects
+              (cons (make-image-map-rect href (min x1 x2) (min y1 y2) (max x1 x2) (max y1 y2)) rects))))
     
     (define/override (on-event dc x y editor-x editor-y evt)
       (when (send evt button-up?)
-        (let* ([snipx (- (send evt get-x) x)]
-               [snipy (- (send evt get-y) y)]
-               [rect (find-rect snipx snipy)])
-          (when rect
-            (send html-text post-url (image-map-rect-href rect)))))
+        (define snipx (- (send evt get-x) x))
+        (define snipy (- (send evt get-y) y))
+        (define rect (find-rect snipx snipy))
+        (when rect
+          (send html-text post-url (image-map-rect-href rect))))
       (super on-event dc x y editor-x editor-y evt))
     
     (define/override (adjust-cursor dc x y editor-x editor-y evt)
-      (let ([snipx (- (send evt get-x) x)]
-            [snipy (- (send evt get-y) y)])
-        (if (find-rect snipx snipy)
-            finger-cursor
-            #f)))
+      (define snipx (- (send evt get-x) x))
+      (define snipy (- (send evt get-y) y))
+      (if (find-rect snipx snipy) finger-cursor #f))
 
     ;; warning: buggy. This doesn't actually copy the bitmap
     ;; over because there's no get-bitmap method for image-snip%
     ;; at the time of this writing.
     (define/override (copy)
-      (let ([cp (new image-map-snip% (html-text html-text))])
-        (send cp set-key key)
-        (send cp set-rects rects)))
+      (define cp (new image-map-snip% (html-text html-text)))
+      (send cp set-key key)
+      (send cp set-rects rects))
     
     (super-make-object)
     
@@ -144,9 +141,9 @@
 ;;
 
 (define (make-racket-color-delta col)
-  (let ([d (make-object style-delta%)])
-    (send d set-delta-foreground col)
-    d))
+  (define d (make-object style-delta%))
+  (send d set-delta-foreground col)
+  d)
 
 (define racket-code-delta (make-racket-color-delta "brown"))
 (define racket-code-delta/keyword
@@ -164,17 +161,17 @@
 (define current-style-class (make-parameter null))
 
 (define (lookup-class-delta class)
-  (let ([class-path (cons class (current-style-class))])
-    (cond
-     [(sub-path? class-path '("racket")) racket-code-delta]
-     [(sub-path? class-path '("keyword" "racket")) racket-code-delta/keyword]
-     [(sub-path? class-path '("variable" "racket")) racket-code-delta/variable]
-     [(sub-path? class-path '("global" "racket")) racket-code-delta/global]
-     [(or (sub-path? class-path '("selfeval" "racket"))
-          (sub-path? class-path '("racketresponse"))) racket-code-delta/selfeval]
-     [(sub-path? class-path '("comment" "racket")) racket-code-delta/comment]
-     [(sub-path? class-path '("navigation")) navigation-delta]
-     [else #f])))
+  (define class-path (cons class (current-style-class)))
+  (cond
+    [(sub-path? class-path '("racket")) racket-code-delta]
+    [(sub-path? class-path '("keyword" "racket")) racket-code-delta/keyword]
+    [(sub-path? class-path '("variable" "racket")) racket-code-delta/variable]
+    [(sub-path? class-path '("global" "racket")) racket-code-delta/global]
+    [(or (sub-path? class-path '("selfeval" "racket")) (sub-path? class-path '("racketresponse")))
+     racket-code-delta/selfeval]
+    [(sub-path? class-path '("comment" "racket")) racket-code-delta/comment]
+    [(sub-path? class-path '("navigation")) navigation-delta]
+    [else #f]))
 
 (define (sub-path? a b)
   (cond
@@ -194,15 +191,14 @@
 (define re:hexcolor 
   (regexp "^#([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$"))
 
-(define color-string->color
-  (lambda (str)
-    (let ([m (regexp-match re:hexcolor str)])
-      (if m
-          (make-object color%
-                       (string->number (cadr m) 16)
-                       (string->number (caddr m) 16)
-                       (string->number (cadddr m) 16))
-          (send the-color-database find-color str)))))
+(define (color-string->color str)
+  (let ([m (regexp-match re:hexcolor str)])
+    (if m
+        (make-object color%
+                     (string->number (cadr m) 16)
+                     (string->number (caddr m) 16)
+                     (string->number (cadddr m) 16))
+        (send the-color-database find-color str))))
 
 (define html-eval-ok (make-parameter #t))
 (define html-img-ok (make-parameter #t))
diff --git a/drracket/version/tool.rkt b/drracket/version/tool.rkt
index 81aca6f9e..34a31b20e 100644
--- a/drracket/version/tool.rkt
+++ b/drracket/version/tool.rkt
@@ -30,9 +30,11 @@
   ;; wait until the definitions are instantiated, return top-level window
   (define (wait-for-definitions)
     (define ws (get-top-level-windows))
-    (if (null? ws)
-      (begin (sleep 1) (wait-for-definitions))
-      (car ws)))
+    (cond
+      [(null? ws)
+       (sleep 1)
+       (wait-for-definitions)]
+      [else (car ws)]))
   #| ;; Cute code, but may resize the window if too much space, and people
      ;; didn't like this way of asking if you want update checks.
   ;; show a message and a disable button
@@ -181,4 +183,4 @@
              (super help-menu:after-about m))
            (super-new))))
       (thread check-for-updates))
-    (when (> patchlevel 0) (version:add-spec 'p patchlevel))))
+    (when (positive? patchlevel) (version:add-spec 'p patchlevel))))