--- a/src/mkbuiltins	Sat Oct 12 00:15:08 1996 +0000
+++ b/src/mkbuiltins	Sat Oct 12 00:22:22 1996 +0000
@@ -12,12 +12,27 @@
 #include "oct-obj.h"
 #include "variables.h"
 
+EOF
+
+for file in "$@"; do
+  fcn=`echo $file | sed -e 's/\.df//' -e 's/-/_/g'`
+  echo "static void"
+  echo "install_${fcn}_fcns (void)"
+  echo "{"
+  cat $file
+  echo "}"
+done
+
+cat << \EOF
 static void
 install_builtin_functions (void)
 {
 EOF
 
-cat "$@"
+for file in "$@"; do
+  fcn=`echo $file | sed -e 's/\.df//' -e 's/-/_/g'`
+  echo "  install_${fcn}_fcns ();"
+done
 
 cat << \EOF
 }

--- a/src/pt-cmd.cc	Sat Oct 12 00:15:08 1996 +0000
+++ b/src/pt-cmd.cc	Sat Oct 12 00:22:22 1996 +0000
@@ -45,7 +45,7 @@
 #include "oct-map.h"
 #include "symtab.h"
 #include "pt-cmd.h"
-#include "pt-const.h"
+#include "ov.h"
 #include "pt-exp.h"
 #include "pt-fvc.h"
 #include "pt-misc.h"
@@ -252,7 +252,7 @@
 {
   quit = false;
 
-  ident->assign (rhs);
+  octave_variable_reference tmp (ident);
 
   if (error_state)
     {
@@ -260,6 +260,8 @@
       return;
     }
 
+  tmp.assign (rhs);
+
   if (list)
     {
       list->eval (1);

--- a/src/pt-fcn.cc	Sat Oct 12 00:15:08 1996 +0000
+++ b/src/pt-fcn.cc	Sat Oct 12 00:22:22 1996 +0000
@@ -38,7 +38,6 @@
 #include "pager.h"
 #include "symtab.h"
 #include "toplev.h"
-#include "pt-const.h"
 #include "pt-exp.h"
 #include "pt-fcn.h"
 #include "pt-misc.h"
@@ -46,6 +45,7 @@
 #include "pt-walk.h"
 #include "unwind-prot.h"
 #include "utils.h"
+#include "ov.h"
 #include "variables.h"
 
 // If TRUE, variables returned from functions have default values even
@@ -78,13 +78,8 @@
 void
 tree_function::bind_nargin_and_nargout (int nargin, int nargout)
 {
-  octave_value *tmp;
-
-  tmp = new octave_value (nargin);
-  nargin_sr->define (tmp);
-
-  tmp = new octave_value (nargout);
-  nargout_sr->define (tmp);
+  nargin_sr->define ((double) nargin);
+  nargout_sr->define ((double) nargout);
 }
 
 tree_function::~tree_function (void)