diff --git a/collects/framework/private/editor.rkt b/collects/framework/private/editor.rkt
index 0c8981b6..c2de47ac 100644
--- a/collects/framework/private/editor.rkt
+++ b/collects/framework/private/editor.rkt
@@ -73,7 +73,7 @@
                    (if (and snip
                             (is-a? snip editor-snip%))
                        (loop (send snip get-editor))
-                       (values editor #f)))]
+                       (values #f editor)))]
                 [else (values #f #f)])))))
       
       ;; get-filename/untitled-name : -> string
diff --git a/collects/framework/private/main.rkt b/collects/framework/private/main.rkt
index a1e5c939..18572e04 100644
--- a/collects/framework/private/main.rkt
+++ b/collects/framework/private/main.rkt
@@ -221,11 +221,13 @@
             '(struct
               local
                      
-              define-type
+              struct: define-struct: define-struct/exec:
+              define:
+              define-type define-predicate
               match-define))
   (for-each (λ (x) 
               (hash-set! hash-table x 'begin))
-            '(case-lambda
+            '(case-lambda case-lambda: pcase-lambda:
                match-lambda match-lambda*
                cond
                delay
@@ -250,10 +252,19 @@
                let/cc let/ec letcc catch
                let-syntax letrec-syntax fluid-let-syntax letrec-syntaxes+values
                
+               let: letrec: let*:
+               let-values: letrec-values: let*-values:
+               let/cc: let/ec:
+               lambda: λ:
+               plambda: opt-lambda: popt-lambda:
+
                for for/list for/hash for/hasheq for/and for/or 
                for/lists for/first for/last for/fold
                for* for*/list for*/hash for*/hasheq for*/and for*/or 
                for*/lists for*/first for*/last for*/fold                 
+
+               for: for/list: for/or: for/lists: for/fold:
+               for*: for*/lists: for*/fold: do:
                
                kernel-syntax-case
                syntax-case syntax-case* syntax-rules syntax-id-rules
diff --git a/collects/scribblings/framework/color.scrbl b/collects/scribblings/framework/color.scrbl
index 35022438..6d09ad48 100644
--- a/collects/scribblings/framework/color.scrbl
+++ b/collects/scribblings/framework/color.scrbl
@@ -12,17 +12,17 @@
                                (get-token (or/c (-> input-port? 
                                                     (values any/c 
                                                             symbol? 
-                                                            (or/c false? symbol?) 
-                                                            exact-nonnegative-integer?
-                                                            exact-nonnegative-integer?))
+                                                            (or/c symbol? #f)
+                                                            (or/c exact-nonnegative-integer? #f)
+                                                            (or/c exact-nonnegative-integer? #f)))
                                                 (-> input-port? 
                                                     exact-nonnegative-integer?
                                                     any/c
                                                     (values any/c 
                                                             symbol? 
-                                                            (or/c false? symbol?) 
-                                                            exact-nonnegative-integer?
-                                                            exact-nonnegative-integer?
+                                                            (or/c symbol? #f)
+                                                            (or/c exact-nonnegative-integer? #f)
+                                                            (or/c exact-nonnegative-integer? #f)
                                                             exact-nonnegative-integer?
                                                             any/c))))
                                (pairs (listof (list/c symbol? symbol?)))) void?))]{
@@ -50,9 +50,9 @@
     A symbol indicating how the token should be treated by the paren
     matcher or @scheme[#f].  This symbol should be in the pairs argument.}
     @item{
-    The starting position of the token.}
+    The starting position of the token (or @scheme[#f] if eof).}
     @item{
-    The ending position of the token.}]
+    The ending position of the token (or @scheme[#f] if eof).}]
 
     When @scheme[get-token] accepts an offset and mode value in addition to an
     input port, it must also return two extra results, which are a backup
diff --git a/collects/scribblings/framework/editor.scrbl b/collects/scribblings/framework/editor.scrbl
index e78981c7..ccfd73a1 100644
--- a/collects/scribblings/framework/editor.scrbl
+++ b/collects/scribblings/framework/editor.scrbl
@@ -127,15 +127,15 @@
   }
 
   @defmethod[(get-pos/text [event (is-a?/c mouse-event%)])
-             (values (or/c false/c (is-a?/c editor<%>))
-	             (or/c false/c number?))]{
+             (values (or/c false/c number?)
+                     (or/c false/c (is-a?/c editor<%>)))]{
 
    This method's first result is @scheme[#f] when the mouse
    event does not correspond to a location in the editor. 
    
-   If the first result is an @scheme[text%] object, then the
-   second result will be a position in the editor and
-   otherwise the second result will be @scheme[#f]. 
+   If the second result is a @scheme[text%] object, then the
+   first result will be a position in the editor and
+   otherwise the first result will be @scheme[#f]. 
 
    The @scheme[editor<%>] object will always be the nearest
    enclosing editor containing the mouse click.