diff -Naur mcclim.old/Apps/Scigraph/scigraph/popup-accept.lisp mcclim.new/Apps/Scigraph/scigraph/popup-accept.lisp
--- mcclim.old/Apps/Scigraph/scigraph/popup-accept.lisp	2007-05-26 13:06:17.000000000 +0200
+++ mcclim.new/Apps/Scigraph/scigraph/popup-accept.lisp	2007-05-26 13:05:12.000000000 +0200
@@ -158,8 +158,7 @@
   (list object window presentation))
 
 (install-command #+(or clim-0.9 (not clim)) :accept-values
-		 #+(or clim-1.0 (and clim-2 (not mcclim))) 'clim::accept-values
-		 #+mcclim 'climi::accepting-values ; who knows... --moore
+		 #+(or clim-1.0 clim-2 mcclim) 'clim::accept-values
 		 'com-pop-edit)
 
 
diff -Naur mcclim.old/Apps/Scigraph/scigraph/popup-accept-methods.lisp mcclim.new/Apps/Scigraph/scigraph/popup-accept-methods.lisp
--- mcclim.old/Apps/Scigraph/scigraph/popup-accept-methods.lisp	2007-05-26 13:06:17.000000000 +0200
+++ mcclim.new/Apps/Scigraph/scigraph/popup-accept-methods.lisp	2007-05-26 13:05:12.000000000 +0200
@@ -96,15 +96,13 @@
   (list object window presentation))
 
 (install-command #+(or clim-0.9 (not clim)) 'accept-values
-		 #+(or clim-1.0 (and clim-2 (not mcclim))) 'clim::accept-values
-		 #+mcclim 'climi::accepting-values
+		 #+(or clim-1.0 clim-2 mcclim) 'clim::accept-values
 		 'com-pop-edit-dataset)
 
 #+(or clim-1.0 clim-2)
 (define-presentation-to-command-translator com-pop-edit-dataset
    (graph-data :command-name com-pop-edit-dataset
-	       :command-table #-mcclim clim::accept-values
-	                      #+mcclim climi::accepting-values
+	       :command-table clim::accept-values
 	       :documentation "Change Data Symbols..."
 	       :menu t
 	       :gesture :select)