diff --git a/scribble-doc/scribblings/scribble/class-diagrams.rkt b/scribble-doc/scribblings/scribble/class-diagrams.rkt
index 5f13dff7e6..0b94225a96 100644
--- a/scribble-doc/scribblings/scribble/class-diagrams.rkt
+++ b/scribble-doc/scribblings/scribble/class-diagrams.rkt
@@ -70,41 +70,32 @@
   (unless (even? (length args))
     (error 'method-spec "expected a list of types and argument names, but found ~a arguments"
            (length args)))
-  (let ([first-line
-         (hbl-append
-          (type-spec range)
-          (normal-font " ")
-          (var-font name)
-          (cond
-            [(null? args)
-             (normal-font "()")]
-            [else
-             (hbl-append
-              (normal-font "(")
-              (let loop ([args args])
-                (let* ([type (car args)]
-                       [param (cadr args)]
-                       [single-arg 
-                        (if param 
-                            (hbl-append (type-spec type)
-                                        (normal-font " ")
-                                        (var-font param))
-                            (type-spec type))])
-                  
-                  (cond
-                    [(null? (cddr args))
-                     (hbl-append single-arg (normal-font ")"))]
-                    [else
-                     (hbl-append single-arg
-                                 (normal-font ", ")
-                                 (loop (cddr args)))]))))])
-          (if body
-              (hbl-append (normal-font " {"))
-              (blank)))])
-    (if body
-        (vl-append first-line
-                   (hbl-append (blank 8 0) body (normal-font "}")))
-        first-line)))
+  (define first-line
+    (hbl-append
+     (type-spec range)
+     (normal-font " ")
+     (var-font name)
+     (cond
+       [(null? args) (normal-font "()")]
+       [else
+        (hbl-append
+         (normal-font "(")
+         (let loop ([args args])
+           (let* ([type (car args)]
+                  [param (cadr args)]
+                  [single-arg (if param
+                                  (hbl-append (type-spec type) (normal-font " ") (var-font param))
+                                  (type-spec type))])
+  
+             (cond
+               [(null? (cddr args)) (hbl-append single-arg (normal-font ")"))]
+               [else (hbl-append single-arg (normal-font ", ") (loop (cddr args)))]))))])
+     (if body
+         (hbl-append (normal-font " {"))
+         (blank))))
+  (if body
+      (vl-append first-line (hbl-append (blank 8 0) body (normal-font "}")))
+      first-line))
              
 (define (type-spec str)
   (cond
@@ -126,83 +117,86 @@
 
 ;; class-box : pict (or/c #f (listof pict)) (or/c #f (listof pict)) -> pict
 (define (class-box name fields methods)
-  (let* ([mk-blank (λ () (blank 0 (+ class-box-margin class-box-margin)))])
-    (cond
-      [(and methods fields)
-       (let* ([top-spacer (mk-blank)]
-              [bottom-spacer (mk-blank)]
-              [main (vl-append name 
-                               top-spacer
-                               (if (null? fields)
-                                   (blank 0 4)
-                                   (apply vl-append fields))
-                               bottom-spacer
-                               (if (null? methods)
-                                   (blank 0 4)
-                                   (apply vl-append methods)))])
-         (add-hline
-          (add-hline (frame (inset main class-box-margin))
-                     top-spacer)
-          bottom-spacer))]
-      [fields
-       (let* ([top-spacer (mk-blank)]
-              [main (vl-append name 
-                               top-spacer
-                               (if (null? fields)
-                                   (blank)
-                                   (apply vl-append fields)))])
-         (add-hline (frame (inset main class-box-margin))
-                    top-spacer))]
-      [methods (class-box name methods fields)]
-      [else (frame (inset name class-box-margin))])))
+  (define (mk-blank)
+    (blank 0 (+ class-box-margin class-box-margin)))
+  (cond
+    [(and methods fields)
+     (let* ([top-spacer (mk-blank)]
+            [bottom-spacer (mk-blank)]
+            [main (vl-append name
+                             top-spacer
+                             (if (null? fields)
+                                 (blank 0 4)
+                                 (apply vl-append fields))
+                             bottom-spacer
+                             (if (null? methods)
+                                 (blank 0 4)
+                                 (apply vl-append methods)))])
+       (add-hline (add-hline (frame (inset main class-box-margin)) top-spacer) bottom-spacer))]
+    [fields
+     (let* ([top-spacer (mk-blank)]
+            [main (vl-append name
+                             top-spacer
+                             (if (null? fields)
+                                 (blank)
+                                 (apply vl-append fields)))])
+       (add-hline (frame (inset main class-box-margin)) top-spacer))]
+    [methods (class-box name methods fields)]
+    [else (frame (inset name class-box-margin))]))
 
 (define (add-hline main sub)
-  (let-values ([(x y) (cc-find main sub)])
-    (pin-line main
-              sub (λ (p1 p2) (values 0 y))
-              sub (λ (p1 p2) (values (pict-width main) y)))))
+  (define-values (x y) (cc-find main sub))
+  (pin-line main sub (λ (p1 p2) (values 0 y)) sub (λ (p1 p2) (values (pict-width main) y))))
 
 ;; hierarchy : pict (cons pict (listof pict)) (cons pict (listof pict)) -> pict
 (define (hierarchy main supers subs)
-  (let ([supers-bottoms (apply max (map (λ (x) (let-values ([(x y) (cb-find main x)]) y)) supers))]
-        [subs-tops (apply min (map (λ (x) (let-values ([(x y) (ct-find main x)]) y)) subs))]
-        [sorted-subs (sort subs (λ (x y) (< (left-edge-x main x) (left-edge-x main y))))])
-    (unless (< supers-bottoms subs-tops)
-      (error 'hierarchy "expected supers to be on top of subs, supers bottom is at ~a, and subs tops is at ~a"
-             supers-bottoms
-             subs-tops))
-    (let* ([main-line-y (max (- subs-tops 20) (/ (+ supers-bottoms subs-tops) 2))]
-           [main-line-start-x (center-x  main (car sorted-subs))]
-           [main-line-end-x (center-x main (last sorted-subs))]
-           [w/main-line
-            (pin-line main
-                      main (λ (_1 _2) (values main-line-start-x main-line-y))
-                      main (λ (_1 _2) (values main-line-end-x main-line-y))
-                      #:color hierarchy-color)]
-           [super-lines
-            (map (λ (super) 
-                   (let-values ([(x y) (cb-find main super)])
-                     (pin-over 
-                      (pin-line (ghost main)
-                                super cb-find
-                                main (λ (_1 _2) (values x main-line-y)))
-                      (- x (/ (pict-width triangle) 2))
-                      (- (/ (+ y main-line-y) 2)
-                         (/ (pict-height triangle) 2))
-                      triangle)))
-                 supers)]
-           [sub-lines
-            (map (λ (sub) 
-                   (let-values ([(x y) (ct-find main sub)])
-                     (pin-line (ghost main)
-                               sub ct-find
-                               main (λ (_1 _2) (values x main-line-y))
-                               #:color hierarchy-color)))
-                 subs)])
-      (apply cc-superimpose 
-             w/main-line
-             (append sub-lines
-                     super-lines)))))
+  (define supers-bottoms
+    (apply max
+           (map (λ (x)
+                  (let-values ([(x y) (cb-find main x)])
+                    y))
+                supers)))
+  (define subs-tops
+    (apply min
+           (map (λ (x)
+                  (let-values ([(x y) (ct-find main x)])
+                    y))
+                subs)))
+  (define sorted-subs (sort subs (λ (x y) (< (left-edge-x main x) (left-edge-x main y)))))
+  (unless (< supers-bottoms subs-tops)
+    (error 'hierarchy
+           "expected supers to be on top of subs, supers bottom is at ~a, and subs tops is at ~a"
+           supers-bottoms
+           subs-tops))
+  (define main-line-y (max (- subs-tops 20) (/ (+ supers-bottoms subs-tops) 2)))
+  (define main-line-start-x (center-x main (car sorted-subs)))
+  (define main-line-end-x (center-x main (last sorted-subs)))
+  (define w/main-line
+    (pin-line main
+              main
+              (λ (_1 _2) (values main-line-start-x main-line-y))
+              main
+              (λ (_1 _2) (values main-line-end-x main-line-y))
+              #:color hierarchy-color))
+  (define super-lines
+    (map (λ (super)
+           (let-values ([(x y) (cb-find main super)])
+             (pin-over (pin-line (ghost main) super cb-find main (λ (_1 _2) (values x main-line-y)))
+                       (- x (/ (pict-width triangle) 2))
+                       (- (/ (+ y main-line-y) 2) (/ (pict-height triangle) 2))
+                       triangle)))
+         supers))
+  (define sub-lines
+    (map (λ (sub)
+           (let-values ([(x y) (ct-find main sub)])
+             (pin-line (ghost main)
+                       sub
+                       ct-find
+                       main
+                       (λ (_1 _2) (values x main-line-y))
+                       #:color hierarchy-color)))
+         subs))
+  (apply cc-superimpose w/main-line (append sub-lines super-lines)))
 
 (define triangle-width 12)
 (define triangle-height 12)
@@ -212,49 +206,47 @@
                       (make-object point% triangle-width triangle-height))])
     (colorize 
      (dc (λ (dc dx dy)
-           (let ([brush (send dc get-brush)])
-             (send dc set-brush (send brush get-color) 'solid)
-             (send dc draw-polygon points dx dy)
-             (send dc set-brush brush)))
+           (define brush (send dc get-brush))
+           (send dc set-brush (send brush get-color) 'solid)
+           (send dc draw-polygon points dx dy)
+           (send dc set-brush brush))
          triangle-width
          triangle-height)
      hierarchy-color)))
 
 (define (center-x main pict)
-  (let-values ([(x y) (cc-find main pict)])
-    x))
+  (define-values (x y) (cc-find main pict))
+  x)
 
 (define (left-edge-x main pict)
-  (let-values ([(x y) (lc-find main pict)])
-    x))
+  (define-values (x y) (lc-find main pict))
+  x)
 
 
 (define (add-dot-right main class field) (add-dot-left-right/offset main class field 0 rc-find))
-(define add-dot-right/space 
-  (λ (main class field [count 1])
-    (add-dot-right/offset main class field (* count dot-edge-spacing))))
+(define (add-dot-right/space main class field [count 1])
+  (add-dot-right/offset main class field (* count dot-edge-spacing)))
 (define (add-dot-right/offset main class field offset)
   (add-dot-left-right/offset main class field offset rc-find))
 
 (define (add-dot-left main class field) (add-dot-left-right/offset main class field 0 lc-find))
-(define add-dot-left/space
-  (λ (main class field [count 1])
-    (add-dot-left/offset main class field (* count (- dot-edge-spacing)))))
+(define (add-dot-left/space main class field [count 1])
+  (add-dot-left/offset main class field (* count (- dot-edge-spacing))))
 (define (add-dot-left/offset main class field offset)
   (add-dot-left-right/offset main class field offset lc-find))
 
 (define (add-dot-left-right/offset main class field offset finder)
-  (let-values ([(_1 y) (cc-find main field)]
-               [(x-edge _2) (finder main class)])
-    (add-dot main (+ x-edge offset) y)))
+  (define-values (_1 y) (cc-find main field))
+  (define-values (x-edge _2) (finder main class))
+  (add-dot main (+ x-edge offset) y))
 
 (define add-dot-junction
   (case-lambda
     [(main x-pict y-pict) (add-dot-junction main x-pict cc-find y-pict cc-find)]
     [(main x-pict x-find y-pict y-find)
-     (let-values ([(x _1) (x-find main x-pict)]
-                  [(_2 y) (y-find main y-pict)])
-       (add-dot main x y))]))
+     (define-values (x _1) (x-find main x-pict))
+     (define-values (_2 y) (y-find main y-pict))
+     (add-dot main x y)]))
 
 (define (add-dot-offset pict dot dx dy)
   (let-values ([(x y) (cc-find pict dot)])
diff --git a/scribble-html-lib/scribble/html/html.rkt b/scribble-html-lib/scribble/html/html.rkt
index 9bd71e3f96..71f1b82977 100644
--- a/scribble-html-lib/scribble/html/html.rkt
+++ b/scribble-html-lib/scribble/html/html.rkt
@@ -186,11 +186,11 @@
   (define-values [attrs body] (attributes+body args))
   (make-element
    'script attrs
-   `("\n" ,(set-prefix 0 (apply cdata #:line-prefix "//" body)) "\n")))
+   (list "\n" (set-prefix 0 (apply cdata #:line-prefix "//" body)) "\n")))
 (provide style/inline)
 (define (style/inline . args)
   (define-values [attrs body] (attributes+body args))
-  (make-element 'style attrs `("\n" ,body "\n")))
+  (make-element 'style attrs (list "\n" body "\n")))
 
 ;; ----------------------------------------------------------------------------
 ;; Entities
diff --git a/scribble-html-lib/scribble/html/resource.rkt b/scribble-html-lib/scribble/html/resource.rkt
index 454ff63393..8923f7c00c 100644
--- a/scribble-html-lib/scribble/html/resource.rkt
+++ b/scribble-html-lib/scribble/html/resource.rkt
@@ -57,11 +57,10 @@
     (set! cached-roots
           (cons roots
                 (and (list? roots) (pair? roots)
-                     (map (lambda (root)
-                            (list* (regexp-match* #rx"[^/]+" (car root))
-                                   (regexp-replace #rx"/$" (cadr root) "")
-                                   (cddr root)))
-                          roots)))))
+                     (for/list ([root (in-list roots)])
+                       (list* (regexp-match* #rx"[^/]+" (car root))
+                              (regexp-replace #rx"/$" (cadr root) "")
+                              (cddr root)))))))
   (cdr cached-roots))
 
 ;; a utility for relative paths, taking the above `default-file' and
@@ -70,22 +69,23 @@
   (define file* (if (equal? file default-file) "" file))
   (define roots (current-url-roots))
   (define (find-root path mode)
-    (ormap (lambda (root+url+flags)
-             (let loop ([r (car root+url+flags)] [p path])
-               (if (pair? r)
-                 (and (pair? p) (equal? (car p) (car r))
-                      (loop (cdr r) (cdr p)))
-                 (case mode
-                   [(get-path) `(,(cadr root+url+flags) 
-                                 ,@p 
-                                 ,(if (and (equal? file* "")
-                                           (memq 'index (cddr root+url+flags)))
-                                      default-file
-                                      file*))]
-                   [(get-abs-or-true)
-                    (if (memq 'abs (cddr root+url+flags)) `("" ,@p) #t)]
-                   [else (error 'relativize "internal error: ~e" mode)]))))
-           roots))
+    (for/or ([root+url+flags (in-list roots)])
+      (let loop ([r (car root+url+flags)]
+                 [p path])
+        (if (pair? r)
+            (and (pair? p) (equal? (car p) (car r)) (loop (cdr r) (cdr p)))
+            (case mode
+              [(get-path)
+               `(,(cadr root+url+flags) ,@p
+                                        ,(if (and (equal? file* "")
+                                                  (memq 'index (cddr root+url+flags)))
+                                             default-file
+                                             file*))]
+              [(get-abs-or-true)
+               (if (memq 'abs (cddr root+url+flags))
+                   `("" ,@p)
+                   #t)]
+              [else (error 'relativize "internal error: ~e" mode)])))))
   (define result
     (let loop ([t tgtdir] [c curdir] [pfx '()])
       (cond
@@ -165,9 +165,11 @@
     (define t (make-hash))
     (define-syntax-rule (S body) (call-with-semaphore s (lambda () body)))
     (values (lambda (path renderer)
-              (S (if (hash-ref t path #f)
-                   (error 'resource "path used for two resources: ~e" path)
-                   (begin (hash-set! t path #t) (set! l (cons renderer l))))))
+              (S (cond
+                   [(hash-ref t path #f) (error 'resource "path used for two resources: ~e" path)]
+                   [else
+                    (hash-set! t path #t)
+                    (set! l (cons renderer l))])))
             (lambda () (S (begin0 (reverse l) (set! l '())))))))
 
 ;; `#:exists' determines what happens when the render destination exists, it
@@ -180,32 +182,33 @@
 (define (resource path0 renderer #:exists [exists 'delete-file])
   (define (bad reason) (error 'resource "bad path, ~a: ~e" reason path0))
   (unless (string? path0) (bad "must be a string"))
-  (for ([x (in-list '([#rx"^/" "must be relative"]
-                      [#rx"//" "must not have empty elements"]
-                      [#rx"(?:^|/)[.][.]?(?:/|$)"
-                          "must not contain `.' or `..'"]))])
-    (when (regexp-match? (car x) path0) (bad (cadr x))))
+  (for ([x (in-list '([#rx"^/" "must be relative"] [#rx"//" "must not have empty elements"]
+                                                   [#rx"(?:^|/)[.][.]?(?:/|$)"
+                                                    "must not contain `.' or `..'"]))]
+        #:when (regexp-match? (car x) path0))
+    (bad (cadr x)))
   (define path (regexp-replace #rx"(?<=^|/)$" path0 default-file))
   (define-values [dirpathlist filename]
     (let-values ([(l r) (split-at-right (regexp-split #rx"/" path) 1)])
       (values l (car r))))
   (define (render)
     (let loop ([ps dirpathlist])
-      (if (pair? ps)
-        (begin (unless (directory-exists? (car ps))
-                 (if (or (file-exists? (car ps)) (link-exists? (car ps)))
-                   (bad "exists as a file/link")
-                   (make-directory (car ps))))
-               (parameterize ([current-directory (car ps)])
-                 (loop (cdr ps))))
-        (begin (cond [(not exists)] ; do nothing
-                     [(or (file-exists? filename) (link-exists? filename))
-                      (delete-file filename)]
-                     [(directory-exists? filename)
-                      (bad "exists as directory")])
-               (parameterize ([rendered-dirpath dirpathlist])
-                 (printf "  ~a\n" path)
-                 (renderer filename))))))
+      (cond
+        [(pair? ps)
+         (unless (directory-exists? (car ps))
+           (if (or (file-exists? (car ps)) (link-exists? (car ps)))
+               (bad "exists as a file/link")
+               (make-directory (car ps))))
+         (parameterize ([current-directory (car ps)])
+           (loop (cdr ps)))]
+        [else
+         (cond
+           [(not exists)] ; do nothing
+           [(or (file-exists? filename) (link-exists? filename)) (delete-file filename)]
+           [(directory-exists? filename) (bad "exists as directory")])
+         (parameterize ([rendered-dirpath dirpathlist])
+           (printf "  ~a\n" path)
+           (renderer filename))])))
   (define absolute-url
     (lazy (define url (relativize filename dirpathlist '()))
           (if (url-roots)
diff --git a/scribble-html-lib/scribble/html/xml.rkt b/scribble-html-lib/scribble/html/xml.rkt
index 6e4f416f96..51fa3b3ed3 100644
--- a/scribble-html-lib/scribble/html/xml.rkt
+++ b/scribble-html-lib/scribble/html/xml.rkt
@@ -106,16 +106,14 @@
   ;; null body means a lone tag, tags that should always have a closer will
   ;; have a '(#f) as their body (see below)
   (list (with-writer #f "<" tag)
-        (map (lambda (attr)
-               (define name (car attr))
-               (define val (cdr attr))
-               (cond [(not val) #f]
-                     ;; #t means just mention the attribute
-                     [(eq? #t val) (with-writer #f (list " " name))]
-                     [else (list (with-writer #f (list " " name "=\""))
-                                 val
-                                 (with-writer #f "\""))]))
-             attrs)
+        (for/list ([attr (in-list attrs)])
+          (define name (car attr))
+          (define val (cdr attr))
+          (cond
+            [(not val) #f]
+            ;; #t means just mention the attribute
+            [(eq? #t val) (with-writer #f (list " " name))]
+            [else (list (with-writer #f (list " " name "=\"")) val (with-writer #f "\""))]))
         (if (null? body)
           (with-writer #f " />")
           (list (with-writer #f ">")
diff --git a/scribble-lib/scribble/lp/lang/common.rkt b/scribble-lib/scribble/lp/lang/common.rkt
index 266e5c3589..396655a97b 100644
--- a/scribble-lib/scribble/lp/lang/common.rkt
+++ b/scribble-lib/scribble/lp/lang/common.rkt
@@ -24,7 +24,7 @@
      (cons id (mapping-get chunk-groups id)))
     (free-identifier-mapping-put!
      chunks id
-     `(,@(mapping-get chunks id) ,@exprs))))
+     (append (mapping-get chunks id) exprs))))
 
 (define-syntax (tangle stx)
   (define chunk-mentions '())