--- a/liboctave/Array.h
+++ b/liboctave/Array.h
@@ -182,18 +182,18 @@
 	}
     }
 
-#if defined (BOUNDS_CHECKING)
-  T& elem (int n) { return checkelem (n); }
-#else
   T& elem (int n)
     {
       make_unique ();
       return xelem (n);
     }
+
+#if defined (BOUNDS_CHECKING)
+  T& operator () (int n) { return checkelem (n); }
+#else
+  T& operator () (int n) { return elem (n); }
 #endif
 
-  T& operator () (int n) { return elem (n); }
-
   T Array<T>::checkelem (int n) const
     {
       if (n < 0 || n >= rep->length ())
@@ -202,14 +202,14 @@
 	return xelem (n);
     }
 
+  T Array<T>::elem (int n) const { return xelem (n); }
+
 #if defined (BOUNDS_CHECKING)
-  T Array<T>::elem (int n) const { return checkelem (n); }
+  T Array<T>::operator () (int n) const { return checkelem (n); }
 #else
-  T Array<T>::elem (int n) const { return xelem (n); }
+  T Array<T>::operator () (int n) const { return elem (n); }
 #endif
 
-  T Array<T>::operator () (int n) const { return elem (n); }
-
   void resize (int n);
   void resize (int n, const T& val);