--- a/liboctave/CColVector.cc
+++ b/liboctave/CColVector.cc
@@ -40,9 +40,9 @@
 {
   F77_RET_T
   F77_FUNC (zgemv, ZGEMV) (F77_CONST_CHAR_ARG_DECL,
-			   const int&, const int&, const Complex&,
-			   const Complex*, const int&, const Complex*,
-			   const int&, const Complex&, Complex*, const int&
+			   const octave_idx_type&, const octave_idx_type&, const Complex&,
+			   const Complex*, const octave_idx_type&, const Complex*,
+			   const octave_idx_type&, const Complex&, Complex*, const octave_idx_type&
 			   F77_CHAR_ARG_LEN_DECL);
 }
 
@@ -51,14 +51,14 @@
 ComplexColumnVector::ComplexColumnVector (const ColumnVector& a)
    : MArray<Complex> (a.length ())
 {
-  for (int i = 0; i < length (); i++)
+  for (octave_idx_type i = 0; i < length (); i++)
     elem (i) = a.elem (i);
 }
 
 bool
 ComplexColumnVector::operator == (const ComplexColumnVector& a) const
 {
-  int len = length ();
+  octave_idx_type len = length ();
   if (len != a.length ())
     return 0;
   return mx_inline_equal (data (), a.data (), len);
@@ -73,9 +73,9 @@
 // destructive insert/delete/reorder operations
 
 ComplexColumnVector&
-ComplexColumnVector::insert (const ColumnVector& a, int r)
+ComplexColumnVector::insert (const ColumnVector& a, octave_idx_type r)
 {
-  int a_len = a.length ();
+  octave_idx_type a_len = a.length ();
 
   if (r < 0 || r + a_len > length ())
     {
@@ -87,7 +87,7 @@
     {
       make_unique ();
 
-      for (int i = 0; i < a_len; i++)
+      for (octave_idx_type i = 0; i < a_len; i++)
 	xelem (r+i) = a.elem (i);
     }
 
@@ -95,9 +95,9 @@
 }
 
 ComplexColumnVector&
-ComplexColumnVector::insert (const ComplexColumnVector& a, int r)
+ComplexColumnVector::insert (const ComplexColumnVector& a, octave_idx_type r)
 {
-  int a_len = a.length ();
+  octave_idx_type a_len = a.length ();
 
   if (r < 0 || r + a_len > length ())
     {
@@ -109,7 +109,7 @@
     {
       make_unique ();
 
-      for (int i = 0; i < a_len; i++)
+      for (octave_idx_type i = 0; i < a_len; i++)
 	xelem (r+i) = a.elem (i);
     }
 
@@ -119,13 +119,13 @@
 ComplexColumnVector&
 ComplexColumnVector::fill (double val)
 {
-  int len = length ();
+  octave_idx_type len = length ();
 
   if (len > 0)
     {
       make_unique ();
 
-      for (int i = 0; i < len; i++)
+      for (octave_idx_type i = 0; i < len; i++)
 	xelem (i) = val;
     }
 
@@ -135,13 +135,13 @@
 ComplexColumnVector&
 ComplexColumnVector::fill (const Complex& val)
 {
-  int len = length ();
+  octave_idx_type len = length ();
 
   if (len > 0)
     {
       make_unique ();
 
-      for (int i = 0; i < len; i++)
+      for (octave_idx_type i = 0; i < len; i++)
 	xelem (i) = val;
     }
 
@@ -150,9 +150,9 @@
 }
 
 ComplexColumnVector&
-ComplexColumnVector::fill (double val, int r1, int r2)
+ComplexColumnVector::fill (double val, octave_idx_type r1, octave_idx_type r2)
 {
-  int len = length ();
+  octave_idx_type len = length ();
 
   if (r1 < 0 || r2 < 0 || r1 >= len || r2 >= len)
     {
@@ -160,13 +160,13 @@
       return *this;
     }
 
-  if (r1 > r2) { int tmp = r1; r1 = r2; r2 = tmp; }
+  if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; }
 
   if (r2 >= r1)
     {
       make_unique ();
 
-      for (int i = r1; i <= r2; i++)
+      for (octave_idx_type i = r1; i <= r2; i++)
 	xelem (i) = val;
     }
 
@@ -174,9 +174,9 @@
 }
 
 ComplexColumnVector&
-ComplexColumnVector::fill (const Complex& val, int r1, int r2)
+ComplexColumnVector::fill (const Complex& val, octave_idx_type r1, octave_idx_type r2)
 {
-  int len = length ();
+  octave_idx_type len = length ();
 
   if (r1 < 0 || r2 < 0 || r1 >= len || r2 >= len)
     {
@@ -184,13 +184,13 @@
       return *this;
     }
 
-  if (r1 > r2) { int tmp = r1; r1 = r2; r2 = tmp; }
+  if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; }
 
   if (r2 >= r1)
     {
       make_unique ();
 
-      for (int i = r1; i <= r2; i++)
+      for (octave_idx_type i = r1; i <= r2; i++)
 	xelem (i) = val;
     }
 
@@ -200,8 +200,8 @@
 ComplexColumnVector
 ComplexColumnVector::stack (const ColumnVector& a) const
 {
-  int len = length ();
-  int nr_insert = len;
+  octave_idx_type len = length ();
+  octave_idx_type nr_insert = len;
   ComplexColumnVector retval (len + a.length ());
   retval.insert (*this, 0);
   retval.insert (a, nr_insert);
@@ -211,8 +211,8 @@
 ComplexColumnVector
 ComplexColumnVector::stack (const ComplexColumnVector& a) const
 {
-  int len = length ();
-  int nr_insert = len;
+  octave_idx_type len = length ();
+  octave_idx_type nr_insert = len;
   ComplexColumnVector retval (len + a.length ());
   retval.insert (*this, 0);
   retval.insert (a, nr_insert);
@@ -222,7 +222,7 @@
 ComplexRowVector
 ComplexColumnVector::hermitian (void) const
 {
-  int len = length ();
+  octave_idx_type len = length ();
   return ComplexRowVector (mx_inline_conj_dup (data (), len), len);
 }
 
@@ -235,7 +235,7 @@
 ComplexColumnVector
 conj (const ComplexColumnVector& a)
 {
-  int a_len = a.length ();
+  octave_idx_type a_len = a.length ();
   ComplexColumnVector retval;
   if (a_len > 0)
     retval = ComplexColumnVector (mx_inline_conj_dup (a.data (), a_len), a_len);
@@ -245,26 +245,26 @@
 // resize is the destructive equivalent for this one
 
 ComplexColumnVector
-ComplexColumnVector::extract (int r1, int r2) const
+ComplexColumnVector::extract (octave_idx_type r1, octave_idx_type r2) const
 {
-  if (r1 > r2) { int tmp = r1; r1 = r2; r2 = tmp; }
+  if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; }
 
-  int new_r = r2 - r1 + 1;
+  octave_idx_type new_r = r2 - r1 + 1;
 
   ComplexColumnVector result (new_r);
 
-  for (int i = 0; i < new_r; i++)
+  for (octave_idx_type i = 0; i < new_r; i++)
     result.elem (i) = elem (r1+i);
 
   return result;
 }
 
 ComplexColumnVector
-ComplexColumnVector::extract_n (int r1, int n) const
+ComplexColumnVector::extract_n (octave_idx_type r1, octave_idx_type n) const
 {
   ComplexColumnVector result (n);
 
-  for (int i = 0; i < n; i++)
+  for (octave_idx_type i = 0; i < n; i++)
     result.elem (i) = elem (r1+i);
 
   return result;
@@ -275,9 +275,9 @@
 ComplexColumnVector&
 ComplexColumnVector::operator += (const ColumnVector& a)
 {
-  int len = length ();
+  octave_idx_type len = length ();
 
-  int a_len = a.length ();
+  octave_idx_type a_len = a.length ();
 
   if (len != a_len)
     {
@@ -297,9 +297,9 @@
 ComplexColumnVector&
 ComplexColumnVector::operator -= (const ColumnVector& a)
 {
-  int len = length ();
+  octave_idx_type len = length ();
 
-  int a_len = a.length ();
+  octave_idx_type a_len = a.length ();
 
   if (len != a_len)
     {
@@ -330,10 +330,10 @@
 {
   ComplexColumnVector retval;
 
-  int nr = m.rows ();
-  int nc = m.cols ();
+  octave_idx_type nr = m.rows ();
+  octave_idx_type nc = m.cols ();
 
-  int a_len = a.length ();
+  octave_idx_type a_len = a.length ();
 
   if (nc != a_len)
     gripe_nonconformant ("operator *", nr, nc, a_len, 1);
@@ -343,7 +343,7 @@
 	retval.resize (nr, 0.0);
       else
 	{
-	  int ld = nr;
+	  octave_idx_type ld = nr;
 
 	  retval.resize (nr);
 	  Complex *y = retval.fortran_vec ();
@@ -376,10 +376,10 @@
 ComplexColumnVector
 operator * (const DiagMatrix& m, const ComplexColumnVector& a)
 {
-  int nr = m.rows ();
-  int nc = m.cols ();
+  octave_idx_type nr = m.rows ();
+  octave_idx_type nc = m.cols ();
 
-  int a_len = a.length ();
+  octave_idx_type a_len = a.length ();
 
   if (nc != a_len)
     {
@@ -392,10 +392,10 @@
 
   ComplexColumnVector result (nr);
 
-  for (int i = 0; i < a_len; i++)
+  for (octave_idx_type i = 0; i < a_len; i++)
     result.elem (i) = a.elem (i) * m.elem (i, i);
 
-  for (int i = a_len; i < nr; i++)
+  for (octave_idx_type i = a_len; i < nr; i++)
     result.elem (i) = 0.0;
 
   return result;
@@ -404,10 +404,10 @@
 ComplexColumnVector
 operator * (const ComplexDiagMatrix& m, const ColumnVector& a)
 {
-  int nr = m.rows ();
-  int nc = m.cols ();
+  octave_idx_type nr = m.rows ();
+  octave_idx_type nc = m.cols ();
 
-  int a_len = a.length ();
+  octave_idx_type a_len = a.length ();
 
   if (nc != a_len)
     {
@@ -420,10 +420,10 @@
 
   ComplexColumnVector result (nr);
 
-  for (int i = 0; i < a_len; i++)
+  for (octave_idx_type i = 0; i < a_len; i++)
     result.elem (i) = a.elem (i) * m.elem (i, i);
 
-  for (int i = a_len; i < nr; i++)
+  for (octave_idx_type i = a_len; i < nr; i++)
     result.elem (i) = 0.0;
 
   return result;
@@ -432,10 +432,10 @@
 ComplexColumnVector
 operator * (const ComplexDiagMatrix& m, const ComplexColumnVector& a)
 {
-  int nr = m.rows ();
-  int nc = m.cols ();
+  octave_idx_type nr = m.rows ();
+  octave_idx_type nc = m.cols ();
 
-  int a_len = a.length ();
+  octave_idx_type a_len = a.length ();
 
   if (nc != a_len)
     {
@@ -448,10 +448,10 @@
 
   ComplexColumnVector result (nr);
 
-  for (int i = 0; i < a_len; i++)
+  for (octave_idx_type i = 0; i < a_len; i++)
     result.elem (i) = a.elem (i) * m.elem (i, i);
 
-  for (int i = a_len; i < nr; i++)
+  for (octave_idx_type i = a_len; i < nr; i++)
     result.elem (i) = 0.0;
 
   return result;
@@ -471,13 +471,13 @@
 {
   const Complex *d = data ();
 
-  int len = length ();
+  octave_idx_type len = length ();
 
   ColumnVector retval (len);
 
   double *r = retval.fortran_vec ();
 
-  for (int i = 0; i < len; i++)
+  for (octave_idx_type i = 0; i < len; i++)
     r[i] = f (d[i]);
 
   return retval;
@@ -488,7 +488,7 @@
 {
   Complex *d = fortran_vec (); // Ensures only one reference to my privates!
 
-  for (int i = 0; i < length (); i++)
+  for (octave_idx_type i = 0; i < length (); i++)
     d[i] = f (d[i]);
 
   return *this;
@@ -497,14 +497,14 @@
 Complex
 ComplexColumnVector::min (void) const
 {
-  int len = length ();
+  octave_idx_type len = length ();
   if (len == 0)
     return 0.0;
 
   Complex res = elem (0);
   double absres = std::abs (res);
 
-  for (int i = 1; i < len; i++)
+  for (octave_idx_type i = 1; i < len; i++)
     if (std::abs (elem (i)) < absres)
       {
 	res = elem (i);
@@ -517,14 +517,14 @@
 Complex
 ComplexColumnVector::max (void) const
 {
-  int len = length ();
+  octave_idx_type len = length ();
   if (len == 0)
     return 0.0;
 
   Complex res = elem (0);
   double absres = std::abs (res);
 
-  for (int i = 1; i < len; i++)
+  for (octave_idx_type i = 1; i < len; i++)
     if (std::abs (elem (i)) > absres)
       {
 	res = elem (i);
@@ -540,7 +540,7 @@
 operator << (std::ostream& os, const ComplexColumnVector& a)
 {
 //  int field_width = os.precision () + 7;
-  for (int i = 0; i < a.length (); i++)
+  for (octave_idx_type i = 0; i < a.length (); i++)
     os << /* setw (field_width) << */ a.elem (i) << "\n";
   return os;
 }
@@ -548,14 +548,14 @@
 std::istream&
 operator >> (std::istream& is, ComplexColumnVector& a)
 {
-  int len = a.length();
+  octave_idx_type len = a.length();
 
   if (len < 1)
     is.clear (std::ios::badbit);
   else
     {
       double tmp;
-      for (int i = 0; i < len; i++)
+      for (octave_idx_type i = 0; i < len; i++)
         {
           is >> tmp;
           if (is)