--- a/liboctave/NPSOL.h
+++ b/liboctave/NPSOL.h
@@ -33,10 +33,6 @@
 #include "dColVector.h"
 #include "NLP.h"
 
-#ifndef Vector
-#define Vector ColumnVector
-#endif
-
 class NPSOL_options
 {
  public:
@@ -134,47 +130,33 @@
 
   NPSOL (void) : NLP () { }
 
-  NPSOL (const Vector& x, const Objective& phi) : NLP (x, phi) { }
+  NPSOL (const ColumnVector& x, const Objective& phi) : NLP (x, phi) { }
 
-  NPSOL (const Vector& x, const Objective& phi,
-	 const Bounds& b) : NLP (x, phi, b)
-    { }
+  NPSOL (const ColumnVector& x, const Objective& phi,
+	 const Bounds& b) : NLP (x, phi, b) { }
 
-  NPSOL (const Vector& x, const Objective& phi, const Bounds& b,
-	 const LinConst& lc) : NLP (x, phi, b, lc)
-    { }
+  NPSOL (const ColumnVector& x, const Objective& phi, const Bounds& b,
+	 const LinConst& lc) : NLP (x, phi, b, lc) { }
 
-  NPSOL (const Vector& x, const Objective& phi, const Bounds& b,
-	 const LinConst& lc, const NLConst& nlc) : NLP (x, phi, b, lc, nlc)
-    { }
-
-  NPSOL (const Vector& x, const Objective& phi,
-	 const LinConst& lc) : NLP (x, phi, lc)
-    { }
+  NPSOL (const ColumnVector& x, const Objective& phi, const Bounds& b,
+	 const LinConst& lc, const NLConst& nlc)
+    : NLP (x, phi, b, lc, nlc) { }
 
-  NPSOL (const Vector& x, const Objective& phi, const LinConst& lc,
-	 const NLConst& nlc) : NLP (x, phi, lc, nlc)
-    { }
+  NPSOL (const ColumnVector& x, const Objective& phi,
+	 const LinConst& lc) : NLP (x, phi, lc) { }
 
-  NPSOL (const Vector& x, const Objective& phi,
-	 const NLConst& nlc) : NLP (x, phi, nlc)
-    { }
-
-  NPSOL (const Vector& x, const Objective& phi, const Bounds& b,
-	 const NLConst& nlc) : NLP (x, phi, b, nlc)
-    { }
+  NPSOL (const ColumnVector& x, const Objective& phi, const LinConst& lc,
+	 const NLConst& nlc) : NLP (x, phi, lc, nlc) { }
 
-  NPSOL (const NPSOL& a);
+  NPSOL (const ColumnVector& x, const Objective& phi,
+	 const NLConst& nlc) : NLP (x, phi, nlc) { }
 
-  Vector minimize (void);
-  Vector minimize (double& objf);
-  Vector minimize (double& objf, int& inform);
-  Vector minimize (double& objf, int& inform, Vector& lambda);
+  NPSOL (const ColumnVector& x, const Objective& phi, const Bounds& b,
+	 const NLConst& nlc) : NLP (x, phi, b, nlc) { }
 
-  Vector minimize (const Vector& x);
-  Vector minimize (const Vector& x, double& objf);
-  Vector minimize (const Vector& x, double& objf, int& inform);
-  Vector minimize (const Vector& x, double& objf, int& inform, Vector& lambda);
+  NPSOL (const NPSOL& a) : NLP (a.x, a.phi, a.bnds, a.lc, a.nlc) { }
+
+  ColumnVector do_minimize (double& objf, int& inform, ColumnVector& lambda);
 
   NPSOL& option (char *s);
 
@@ -187,9 +169,6 @@
 // function, and the user wants us to quit.
 extern int npsol_objective_error;
 
-inline NPSOL::NPSOL (const NPSOL& a) : NLP (a.x, a.phi, a.bnds, a.lc, a.nlc)
-  { }
-
 #endif
 #endif