--- a/src/data.cc
+++ b/src/data.cc
@@ -432,7 +432,7 @@
   DATA_REDUCTION (cumsum);
 }
 
-// XXX FIXME XXX -- we could eliminate some duplicate code here with
+// FIXME -- we could eliminate some duplicate code here with
 // some template functions or macros.
 
 static octave_value
@@ -873,7 +873,7 @@
     {
       Array<int> vec = args(1).int_vector_value ();
 
-      // XXX FIXME XXX -- maybe we should create an idx_vector object
+      // FIXME -- maybe we should create an idx_vector object
       // here and pass that to permute?
 
       int n = vec.length ();
@@ -1216,7 +1216,7 @@
   return retval;
 }
 
-// XXX FIXME XXX -- perhaps this should be implemented with an
+// FIXME -- perhaps this should be implemented with an
 // octave_value member function?
 
 DEFUN (complex, args, ,
@@ -1480,7 +1480,7 @@
 
       check_dimensions (dims, fcn);
 
-      // XXX FIXME XXX -- perhaps this should be made extensible by
+      // FIXME -- perhaps this should be made extensible by
       // using the class name to lookup a function to call to create
       // the new value.
 
@@ -1523,7 +1523,7 @@
 	      retval = uint64NDArray (dims, val);
 	      break;
 
-	    case oct_data_conv::dt_single: // XXX FIXME XXX
+	    case oct_data_conv::dt_single: // FIXME
 	    case oct_data_conv::dt_double:
 	      retval = NDArray (dims, val);
 	      break;
@@ -1604,7 +1604,7 @@
 	{
 	  switch (dt)
 	    {
-	    case oct_data_conv::dt_single: // XXX FIXME XXX
+	    case oct_data_conv::dt_single: // FIXME
 	    case oct_data_conv::dt_double:
 	      retval = NDArray (dims, val);
 	      break;
@@ -1682,7 +1682,7 @@
 	{
 	  switch (dt)
 	    {
-	    case oct_data_conv::dt_single: // XXX FIXME XXX
+	    case oct_data_conv::dt_single: // FIXME
 	    case oct_data_conv::dt_double:
 	      retval = ComplexNDArray (dims, val);
 	      break;
@@ -2089,7 +2089,7 @@
 {
   octave_value retval;
 
-  // XXX FIXME XXX -- perhaps this should be made extensible by using
+  // FIXME -- perhaps this should be made extensible by using
   // the class name to lookup a function to call to create the new
   // value.
 
@@ -2129,7 +2129,7 @@
 	  retval = identity_matrix<uint64NDArray> (nr, nc);
 	  break;
 
-	case oct_data_conv::dt_single: // XXX FIXME XXX
+	case oct_data_conv::dt_single: // FIXME
 	case oct_data_conv::dt_double:
 	  retval = identity_matrix<NDArray> (nr, nc);
 	  break;
@@ -2312,7 +2312,7 @@
   return retval;
 }
 
-// XXX FIXME XXX -- should accept dimensions as separate args for N-d
+// FIXME -- should accept dimensions as separate args for N-d
 // arrays as well as 1-d and 2-d arrays.
 
 DEFUN (resize, args, ,
@@ -2366,7 +2366,7 @@
   return retval;
 }
 
-// XXX FIXME XXX -- should use octave_idx_type for dimensions.
+// FIXME -- should use octave_idx_type for dimensions.
 
 DEFUN (reshape, args, ,
   "-*- texinfo -*-\n\