--- a/src/pt-fcn-handle.cc	Tue Feb 03 12:47:38 2009 +0100
+++ b/src/pt-fcn-handle.cc	Wed Feb 04 00:47:53 2009 -0500
@@ -49,14 +49,11 @@
 }
 
 octave_value
-tree_fcn_handle::rvalue (void)
+tree_fcn_handle::rvalue1 (int)
 {
-  MAYBE_DO_BREAKPOINT;
-
   return make_fcn_handle (nm);
 }
 
-
 octave_value_list
 tree_fcn_handle::rvalue (int nargout)
 {
@@ -65,7 +62,7 @@
   if (nargout > 1)
     error ("invalid number of output arguments for function handle expression");
   else
-    retval = rvalue ();
+    retval = rvalue1 (nargout);
 
   return retval;
 }
@@ -88,10 +85,8 @@
 }
 
 octave_value
-tree_anon_fcn_handle::rvalue (void)
+tree_anon_fcn_handle::rvalue1 (int)
 {
-  MAYBE_DO_BREAKPOINT;
-
   tree_parameter_list *param_list = parameter_list ();
   tree_parameter_list *ret_list = return_list ();
   tree_statement_list *cmd_list = body ();
@@ -140,7 +135,7 @@
   if (nargout > 1)
     error ("invalid number of output arguments for anonymous function handle expression");
   else
-    retval = rvalue ();
+    retval = rvalue1 (nargout);
 
   return retval;
 }