diff --git a/collects/framework/private/gen-standard-menus.ss b/collects/framework/private/gen-standard-menus.ss
index bde2184482..a1e3f1d587 100644
--- a/collects/framework/private/gen-standard-menus.ss
+++ b/collects/framework/private/gen-standard-menus.ss
@@ -7,6 +7,9 @@
 
 (define-runtime-path here ".")
 
+(define standard-menus.ss-filename (simplify-path (build-path here "standard-menus.ss")))
+(define docs-menus.ss-filename (simplify-path (build-path here 'up 'up "scribblings" "framework" "standard-menus.scrbl")))
+
 ;; build-before-super-item-clause : an-item -> (listof clause)
 (define build-before-super-item-clause
   (λ (item)
@@ -115,9 +118,6 @@
      (list `(define/public ,(generic-name generic)
               ,(generic-initializer generic)))]))
 
-(define standard-menus.ss-filename (build-path here "standard-menus.ss"))
-(define docs-menus.ss-filename (simplify-path (build-path here 'up 'up "scribblings" "framework" "standard-menus.scrbl")))
-
 (define (main)
   (write-standard-menus.ss)
   (write-docs))
diff --git a/collects/framework/private/standard-menus-items.ss b/collects/framework/private/standard-menus-items.ss
index 7f51a95ade..6cee32ef51 100644
--- a/collects/framework/private/standard-menus-items.ss
+++ b/collects/framework/private/standard-menus-items.ss
@@ -292,12 +292,12 @@
         (make-an-item 'edit-menu 'redo 
                       '(string-constant redo-info)
                       (edit-menu:do 'redo)
-                      '(if (eq? (system-type) 'macosx)
-                           #\z
-                           #\y)
-                      '(if (eq? (system-type) 'macosx)
-                           (cons 'shift (get-default-shortcut-prefix))
-                           (get-default-shortcut-prefix))
+                      '(if (eq? (system-type) 'windows)
+                           #\y
+                           #\z)
+                      '(if (eq? (system-type) 'windows)
+                           (get-default-shortcut-prefix)
+                           (cons 'shift (get-default-shortcut-prefix)))
                       '(string-constant redo-menu-item)
                       (edit-menu:can-do-on-demand 'redo)
                       #t)
diff --git a/collects/framework/private/standard-menus.ss b/collects/framework/private/standard-menus.ss
index 718dae4511..c702dde7a9 100644
--- a/collects/framework/private/standard-menus.ss
+++ b/collects/framework/private/standard-menus.ss
@@ -164,35 +164,24 @@
           (when (is-a? menu menu:can-restore<%>)
             (if v (send menu restore-keybinding) (send menu set-shortcut #f)))
           (when (is-a? menu menu:can-restore-underscore<%>)
-            (if v
-              (send menu restore-underscores)
-              (send menu erase-underscores)))
-          (when (is-a? menu menu-item-container<%>)
-            (for-each loop (send menu get-items)))))))
+            (if v (send menu restore-underscores) (send menu erase-underscores)))
+          (when (is-a? menu menu-item-container<%>) (for-each loop (send menu get-items)))))))
    (inherit get-menu-bar show can-close? get-edit-target-object)
-   (define/augment
-    on-close
-    (lambda () (remove-prefs-callback) (inner (void) on-close)))
+   (define/augment on-close (λ () (remove-prefs-callback) (inner (void) on-close)))
    (define/public get-menu% (λ () menu:can-restore-underscore-menu%))
    (define/public get-menu-item% (λ () menu:can-restore-menu-item%))
-   (define/public
-    get-checkable-menu-item%
-    (λ () menu:can-restore-checkable-menu-item%))
+   (define/public get-checkable-menu-item% (λ () menu:can-restore-checkable-menu-item%))
    (define/public get-file-menu (λ () file-menu))
    (define/public get-edit-menu (λ () edit-menu))
    (define/public get-help-menu (λ () help-menu))
-   (define/public
-    file-menu:new-callback
-    (λ (item control) (handler:edit-file #f) #t))
+   (define/public file-menu:new-callback (λ (item control) (handler:edit-file #f) #t))
    (define/public (file-menu:get-new-item) file-menu:new-item)
    (define/public (file-menu:new-string) (string-constant new-menu-item))
    (define/public (file-menu:new-help-string) (string-constant new-info))
    (define/public file-menu:new-on-demand (λ (menu-item) (void)))
    (define/public (file-menu:create-new?) #t)
    (define/public file-menu:between-new-and-open (λ (menu) (void)))
-   (define/public
-    file-menu:open-callback
-    (λ (item control) (handler:open-file) #t))
+   (define/public file-menu:open-callback (λ (item control) (handler:open-file) #t))
    (define/public (file-menu:get-open-item) file-menu:open-item)
    (define/public (file-menu:open-string) (string-constant open-menu-item))
    (define/public (file-menu:open-help-string) (string-constant open-info))
@@ -200,15 +189,9 @@
    (define/public (file-menu:create-open?) #t)
    (define/public file-menu:open-recent-callback (λ (x y) (void)))
    (define/public (file-menu:get-open-recent-item) file-menu:open-recent-item)
-   (define/public
-    (file-menu:open-recent-string)
-    (string-constant open-recent-menu-item))
-   (define/public
-    (file-menu:open-recent-help-string)
-    (string-constant open-recent-info))
-   (define/public
-    file-menu:open-recent-on-demand
-    (λ (menu) (handler:install-recent-items menu)))
+   (define/public (file-menu:open-recent-string) (string-constant open-recent-menu-item))
+   (define/public (file-menu:open-recent-help-string) (string-constant open-recent-info))
+   (define/public file-menu:open-recent-on-demand (λ (menu) (handler:install-recent-items menu)))
    (define/public (file-menu:create-open-recent?) #t)
    (define/public file-menu:between-open-and-revert (λ (menu) (void)))
    (define/public file-menu:revert-callback (λ (item control) (void)))
@@ -226,12 +209,8 @@
    (define/public (file-menu:create-save?) #f)
    (define/public file-menu:save-as-callback (λ (item control) (void)))
    (define/public (file-menu:get-save-as-item) file-menu:save-as-item)
-   (define/public
-    (file-menu:save-as-string)
-    (string-constant save-as-menu-item))
-   (define/public
-    (file-menu:save-as-help-string)
-    (string-constant save-as-info))
+   (define/public (file-menu:save-as-string) (string-constant save-as-menu-item))
+   (define/public (file-menu:save-as-help-string) (string-constant save-as-info))
    (define/public file-menu:save-as-on-demand (λ (menu-item) (void)))
    (define/public (file-menu:create-save-as?) #f)
    (define/public file-menu:between-save-as-and-print (λ (menu) (void)))
@@ -241,21 +220,15 @@
    (define/public (file-menu:print-help-string) (string-constant print-info))
    (define/public file-menu:print-on-demand (λ (menu-item) (void)))
    (define/public (file-menu:create-print?) #f)
-   (define/public
-    file-menu:between-print-and-close
-    (λ (menu) (make-object separator-menu-item% menu)))
-   (define/public
-    file-menu:close-callback
-    (λ (item control) (when (can-close?) (on-close) (show #f)) #t))
+   (define/public file-menu:between-print-and-close (λ (menu) (make-object separator-menu-item% menu)))
+   (define/public file-menu:close-callback (λ (item control) (when (can-close?) (on-close) (show #f)) #t))
    (define/public (file-menu:get-close-item) file-menu:close-item)
    (define/public (file-menu:close-string) (string-constant close-menu-item))
    (define/public (file-menu:close-help-string) (string-constant close-info))
    (define/public file-menu:close-on-demand (λ (menu-item) (void)))
    (define/public (file-menu:create-close?) #t)
    (define/public file-menu:between-close-and-quit (λ (menu) (void)))
-   (define/public
-    file-menu:quit-callback
-    (λ (item control) (when (exit:user-oks-exit) (exit:exit))))
+   (define/public file-menu:quit-callback (λ (item control) (when (exit:user-oks-exit) (exit:exit))))
    (define/public (file-menu:get-quit-item) file-menu:quit-item)
    (define/public
     (file-menu:quit-string)
@@ -264,16 +237,13 @@
       (string-constant quit-menu-item-others)))
    (define/public (file-menu:quit-help-string) (string-constant quit-info))
    (define/public file-menu:quit-on-demand (λ (menu-item) (void)))
-   (define/public
-    (file-menu:create-quit?)
-    (not (current-eventspace-has-standard-menus?)))
+   (define/public (file-menu:create-quit?) (not (current-eventspace-has-standard-menus?)))
    (define/public file-menu:after-quit (λ (menu) (void)))
    (define/public
     edit-menu:undo-callback
     (λ (menu evt)
       (let ((edit (get-edit-target-object)))
-        (when (and edit (is-a? edit editor<%>))
-          (send edit do-edit-operation 'undo)))
+        (when (and edit (is-a? edit editor<%>)) (send edit do-edit-operation 'undo)))
       #t))
    (define/public (edit-menu:get-undo-item) edit-menu:undo-item)
    (define/public (edit-menu:undo-string) (string-constant undo-menu-item))
@@ -282,18 +252,14 @@
     edit-menu:undo-on-demand
     (λ (item)
       (let* ((editor (get-edit-target-object))
-             (enable?
-              (and editor
-                   (is-a? editor editor<%>)
-                   (send editor can-do-edit-operation? 'undo))))
+             (enable? (and editor (is-a? editor editor<%>) (send editor can-do-edit-operation? 'undo))))
         (send item enable enable?))))
    (define/public (edit-menu:create-undo?) #t)
    (define/public
     edit-menu:redo-callback
     (λ (menu evt)
       (let ((edit (get-edit-target-object)))
-        (when (and edit (is-a? edit editor<%>))
-          (send edit do-edit-operation 'redo)))
+        (when (and edit (is-a? edit editor<%>)) (send edit do-edit-operation 'redo)))
       #t))
    (define/public (edit-menu:get-redo-item) edit-menu:redo-item)
    (define/public (edit-menu:redo-string) (string-constant redo-menu-item))
@@ -302,21 +268,15 @@
     edit-menu:redo-on-demand
     (λ (item)
       (let* ((editor (get-edit-target-object))
-             (enable?
-              (and editor
-                   (is-a? editor editor<%>)
-                   (send editor can-do-edit-operation? 'redo))))
+             (enable? (and editor (is-a? editor editor<%>) (send editor can-do-edit-operation? 'redo))))
         (send item enable enable?))))
    (define/public (edit-menu:create-redo?) #t)
-   (define/public
-    edit-menu:between-redo-and-cut
-    (λ (menu) (make-object separator-menu-item% menu)))
+   (define/public edit-menu:between-redo-and-cut (λ (menu) (make-object separator-menu-item% menu)))
    (define/public
     edit-menu:cut-callback
     (λ (menu evt)
       (let ((edit (get-edit-target-object)))
-        (when (and edit (is-a? edit editor<%>))
-          (send edit do-edit-operation 'cut)))
+        (when (and edit (is-a? edit editor<%>)) (send edit do-edit-operation 'cut)))
       #t))
    (define/public (edit-menu:get-cut-item) edit-menu:cut-item)
    (define/public (edit-menu:cut-string) (string-constant cut-menu-item))
@@ -325,10 +285,7 @@
     edit-menu:cut-on-demand
     (λ (item)
       (let* ((editor (get-edit-target-object))
-             (enable?
-              (and editor
-                   (is-a? editor editor<%>)
-                   (send editor can-do-edit-operation? 'cut))))
+             (enable? (and editor (is-a? editor editor<%>) (send editor can-do-edit-operation? 'cut))))
         (send item enable enable?))))
    (define/public (edit-menu:create-cut?) #t)
    (define/public edit-menu:between-cut-and-copy (λ (menu) (void)))
@@ -336,8 +293,7 @@
     edit-menu:copy-callback
     (λ (menu evt)
       (let ((edit (get-edit-target-object)))
-        (when (and edit (is-a? edit editor<%>))
-          (send edit do-edit-operation 'copy)))
+        (when (and edit (is-a? edit editor<%>)) (send edit do-edit-operation 'copy)))
       #t))
    (define/public (edit-menu:get-copy-item) edit-menu:copy-item)
    (define/public (edit-menu:copy-string) (string-constant copy-menu-item))
@@ -346,10 +302,7 @@
     edit-menu:copy-on-demand
     (λ (item)
       (let* ((editor (get-edit-target-object))
-             (enable?
-              (and editor
-                   (is-a? editor editor<%>)
-                   (send editor can-do-edit-operation? 'copy))))
+             (enable? (and editor (is-a? editor editor<%>) (send editor can-do-edit-operation? 'copy))))
         (send item enable enable?))))
    (define/public (edit-menu:create-copy?) #t)
    (define/public edit-menu:between-copy-and-paste (λ (menu) (void)))
@@ -357,8 +310,7 @@
     edit-menu:paste-callback
     (λ (menu evt)
       (let ((edit (get-edit-target-object)))
-        (when (and edit (is-a? edit editor<%>))
-          (send edit do-edit-operation 'paste)))
+        (when (and edit (is-a? edit editor<%>)) (send edit do-edit-operation 'paste)))
       #t))
    (define/public (edit-menu:get-paste-item) edit-menu:paste-item)
    (define/public (edit-menu:paste-string) (string-constant paste-menu-item))
@@ -367,10 +319,7 @@
     edit-menu:paste-on-demand
     (λ (item)
       (let* ((editor (get-edit-target-object))
-             (enable?
-              (and editor
-                   (is-a? editor editor<%>)
-                   (send editor can-do-edit-operation? 'paste))))
+             (enable? (and editor (is-a? editor editor<%>) (send editor can-do-edit-operation? 'paste))))
         (send item enable enable?))))
    (define/public (edit-menu:create-paste?) #t)
    (define/public edit-menu:between-paste-and-clear (λ (menu) (void)))
@@ -378,8 +327,7 @@
     edit-menu:clear-callback
     (λ (menu evt)
       (let ((edit (get-edit-target-object)))
-        (when (and edit (is-a? edit editor<%>))
-          (send edit do-edit-operation 'clear)))
+        (when (and edit (is-a? edit editor<%>)) (send edit do-edit-operation 'clear)))
       #t))
    (define/public (edit-menu:get-clear-item) edit-menu:clear-item)
    (define/public
@@ -392,10 +340,7 @@
     edit-menu:clear-on-demand
     (λ (item)
       (let* ((editor (get-edit-target-object))
-             (enable?
-              (and editor
-                   (is-a? editor editor<%>)
-                   (send editor can-do-edit-operation? 'clear))))
+             (enable? (and editor (is-a? editor editor<%>) (send editor can-do-edit-operation? 'clear))))
         (send item enable enable?))))
    (define/public (edit-menu:create-clear?) #t)
    (define/public edit-menu:between-clear-and-select-all (λ (menu) (void)))
@@ -403,29 +348,19 @@
     edit-menu:select-all-callback
     (λ (menu evt)
       (let ((edit (get-edit-target-object)))
-        (when (and edit (is-a? edit editor<%>))
-          (send edit do-edit-operation 'select-all)))
+        (when (and edit (is-a? edit editor<%>)) (send edit do-edit-operation 'select-all)))
       #t))
    (define/public (edit-menu:get-select-all-item) edit-menu:select-all-item)
-   (define/public
-    (edit-menu:select-all-string)
-    (string-constant select-all-menu-item))
-   (define/public
-    (edit-menu:select-all-help-string)
-    (string-constant select-all-info))
+   (define/public (edit-menu:select-all-string) (string-constant select-all-menu-item))
+   (define/public (edit-menu:select-all-help-string) (string-constant select-all-info))
    (define/public
     edit-menu:select-all-on-demand
     (λ (item)
       (let* ((editor (get-edit-target-object))
-             (enable?
-              (and editor
-                   (is-a? editor editor<%>)
-                   (send editor can-do-edit-operation? 'select-all))))
+             (enable? (and editor (is-a? editor editor<%>) (send editor can-do-edit-operation? 'select-all))))
         (send item enable enable?))))
    (define/public (edit-menu:create-select-all?) #t)
-   (define/public
-    edit-menu:between-select-all-and-find
-    (λ (menu) (make-object separator-menu-item% menu)))
+   (define/public edit-menu:between-select-all-and-find (λ (menu) (make-object separator-menu-item% menu)))
    (define/public edit-menu:find-callback (λ (item control) (void)))
    (define/public (edit-menu:get-find-item) edit-menu:find-item)
    (define/public (edit-menu:find-string) (string-constant find-menu-item))
@@ -433,66 +368,35 @@
    (define/public
     edit-menu:find-on-demand
     (λ (item)
-      (send item enable
-        (let
-         ((target (get-edit-target-object)))
-         (and target (is-a? target editor<%>))))))
+      (send item enable (let ((target (get-edit-target-object))) (and target (is-a? target editor<%>))))))
    (define/public (edit-menu:create-find?) #f)
    (define/public edit-menu:find-again-callback (λ (item control) (void)))
    (define/public (edit-menu:get-find-again-item) edit-menu:find-again-item)
-   (define/public
-    (edit-menu:find-again-string)
-    (string-constant find-again-menu-item))
-   (define/public
-    (edit-menu:find-again-help-string)
-    (string-constant find-again-info))
+   (define/public (edit-menu:find-again-string) (string-constant find-again-menu-item))
+   (define/public (edit-menu:find-again-help-string) (string-constant find-again-info))
    (define/public
     edit-menu:find-again-on-demand
     (λ (item)
-      (send item enable
-        (let
-         ((target (get-edit-target-object)))
-         (and target (is-a? target editor<%>))))))
+      (send item enable (let ((target (get-edit-target-object))) (and target (is-a? target editor<%>))))))
    (define/public (edit-menu:create-find-again?) #f)
-   (define/public
-    edit-menu:replace-and-find-again-callback
-    (λ (item control) (void)))
-   (define/public
-    (edit-menu:get-replace-and-find-again-item)
-    edit-menu:replace-and-find-again-item)
-   (define/public
-    (edit-menu:replace-and-find-again-string)
-    (string-constant replace-and-find-again-menu-item))
-   (define/public
-    (edit-menu:replace-and-find-again-help-string)
-    (string-constant replace-and-find-again-info))
+   (define/public edit-menu:replace-and-find-again-callback (λ (item control) (void)))
+   (define/public (edit-menu:get-replace-and-find-again-item) edit-menu:replace-and-find-again-item)
+   (define/public (edit-menu:replace-and-find-again-string) (string-constant replace-and-find-again-menu-item))
+   (define/public (edit-menu:replace-and-find-again-help-string) (string-constant replace-and-find-again-info))
    (define/public
     edit-menu:replace-and-find-again-on-demand
     (λ (item)
-      (send item enable
-        (let
-         ((target (get-edit-target-object)))
-         (and target (is-a? target editor<%>))))))
+      (send item enable (let ((target (get-edit-target-object))) (and target (is-a? target editor<%>))))))
    (define/public (edit-menu:create-replace-and-find-again?) #f)
    (define/public
     edit-menu:between-find-and-preferences
-    (λ (menu)
-      (unless (current-eventspace-has-standard-menus?)
-        (make-object separator-menu-item% menu))))
-   (define/public
-    edit-menu:preferences-callback
-    (λ (item control) (preferences:show-dialog) #t))
+    (λ (menu) (unless (current-eventspace-has-standard-menus?) (make-object separator-menu-item% menu))))
+   (define/public edit-menu:preferences-callback (λ (item control) (preferences:show-dialog) #t))
    (define/public (edit-menu:get-preferences-item) edit-menu:preferences-item)
-   (define/public
-    (edit-menu:preferences-string)
-    (string-constant preferences-menu-item))
-   (define/public
-    (edit-menu:preferences-help-string)
-    (string-constant preferences-info))
+   (define/public (edit-menu:preferences-string) (string-constant preferences-menu-item))
+   (define/public (edit-menu:preferences-help-string) (string-constant preferences-info))
    (define/public edit-menu:preferences-on-demand (λ (menu-item) (void)))
-   (define/public
-    (edit-menu:create-preferences?)
-    (not (current-eventspace-has-standard-menus?)))
+   (define/public (edit-menu:create-preferences?) (not (current-eventspace-has-standard-menus?)))
    (define/public edit-menu:after-preferences (λ (menu) (void)))
    (define/public help-menu:before-about (λ (menu) (void)))
    (define/public help-menu:about-callback (λ (item control) (void)))
@@ -503,18 +407,9 @@
    (define/public (help-menu:create-about?) #f)
    (define/public help-menu:after-about (λ (menu) (void)))
    (super-instantiate ())
-   (define file-menu
-     (make-object (get-menu%)
-       (string-constant file-menu-label)
-       (get-menu-bar)))
-   (define edit-menu
-     (make-object (get-menu%)
-       (string-constant edit-menu-label)
-       (get-menu-bar)))
-   (define help-menu
-     (make-object (get-menu%)
-       (string-constant help-menu-label)
-       (get-menu-bar)))
+   (define file-menu (make-object (get-menu%) (string-constant file-menu-label) (get-menu-bar)))
+   (define edit-menu (make-object (get-menu%) (string-constant edit-menu-label) (get-menu-bar)))
+   (define help-menu (make-object (get-menu%) (string-constant help-menu-label) (get-menu-bar)))
    (define file-menu:new-item
      (and (file-menu:create-new?)
           (new
@@ -522,14 +417,12 @@
            (label (file-menu:new-string))
            (parent file-menu)
            (callback
-            (let ((file-menu:new-callback
-                   (λ (item evt) (file-menu:new-callback item evt))))
+            (let ((file-menu:new-callback (λ (item evt) (file-menu:new-callback item evt))))
               file-menu:new-callback))
            (shortcut #\n)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (file-menu:new-help-string))
-           (demand-callback
-            (λ (menu-item) (file-menu:new-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (file-menu:new-on-demand menu-item))))))
    (file-menu:between-new-and-open (get-file-menu))
    (define file-menu:open-item
      (and (file-menu:create-open?)
@@ -538,14 +431,12 @@
            (label (file-menu:open-string))
            (parent file-menu)
            (callback
-            (let ((file-menu:open-callback
-                   (λ (item evt) (file-menu:open-callback item evt))))
+            (let ((file-menu:open-callback (λ (item evt) (file-menu:open-callback item evt))))
               file-menu:open-callback))
            (shortcut #\o)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (file-menu:open-help-string))
-           (demand-callback
-            (λ (menu-item) (file-menu:open-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (file-menu:open-on-demand menu-item))))))
    (define file-menu:open-recent-item
      (and (file-menu:create-open-recent?)
           (new
@@ -553,8 +444,7 @@
            (label (file-menu:open-recent-string))
            (parent file-menu)
            (help-string (file-menu:open-recent-help-string))
-           (demand-callback
-            (λ (menu-item) (file-menu:open-recent-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (file-menu:open-recent-on-demand menu-item))))))
    (file-menu:between-open-and-revert (get-file-menu))
    (define file-menu:revert-item
      (and (file-menu:create-revert?)
@@ -563,14 +453,12 @@
            (label (file-menu:revert-string))
            (parent file-menu)
            (callback
-            (let ((file-menu:revert-callback
-                   (λ (item evt) (file-menu:revert-callback item evt))))
+            (let ((file-menu:revert-callback (λ (item evt) (file-menu:revert-callback item evt))))
               file-menu:revert-callback))
            (shortcut #f)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (file-menu:revert-help-string))
-           (demand-callback
-            (λ (menu-item) (file-menu:revert-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (file-menu:revert-on-demand menu-item))))))
    (file-menu:between-revert-and-save (get-file-menu))
    (define file-menu:save-item
      (and (file-menu:create-save?)
@@ -579,14 +467,12 @@
            (label (file-menu:save-string))
            (parent file-menu)
            (callback
-            (let ((file-menu:save-callback
-                   (λ (item evt) (file-menu:save-callback item evt))))
+            (let ((file-menu:save-callback (λ (item evt) (file-menu:save-callback item evt))))
               file-menu:save-callback))
            (shortcut #\s)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (file-menu:save-help-string))
-           (demand-callback
-            (λ (menu-item) (file-menu:save-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (file-menu:save-on-demand menu-item))))))
    (define file-menu:save-as-item
      (and (file-menu:create-save-as?)
           (new
@@ -594,14 +480,12 @@
            (label (file-menu:save-as-string))
            (parent file-menu)
            (callback
-            (let ((file-menu:save-as-callback
-                   (λ (item evt) (file-menu:save-as-callback item evt))))
+            (let ((file-menu:save-as-callback (λ (item evt) (file-menu:save-as-callback item evt))))
               file-menu:save-as-callback))
            (shortcut #f)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (file-menu:save-as-help-string))
-           (demand-callback
-            (λ (menu-item) (file-menu:save-as-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (file-menu:save-as-on-demand menu-item))))))
    (file-menu:between-save-as-and-print (get-file-menu))
    (define file-menu:print-item
      (and (file-menu:create-print?)
@@ -610,14 +494,12 @@
            (label (file-menu:print-string))
            (parent file-menu)
            (callback
-            (let ((file-menu:print-callback
-                   (λ (item evt) (file-menu:print-callback item evt))))
+            (let ((file-menu:print-callback (λ (item evt) (file-menu:print-callback item evt))))
               file-menu:print-callback))
            (shortcut #\p)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (file-menu:print-help-string))
-           (demand-callback
-            (λ (menu-item) (file-menu:print-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (file-menu:print-on-demand menu-item))))))
    (file-menu:between-print-and-close (get-file-menu))
    (define file-menu:close-item
      (and (file-menu:create-close?)
@@ -626,14 +508,12 @@
            (label (file-menu:close-string))
            (parent file-menu)
            (callback
-            (let ((file-menu:close-callback
-                   (λ (item evt) (file-menu:close-callback item evt))))
+            (let ((file-menu:close-callback (λ (item evt) (file-menu:close-callback item evt))))
               file-menu:close-callback))
            (shortcut #\w)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (file-menu:close-help-string))
-           (demand-callback
-            (λ (menu-item) (file-menu:close-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (file-menu:close-on-demand menu-item))))))
    (file-menu:between-close-and-quit (get-file-menu))
    (define file-menu:quit-item
      (and (file-menu:create-quit?)
@@ -642,14 +522,12 @@
            (label (file-menu:quit-string))
            (parent file-menu)
            (callback
-            (let ((file-menu:quit-callback
-                   (λ (item evt) (file-menu:quit-callback item evt))))
+            (let ((file-menu:quit-callback (λ (item evt) (file-menu:quit-callback item evt))))
               file-menu:quit-callback))
            (shortcut #\q)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (file-menu:quit-help-string))
-           (demand-callback
-            (λ (menu-item) (file-menu:quit-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (file-menu:quit-on-demand menu-item))))))
    (file-menu:after-quit (get-file-menu))
    (define edit-menu:undo-item
      (and (edit-menu:create-undo?)
@@ -658,14 +536,12 @@
            (label (edit-menu:undo-string))
            (parent edit-menu)
            (callback
-            (let ((edit-menu:undo-callback
-                   (λ (item evt) (edit-menu:undo-callback item evt))))
+            (let ((edit-menu:undo-callback (λ (item evt) (edit-menu:undo-callback item evt))))
               edit-menu:undo-callback))
            (shortcut #\z)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (edit-menu:undo-help-string))
-           (demand-callback
-            (λ (menu-item) (edit-menu:undo-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:undo-on-demand menu-item))))))
    (define edit-menu:redo-item
      (and (edit-menu:create-redo?)
           (new
@@ -673,17 +549,15 @@
            (label (edit-menu:redo-string))
            (parent edit-menu)
            (callback
-            (let ((edit-menu:redo-callback
-                   (λ (item evt) (edit-menu:redo-callback item evt))))
+            (let ((edit-menu:redo-callback (λ (item evt) (edit-menu:redo-callback item evt))))
               edit-menu:redo-callback))
-           (shortcut (if (eq? (system-type) 'macosx) #\z #\y))
+           (shortcut (if (eq? (system-type) 'windows) #\y #\z))
            (shortcut-prefix
-            (if (eq? (system-type) 'macosx)
-              (cons 'shift (get-default-shortcut-prefix))
-              (get-default-shortcut-prefix)))
+            (if (eq? (system-type) 'windows)
+              (get-default-shortcut-prefix)
+              (cons 'shift (get-default-shortcut-prefix))))
            (help-string (edit-menu:redo-help-string))
-           (demand-callback
-            (λ (menu-item) (edit-menu:redo-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:redo-on-demand menu-item))))))
    (edit-menu:between-redo-and-cut (get-edit-menu))
    (define edit-menu:cut-item
      (and (edit-menu:create-cut?)
@@ -692,14 +566,12 @@
            (label (edit-menu:cut-string))
            (parent edit-menu)
            (callback
-            (let ((edit-menu:cut-callback
-                   (λ (item evt) (edit-menu:cut-callback item evt))))
+            (let ((edit-menu:cut-callback (λ (item evt) (edit-menu:cut-callback item evt))))
               edit-menu:cut-callback))
            (shortcut #\x)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (edit-menu:cut-help-string))
-           (demand-callback
-            (λ (menu-item) (edit-menu:cut-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:cut-on-demand menu-item))))))
    (edit-menu:between-cut-and-copy (get-edit-menu))
    (define edit-menu:copy-item
      (and (edit-menu:create-copy?)
@@ -708,14 +580,12 @@
            (label (edit-menu:copy-string))
            (parent edit-menu)
            (callback
-            (let ((edit-menu:copy-callback
-                   (λ (item evt) (edit-menu:copy-callback item evt))))
+            (let ((edit-menu:copy-callback (λ (item evt) (edit-menu:copy-callback item evt))))
               edit-menu:copy-callback))
            (shortcut #\c)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (edit-menu:copy-help-string))
-           (demand-callback
-            (λ (menu-item) (edit-menu:copy-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:copy-on-demand menu-item))))))
    (edit-menu:between-copy-and-paste (get-edit-menu))
    (define edit-menu:paste-item
      (and (edit-menu:create-paste?)
@@ -724,14 +594,12 @@
            (label (edit-menu:paste-string))
            (parent edit-menu)
            (callback
-            (let ((edit-menu:paste-callback
-                   (λ (item evt) (edit-menu:paste-callback item evt))))
+            (let ((edit-menu:paste-callback (λ (item evt) (edit-menu:paste-callback item evt))))
               edit-menu:paste-callback))
            (shortcut #\v)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (edit-menu:paste-help-string))
-           (demand-callback
-            (λ (menu-item) (edit-menu:paste-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:paste-on-demand menu-item))))))
    (edit-menu:between-paste-and-clear (get-edit-menu))
    (define edit-menu:clear-item
      (and (edit-menu:create-clear?)
@@ -740,14 +608,12 @@
            (label (edit-menu:clear-string))
            (parent edit-menu)
            (callback
-            (let ((edit-menu:clear-callback
-                   (λ (item evt) (edit-menu:clear-callback item evt))))
+            (let ((edit-menu:clear-callback (λ (item evt) (edit-menu:clear-callback item evt))))
               edit-menu:clear-callback))
            (shortcut #f)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (edit-menu:clear-help-string))
-           (demand-callback
-            (λ (menu-item) (edit-menu:clear-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:clear-on-demand menu-item))))))
    (edit-menu:between-clear-and-select-all (get-edit-menu))
    (define edit-menu:select-all-item
      (and (edit-menu:create-select-all?)
@@ -756,14 +622,12 @@
            (label (edit-menu:select-all-string))
            (parent edit-menu)
            (callback
-            (let ((edit-menu:select-all-callback
-                   (λ (item evt) (edit-menu:select-all-callback item evt))))
+            (let ((edit-menu:select-all-callback (λ (item evt) (edit-menu:select-all-callback item evt))))
               edit-menu:select-all-callback))
            (shortcut #\a)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (edit-menu:select-all-help-string))
-           (demand-callback
-            (λ (menu-item) (edit-menu:select-all-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:select-all-on-demand menu-item))))))
    (edit-menu:between-select-all-and-find (get-edit-menu))
    (define edit-menu:find-item
      (and (edit-menu:create-find?)
@@ -772,14 +636,12 @@
            (label (edit-menu:find-string))
            (parent edit-menu)
            (callback
-            (let ((edit-menu:find-callback
-                   (λ (item evt) (edit-menu:find-callback item evt))))
+            (let ((edit-menu:find-callback (λ (item evt) (edit-menu:find-callback item evt))))
               edit-menu:find-callback))
            (shortcut #\f)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (edit-menu:find-help-string))
-           (demand-callback
-            (λ (menu-item) (edit-menu:find-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:find-on-demand menu-item))))))
    (define edit-menu:find-again-item
      (and (edit-menu:create-find-again?)
           (new
@@ -787,14 +649,12 @@
            (label (edit-menu:find-again-string))
            (parent edit-menu)
            (callback
-            (let ((edit-menu:find-again-callback
-                   (λ (item evt) (edit-menu:find-again-callback item evt))))
+            (let ((edit-menu:find-again-callback (λ (item evt) (edit-menu:find-again-callback item evt))))
               edit-menu:find-again-callback))
            (shortcut #\g)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (edit-menu:find-again-help-string))
-           (demand-callback
-            (λ (menu-item) (edit-menu:find-again-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:find-again-on-demand menu-item))))))
    (define edit-menu:replace-and-find-again-item
      (and (edit-menu:create-replace-and-find-again?)
           (new
@@ -803,15 +663,12 @@
            (parent edit-menu)
            (callback
             (let ((edit-menu:replace-and-find-again-callback
-                   (λ (item evt)
-                     (edit-menu:replace-and-find-again-callback item evt))))
+                   (λ (item evt) (edit-menu:replace-and-find-again-callback item evt))))
               edit-menu:replace-and-find-again-callback))
            (shortcut (if (eq? (system-type) 'macosx) #f #\h))
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (edit-menu:replace-and-find-again-help-string))
-           (demand-callback
-            (λ (menu-item)
-              (edit-menu:replace-and-find-again-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:replace-and-find-again-on-demand menu-item))))))
    (edit-menu:between-find-and-preferences (get-edit-menu))
    (define edit-menu:preferences-item
      (and (edit-menu:create-preferences?)
@@ -820,14 +677,12 @@
            (label (edit-menu:preferences-string))
            (parent edit-menu)
            (callback
-            (let ((edit-menu:preferences-callback
-                   (λ (item evt) (edit-menu:preferences-callback item evt))))
+            (let ((edit-menu:preferences-callback (λ (item evt) (edit-menu:preferences-callback item evt))))
               edit-menu:preferences-callback))
            (shortcut (case (system-type) ((macosx) #\,) (else #\;)))
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (edit-menu:preferences-help-string))
-           (demand-callback
-            (λ (menu-item) (edit-menu:preferences-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (edit-menu:preferences-on-demand menu-item))))))
    (edit-menu:after-preferences (get-edit-menu))
    (help-menu:before-about (get-help-menu))
    (define help-menu:about-item
@@ -837,13 +692,11 @@
            (label (help-menu:about-string))
            (parent help-menu)
            (callback
-            (let ((help-menu:about-callback
-                   (λ (item evt) (help-menu:about-callback item evt))))
+            (let ((help-menu:about-callback (λ (item evt) (help-menu:about-callback item evt))))
               help-menu:about-callback))
            (shortcut #f)
            (shortcut-prefix (get-default-shortcut-prefix))
            (help-string (help-menu:about-help-string))
-           (demand-callback
-            (λ (menu-item) (help-menu:about-on-demand menu-item))))))
+           (demand-callback (λ (menu-item) (help-menu:about-on-demand menu-item))))))
    (help-menu:after-about (get-help-menu))
    (reorder-menus this)))