diff --git a/collects/framework/private/finder.ss b/collects/framework/private/finder.ss
index 84ab402a..5611502c 100644
--- a/collects/framework/private/finder.ss
+++ b/collects/framework/private/finder.ss
@@ -299,7 +299,7 @@
               (set-box! result-box #f)
               (show #f))]
 	  
-	  (define/override on-close (lambda () #f))
+	  (define/augment on-close (lambda () #f))
 	  
           (super-new (label (if save-mode? 
                                 (string-constant put-file)
diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss
index 671c662d..4cc79a37 100644
--- a/collects/framework/private/frame.ss
+++ b/collects/framework/private/frame.ss
@@ -213,21 +213,21 @@
       (define register-group-mixin
         (mixin (basic<%>) (register-group<%>)
           
-          (define/override (can-close?)
+          (define/augment (can-close?)
             (let ([number-of-frames 
                    (length (send (group:get-the-frame-group)
                                  get-frames))])
               (if (preferences:get 'framework:exit-when-no-frames)
-                  (and (super can-close?)
+                  (and (inner #t can-close?)
                        (or (exit:exiting?)
                            (not (= 1 number-of-frames))
                            (exit:user-oks-exit)))
                   #t)))
-          (define/override (on-close)
-            (super on-close)
+          (define/augment (on-close)
             (send (group:get-the-frame-group)
                   remove-frame
                   this)
+            (inner (void) on-close)
             (when (preferences:get 'framework:exit-when-no-frames)
               (unless (exit:exiting?)
                 (when (null? (send (group:get-the-frame-group) get-frames))
@@ -549,12 +549,12 @@
                (update-info-visibility v)))]
           [define memory-cleanup void] ;; only for CVSers and nightly build users; used with memory-text
 
-          [define/override on-close
+          [define/augment on-close
             (lambda ()
-              (super on-close)
               (unregister-collecting-blit gc-canvas)
               (close-panel-callback)
-              (memory-cleanup))]
+              (memory-cleanup)
+	      (inner (void) on-close))]
           
           [define icon-currently-locked? 'uninit]
           (public lock-status-changed)
@@ -695,11 +695,11 @@
                 (preferences:get 'framework:col-offsets)
                 v)
                #t))]
-          [define/override on-close
+          [define/augment on-close
             (lambda ()
-              (super on-close)
               (remove-first)
-              (remove-second))]
+              (remove-second)
+              (inner (void) on-close))]
           [define last-start #f]
           [define last-end #f]
           [define last-params #f]
@@ -945,13 +945,13 @@
                 (and this-fn
                      (path-equal? filename (get-filename))))))
           
-          (define/override (on-close)
-            (super on-close)
-            (send (get-editor) on-close))
+          (define/augment (on-close)
+            (send (get-editor) on-close)
+            (inner (void) on-close))
           
-          (define/override (can-close?)
-            (and (super can-close?)
-                 (send (get-editor) can-close?)))
+          (define/augment (can-close?)
+            (and (send (get-editor) can-close?)
+                 (inner #t can-close?)))
           
           [define label ""]
           [define label-prefix (application:current-app-name)]
@@ -1242,11 +1242,11 @@
                                      (string-constant open-here-menu-item)
                                      (string-constant open-menu-item))))
           
-	  (define/override (on-close)
-	    (super on-close)
+	  (define/augment (on-close)
 	    (let ([group (group:get-the-frame-group)])
 	      (when (eq? this (send group get-open-here-frame))
-		(send group set-open-here-frame #f))))
+		(send group set-open-here-frame #f)))
+	    (inner (void) on-close))
 
           (define/override (on-activate on?)
             (super on-activate on?)
@@ -2040,9 +2040,8 @@
              (lambda (p v)
                (when p
                  (hide-search)))))
-          (define/override on-close
+          (define/augment on-close
             (lambda ()
-              (super on-close)
               (remove-callback)
               (let ([close-canvas
                      (lambda (canvas edit)
@@ -2051,7 +2050,8 @@
 		  (close-canvas find-canvas find-edit)
 		  (close-canvas replace-canvas replace-edit)))
               (when (eq? this searching-frame)
-                (set-searching-frame #f))))
+                (set-searching-frame #f))
+              (inner (void) on-close)))
           (public set-search-direction can-replace? replace&search replace-all replace
                   toggle-search-focus move-to-search-or-search move-to-search-or-reverse-search
                   search-again)
diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss
index d47fce2f..d89ca949 100644
--- a/collects/mred/mred.ss
+++ b/collects/mred/mred.ss
@@ -2322,13 +2322,17 @@
   ; >>> This class is instantiated directly by the end-user <<<
   (class* % (editor<%> internal-editor<%>)
     (init-rest args)
-    (inherit get-max-width set-max-width get-admin get-view-size
+    (rename-super [super-get-view-size get-view-size]
+		  [super-begin-edit-sequence begin-edit-sequence]
+		  [super-end-edit-sequence end-edit-sequence]
+		  [super-insert-port insert-port]
+		  [super-erase erase]
+		  [super-clear-undos clear-undos]
+		  [super-get-load-overwrites-styles get-load-overwrites-styles]
+		  [super-get-filename get-filename])
+    (inherit get-max-width set-max-width get-admin
 	     get-keymap get-style-list
-	     set-modified set-filename
-	     begin-edit-sequence end-edit-sequence
-	     insert-port
-	     get-filename
-	     erase clear-undos get-load-overwrites-styles)
+	     set-modified set-filename)
     (define canvases null)
     (define active-canvas #f)
     (define auto-set-wrap? #f)
@@ -2337,7 +2341,7 @@
        (lambda ()
 	 (let ([wb (box 0)]
 	       [hb (box 0)])
-	   (super get-view-size wb hb)
+	   (super-get-view-size wb hb)
 	   (unless (or (null? canvases) (null? (cdr canvases)))
 	     (for-each
 	      (lambda (canvas)
@@ -2345,7 +2349,7 @@
 		      (lambda ()
 			(let ([wb2 (box 0)]
 			      [hb2 (box 0)])
-			  (super get-view-size wb2 hb2)
+			  (super-get-view-size wb2 hb2)
 			  (set-box! wb (max (unbox wb) (unbox wb2)))
 			  (set-box! hb (max (unbox hb) (unbox hb2)))))))
 	      canvases))
@@ -2359,14 +2363,14 @@
       [insert-file
        (opt-lambda ([file #f] [format 'guess] [show-errors? #t])
 	 (dynamic-wind
-	     (lambda () (super begin-edit-sequence))
-	     (lambda () (super insert-port file format #f))
-	     (lambda () (super end-edit-sequence))))]
+	     (lambda () (super-begin-edit-sequence))
+	     (lambda () (super-insert-port file format #f))
+	     (lambda () (super-end-edit-sequence))))]
 
       [load-file
        (opt-lambda ([file #f] [format 'guess] [show-errors? #t])
 	 (let* ([temp-filename?-box (box #f)]
-		[old-filename (super get-filename temp-filename?-box)])
+		[old-filename (super-get-filename temp-filename?-box)])
 	   (let* ([file (cond
 			 [(or (not (path-string? file))
 			      (equal? file ""))
@@ -2389,26 +2393,26 @@
 		      void
 		      (lambda ()
 			(wx:begin-busy-cursor)
-			(super begin-edit-sequence)
+			(super-begin-edit-sequence)
 			(dynamic-wind
 			    void
 			    (lambda ()
-			      (super erase)
+			      (super-erase)
 			      (unless (and (not (unbox temp-filename?-box))
 					   (equal? file old-filename))
 				(set-filename file #f))
 			      (let ([format (if (eq? format 'same)
 						(-get-file-format)
 						format)])
-				(let ([new-format (super insert-port port 
+				(let ([new-format (super-insert-port port 
 								     (-format-filter format) 
-								     (super get-load-overwrites-styles))])
+								     (super-get-load-overwrites-styles))])
 				  (close-input-port port) ; close as soon as possible
 				  (-set-file-format new-format)))) ; text% only
 			    (lambda ()
-			      (super end-edit-sequence)
+			      (super-end-edit-sequence)
 			      (wx:end-busy-cursor)))
-			(super clear-undos)
+			(super-clear-undos)
 			(set-modified #f)
 			(set! finished? #t)
 			#t)
@@ -2538,14 +2542,16 @@
       (init [line-spacing 1.0] 
 	    [tab-stops null]
 	    [(aw? auto-wrap) #f])
-      (inherit get-file-format set-file-format set-position
-	       auto-wrap)
+      (rename-super [super-get-file-format get-file-format]
+		    [super-set-file-format set-file-format]
+		    [super-set-position set-position]
+		    [super-auto-wrap auto-wrap])
       (override*
         [-get-file-format (lambda ()
-                            (super get-file-format))]
+                            (super-get-file-format))]
         [-set-file-format (lambda (format)
-                            (super set-file-format format)
-                            (super set-position 0 0))])
+                            (super-set-file-format format)
+                            (super-set-position 0 0))])
 
       (augmentize (#t can-insert? s e)
 		  ((void) on-insert s e)
@@ -2563,7 +2569,7 @@
       
       (super-make-object line-spacing tab-stops)
       (when aw?
-	(super auto-wrap #t))))
+	(super-auto-wrap #t))))
   
   (define pasteboard%
     (class (es-contract-mixin (make-editor-buffer% wx:pasteboard% #f (lambda () pasteboard%))) ()
@@ -4083,10 +4089,12 @@
 				   (send e get-meta-down)
 				   (eq? 'windows (system-type))
 				   (send wx system-menu) #t)))]
-      [get-eventspace (entry-point (lambda () (send wx get-eventspace)))]
-      [can-close? (lambda () #t)]
+      [get-eventspace (entry-point (lambda () (send wx get-eventspace)))])
+    (pubment
+      [can-close? (lambda () (inner #t can-close?))]
+      [on-close (lambda () (inner (void) on-close))])
+    (public
       [can-exit? (lambda () (can-close?))]
-      [on-close (lambda () (void))]
       [on-exit (lambda () (on-close) (show #f))]
       [on-activate (lambda (x) (void))]
       [center (entry-point
@@ -5975,10 +5983,11 @@
   ;; GUI creation
   (define frame (make-object (class100 frame% args
 			       (inherit accept-drop-files)
-			       (override
+			       (augment
 				 [on-close (lambda () 
 					     (custodian-shutdown-all user-custodian)
-					     (semaphore-post waiting))]
+					     (semaphore-post waiting))])
+			       (override
 				 [on-drop-file (lambda (f) (evaluate (format "(load ~s)" f)))])
 			       (sequence 
 				 (apply super-init args) (accept-drop-files #t)))
@@ -6121,13 +6130,14 @@
 			     (public
 			       [get-message
 				(lambda () message)])
-			     (override
+			     (augment
 			       [can-close? (lambda ()
 					     (if (memq 'disallow-close style)
 						 (begin
 						   (wx:bell)
 						   #f)
-						 #t))]
+						 #t))])
+			     (override
 			       [on-subwindow-event 
 				(lambda (w e)
 				  (if (send e button-down?)