--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -62,7 +62,6 @@
 #include "oct-hist.h"
 #include "oct-map.h"
 #include "oct-obj.h"
-#include "oct-sym.h"
 #include "pager.h"
 #include "parse.h"
 #include "pathsearch.h"
@@ -95,9 +94,6 @@
 // Nonzero means we printed messages about reading startup files.
 int reading_startup_message_printed = 0;
 
-// Command number, counting from the beginning of this session.
-int current_command_number = 1;
-
 // Nonzero means we are exiting via the builtin exit or quit functions.
 int quitting_gracefully = 0;
 
@@ -289,7 +285,7 @@
 	      if (octave_completion_matches_called)
 		octave_completion_matches_called = false;	    
 	      else
-		current_command_number++;
+		command_editor::increment_current_command_number ();
 	    }
 	}
     }
@@ -472,7 +468,7 @@
 {
   octave_value_list retval;
 
-  octave_symbol *fcn = is_valid_function (args(0), "feval", 1);
+  octave_function *fcn = is_valid_function (args(0), "feval", 1);
 
   if (fcn)
     {
@@ -492,7 +488,7 @@
 
       tmp_args.stash_name_tags (tmp_arg_names);
 
-      retval = fcn->eval (nargout, tmp_args);
+      retval = fcn->do_index_op (nargout, tmp_args);
     }
 
   return retval;