# HG changeset patch
# User Rik <rik@octave.org>
# Date 1453409657 28800
# Node ID 228b655045571f7b9fb1aaae25801536e80aeb20
# Parent  61ca546e19428639520724a70cf648a1ad855a2b
maint: Eliminate useless statements after err_XXX.

* Cell.cc, data.cc, eig.cc, hess.cc, oct-hist.cc, oct-stream.cc, rand.cc,
audioread.cc, ov-base.cc, ov-class.cc, ov.cc, op-int.h, ops.h, CColVector.cc,
CDiagMatrix.cc, CMatrix.cc, CRowVector.cc, DiagArray2.cc, MDiagArray2.cc,
PermMatrix.cc, dMatrix.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc,
fCRowVector.cc, fMatrix.cc, idx-vector.cc, CmplxGEPBAL.cc, dbleGEPBAL.cc,
fCmplxGEPBAL.cc, floatGEPBAL.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h,
Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h:
maint: Eliminate useless statements after err_XXX.

diff -r 61ca546e1942 -r 228b65504557 libinterp/corefcn/Cell.cc
--- a/libinterp/corefcn/Cell.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/corefcn/Cell.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -276,7 +276,6 @@
 Cell::nnz (void) const
 {
   err_wrong_type_arg ("nnz", "cell array");
-  return -1;
 }
 
 /*
diff -r 61ca546e1942 -r 228b65504557 libinterp/corefcn/data.cc
--- a/libinterp/corefcn/data.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/corefcn/data.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -1036,10 +1036,7 @@
               retval = tmp.FCN (dim); \
             } \
           else \
-            { \
-              err_wrong_type_arg (#FCN, arg); \
-              return retval; \
-            } \
+            err_wrong_type_arg (#FCN, arg); \
         } \
       else if (arg.is_bool_type ()) \
         { \
@@ -1076,10 +1073,7 @@
           retval = tmp.FCN (dim); \
         } \
       else \
-        { \
-          err_wrong_type_arg (#FCN, arg); \
-          return retval; \
-        } \
+        err_wrong_type_arg (#FCN, arg); \
     } \
  \
   return retval
@@ -1144,10 +1138,7 @@
         } \
     } \
   else \
-    { \
-      err_wrong_type_arg (#FCN, arg); \
-      return retval; \
-    } \
+    err_wrong_type_arg (#FCN, arg); \
  \
   return retval
 
diff -r 61ca546e1942 -r 228b65504557 libinterp/corefcn/eig.cc
--- a/libinterp/corefcn/eig.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/corefcn/eig.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -73,10 +73,7 @@
     return octave_value_list (2, Matrix ());
 
   if (! arg_a.is_double_type () && ! arg_a.is_single_type ())
-    {
-      err_wrong_type_arg ("eig", arg_a);
-      return retval;
-    }
+    err_wrong_type_arg ("eig", arg_a);
 
   if (nargin == 2)
     {
@@ -90,11 +87,8 @@
       else if (arg_is_empty > 0)
         return ovl (2, Matrix ());
 
-      if (!(arg_b.is_single_type () || arg_b.is_double_type ()))
-        {
-          err_wrong_type_arg ("eig", arg_b);
-          return retval;
-        }
+      if (! arg_b.is_single_type () && ! arg_b.is_double_type ())
+        err_wrong_type_arg ("eig", arg_b);
     }
 
   if (nr_a != nc_a)
diff -r 61ca546e1942 -r 228b65504557 libinterp/corefcn/hess.cc
--- a/libinterp/corefcn/hess.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/corefcn/hess.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -138,9 +138,7 @@
                           result.hess_matrix ());
         }
       else
-        {
-          err_wrong_type_arg ("hess", arg);
-        }
+        err_wrong_type_arg ("hess", arg);
     }
 
   return retval;
diff -r 61ca546e1942 -r 228b65504557 libinterp/corefcn/oct-hist.cc
--- a/libinterp/corefcn/oct-hist.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/corefcn/oct-hist.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -161,10 +161,7 @@
           continue;
         }
       else
-        {
-          err_wrong_type_arg ("history", arg);
-          return hlist;
-        }
+        err_wrong_type_arg ("history", arg);
 
       if (option == "-r" || option == "-w" || option == "-a"
           || option == "-n")
diff -r 61ca546e1942 -r 228b65504557 libinterp/corefcn/oct-stream.cc
--- a/libinterp/corefcn/oct-stream.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/corefcn/oct-stream.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -2188,10 +2188,7 @@
         octave_value val = values(i);
 
         if (val.is_map () || val.is_cell () || val.is_object ())
-          {
-            err_wrong_type_arg (who, val);
-            break;
-          }
+          err_wrong_type_arg (who, val);
       }
   }
 
diff -r 61ca546e1942 -r 228b65504557 libinterp/corefcn/rand.cc
--- a/libinterp/corefcn/rand.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/corefcn/rand.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -208,10 +208,7 @@
             goto gen_matrix;
           }
         else
-          {
-            err_wrong_type_arg ("rand", tmp);
-            return retval;
-          }
+          err_wrong_type_arg ("rand", tmp);
       }
       break;
 
diff -r 61ca546e1942 -r 228b65504557 libinterp/dldfcn/audioread.cc
--- a/libinterp/dldfcn/audioread.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/dldfcn/audioread.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -276,10 +276,7 @@
   else if (args(1).is_int32_type ())
     scale = std::pow (2.0, 31);
   else if (args(1).is_integer_type ())
-    {
-      err_wrong_type_arg ("audiowrite", args(1));
-      return ovl ();
-    }
+    err_wrong_type_arg ("audiowrite", args(1));
 
   Matrix audio = args(1).matrix_value ();
 
diff -r 61ca546e1942 -r 228b65504557 libinterp/octave-value/ov-base.cc
--- a/libinterp/octave-value/ov-base.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/octave-value/ov-base.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -134,7 +134,6 @@
 octave_base_value::full_value (void) const
 {
   err_wrong_type_arg ("full: invalid operation for %s type", type_name ());
-  return octave_value ();
 }
 
 Matrix
@@ -298,7 +297,6 @@
 octave_base_value::nnz (void) const
 {
   err_wrong_type_arg ("octave_base_value::nnz ()", type_name ());
-  return -1;
 }
 
 octave_idx_type
@@ -311,42 +309,36 @@
 octave_base_value::nfields (void) const
 {
   err_wrong_type_arg ("octave_base_value::nfields ()", type_name ());
-  return -1;
 }
 
 octave_value
 octave_base_value::reshape (const dim_vector&) const
 {
   err_wrong_type_arg ("octave_base_value::reshape ()", type_name ());
-  return octave_value ();
 }
 
 octave_value
 octave_base_value::permute (const Array<int>&, bool) const
 {
   err_wrong_type_arg ("octave_base_value::permute ()", type_name ());
-  return octave_value ();
 }
 
 octave_value
 octave_base_value::resize (const dim_vector&, bool) const
 {
   err_wrong_type_arg ("octave_base_value::resize ()", type_name ());
-  return octave_value ();
 }
 
 MatrixType
 octave_base_value::matrix_type (void) const
 {
   err_wrong_type_arg ("octave_base_value::matrix_type ()", type_name ());
-  return MatrixType ();
 }
 
 MatrixType
 octave_base_value::matrix_type (const MatrixType&) const
 {
   err_wrong_type_arg ("octave_base_value::matrix_type ()", type_name ());
-  return MatrixType ();
 }
 
 octave_value
@@ -378,7 +370,6 @@
 {
   err_wrong_type_arg ("octave_base_value::convert_to_str_internal ()",
                       type_name ());
-  return octave_value ();
 }
 
 void
@@ -507,139 +498,100 @@
 double
 octave_base_value::double_value (bool) const
 {
-  double retval = lo_ieee_nan_value ();
   err_wrong_type_arg ("octave_base_value::double_value ()", type_name ());
-  return retval;
 }
 
 float
 octave_base_value::float_value (bool) const
 {
-  float retval = lo_ieee_float_nan_value ();
   err_wrong_type_arg ("octave_base_value::float_value ()", type_name ());
-  return retval;
 }
 
 Cell
 octave_base_value::cell_value () const
 {
-  Cell retval;
   err_wrong_type_arg ("octave_base_value::cell_value()", type_name ());
-  return retval;
 }
 
 Matrix
 octave_base_value::matrix_value (bool) const
 {
-  Matrix retval;
   err_wrong_type_arg ("octave_base_value::matrix_value()", type_name ());
-  return retval;
 }
 
 FloatMatrix
 octave_base_value::float_matrix_value (bool) const
 {
-  FloatMatrix retval;
-  err_wrong_type_arg ("octave_base_value::float_matrix_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::float_matrix_value()", type_name ());
 }
 
 NDArray
 octave_base_value::array_value (bool) const
 {
-  FloatNDArray retval;
   err_wrong_type_arg ("octave_base_value::array_value()", type_name ());
-  return retval;
 }
 
 FloatNDArray
 octave_base_value::float_array_value (bool) const
 {
-  FloatNDArray retval;
   err_wrong_type_arg ("octave_base_value::float_array_value()", type_name ());
-  return retval;
 }
 
 Complex
 octave_base_value::complex_value (bool) const
 {
-  double tmp = lo_ieee_nan_value ();
-  Complex retval (tmp, tmp);
   err_wrong_type_arg ("octave_base_value::complex_value()", type_name ());
-  return retval;
 }
 
 FloatComplex
 octave_base_value::float_complex_value (bool) const
 {
-  float tmp = lo_ieee_float_nan_value ();
-  FloatComplex retval (tmp, tmp);
-  err_wrong_type_arg ("octave_base_value::float_complex_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::float_complex_value()", type_name ());
 }
 
 ComplexMatrix
 octave_base_value::complex_matrix_value (bool) const
 {
-  ComplexMatrix retval;
   err_wrong_type_arg ("octave_base_value::complex_matrix_value()",
                       type_name ());
-  return retval;
 }
 
 FloatComplexMatrix
 octave_base_value::float_complex_matrix_value (bool) const
 {
-  FloatComplexMatrix retval;
   err_wrong_type_arg ("octave_base_value::float_complex_matrix_value()",
                       type_name ());
-  return retval;
 }
 
 ComplexNDArray
 octave_base_value::complex_array_value (bool) const
 {
-  ComplexNDArray retval;
-  err_wrong_type_arg ("octave_base_value::complex_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::complex_array_value()", type_name ());
 }
 
 FloatComplexNDArray
 octave_base_value::float_complex_array_value (bool) const
 {
-  FloatComplexNDArray retval;
   err_wrong_type_arg ("octave_base_value::float_complex_array_value()",
                       type_name ());
-  return retval;
 }
 
 bool
 octave_base_value::bool_value (bool) const
 {
-  bool retval = false;
   err_wrong_type_arg ("octave_base_value::bool_value()", type_name ());
-  return retval;
 }
 
 boolMatrix
 octave_base_value::bool_matrix_value (bool) const
 {
-  boolMatrix retval;
-  err_wrong_type_arg ("octave_base_value::bool_matrix_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::bool_matrix_value()", type_name ());
 }
 
 boolNDArray
 octave_base_value::bool_array_value (bool) const
 {
-  boolNDArray retval;
-  err_wrong_type_arg ("octave_base_value::bool_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::bool_array_value()", type_name ());
 }
 
 charMatrix
@@ -657,224 +609,156 @@
 charNDArray
 octave_base_value::char_array_value (bool) const
 {
-  charNDArray retval;
-  err_wrong_type_arg ("octave_base_value::char_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::char_array_value()", type_name ());
 }
 
 SparseMatrix
 octave_base_value::sparse_matrix_value (bool) const
 {
-  SparseMatrix retval;
-  err_wrong_type_arg ("octave_base_value::sparse_matrix_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::sparse_matrix_value()", type_name ());
 }
 
 SparseComplexMatrix
 octave_base_value::sparse_complex_matrix_value (bool) const
 {
-  SparseComplexMatrix retval;
   err_wrong_type_arg ("octave_base_value::sparse_complex_matrix_value()",
                       type_name ());
-  return retval;
 }
 
 SparseBoolMatrix
 octave_base_value::sparse_bool_matrix_value (bool) const
 {
-  SparseBoolMatrix retval;
   err_wrong_type_arg ("octave_base_value::sparse_bool_matrix_value()",
                       type_name ());
-  return retval;
 }
 
 DiagMatrix
 octave_base_value::diag_matrix_value (bool) const
 {
-  DiagMatrix retval;
   err_wrong_type_arg ("octave_base_value::diag_matrix_value()", type_name ());
-  return retval;
 }
 
 FloatDiagMatrix
 octave_base_value::float_diag_matrix_value (bool) const
 {
-  FloatDiagMatrix retval;
   err_wrong_type_arg ("octave_base_value::float_diag_matrix_value()",
                       type_name ());
-  return retval;
 }
 
 ComplexDiagMatrix
 octave_base_value::complex_diag_matrix_value (bool) const
 {
-  ComplexDiagMatrix retval;
   err_wrong_type_arg ("octave_base_value::complex_diag_matrix_value()",
                       type_name ());
-  return retval;
 }
 
 FloatComplexDiagMatrix
 octave_base_value::float_complex_diag_matrix_value (bool) const
 {
-  FloatComplexDiagMatrix retval;
   err_wrong_type_arg ("octave_base_value::float_complex_diag_matrix_value()",
                       type_name ());
-  return retval;
 }
 
 PermMatrix
 octave_base_value::perm_matrix_value (void) const
 {
-  PermMatrix retval;
   err_wrong_type_arg ("octave_base_value::perm_matrix_value()", type_name ());
-  return retval;
 }
 
 octave_int8
 octave_base_value::int8_scalar_value (void) const
 {
-  octave_int8 retval;
-  err_wrong_type_arg ("octave_base_value::int8_scalar_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::int8_scalar_value()", type_name ());
 }
 
 octave_int16
 octave_base_value::int16_scalar_value (void) const
 {
-  octave_int16 retval;
-  err_wrong_type_arg ("octave_base_value::int16_scalar_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::int16_scalar_value()", type_name ());
 }
 
 octave_int32
 octave_base_value::int32_scalar_value (void) const
 {
-  octave_int32 retval;
-  err_wrong_type_arg ("octave_base_value::int32_scalar_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::int32_scalar_value()", type_name ());
 }
 
 octave_int64
 octave_base_value::int64_scalar_value (void) const
 {
-  octave_int64 retval;
-  err_wrong_type_arg ("octave_base_value::int64_scalar_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::int64_scalar_value()", type_name ());
 }
 
 octave_uint8
 octave_base_value::uint8_scalar_value (void) const
 {
-  octave_uint8 retval;
-  err_wrong_type_arg ("octave_base_value::uint8_scalar_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::uint8_scalar_value()", type_name ());
 }
 
 octave_uint16
 octave_base_value::uint16_scalar_value (void) const
 {
-  octave_uint16 retval;
-  err_wrong_type_arg ("octave_base_value::uint16_scalar_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::uint16_scalar_value()", type_name ());
 }
 
 octave_uint32
 octave_base_value::uint32_scalar_value (void) const
 {
-  octave_uint32 retval;
-  err_wrong_type_arg ("octave_base_value::uint32_scalar_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::uint32_scalar_value()", type_name ());
 }
 
 octave_uint64
 octave_base_value::uint64_scalar_value (void) const
 {
-  octave_uint64 retval;
-  err_wrong_type_arg ("octave_base_value::uint64_scalar_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::uint64_scalar_value()", type_name ());
 }
 
 int8NDArray
 octave_base_value::int8_array_value (void) const
 {
-  int8NDArray retval;
-  err_wrong_type_arg ("octave_base_value::int8_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::int8_array_value()", type_name ());
 }
 
 int16NDArray
 octave_base_value::int16_array_value (void) const
 {
-  int16NDArray retval;
-  err_wrong_type_arg ("octave_base_value::int16_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::int16_array_value()", type_name ());
 }
 
 int32NDArray
 octave_base_value::int32_array_value (void) const
 {
-  int32NDArray retval;
-  err_wrong_type_arg ("octave_base_value::int32_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::int32_array_value()", type_name ());
 }
 
 int64NDArray
 octave_base_value::int64_array_value (void) const
 {
-  int64NDArray retval;
-  err_wrong_type_arg ("octave_base_value::int64_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::int64_array_value()", type_name ());
 }
 
 uint8NDArray
 octave_base_value::uint8_array_value (void) const
 {
-  uint8NDArray retval;
-  err_wrong_type_arg ("octave_base_value::uint8_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::uint8_array_value()", type_name ());
 }
 
 uint16NDArray
 octave_base_value::uint16_array_value (void) const
 {
-  uint16NDArray retval;
-  err_wrong_type_arg ("octave_base_value::uint16_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::uint16_array_value()", type_name ());
 }
 
 uint32NDArray
 octave_base_value::uint32_array_value (void) const
 {
-  uint32NDArray retval;
-  err_wrong_type_arg ("octave_base_value::uint32_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::uint32_array_value()", type_name ());
 }
 
 uint64NDArray
 octave_base_value::uint64_array_value (void) const
 {
-  uint64NDArray retval;
-  err_wrong_type_arg ("octave_base_value::uint64_array_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::uint64_array_value()", type_name ());
 }
 
 string_vector
@@ -912,26 +796,19 @@
 Array<std::string>
 octave_base_value::cellstr_value (void) const
 {
-  Array<std::string> retval;
-  err_wrong_type_arg ("octave_base_value::cellstr_value()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::cellstr_value()", type_name ());
 }
 
 Range
 octave_base_value::range_value (void) const
 {
-  Range retval;
   err_wrong_type_arg ("octave_base_value::range_value()", type_name ());
-  return retval;
 }
 
 octave_map
 octave_base_value::map_value (void) const
 {
-  octave_map retval;
   err_wrong_type_arg ("octave_base_value::map_value()", type_name ());
-  return retval;
 }
 
 octave_scalar_map
@@ -948,35 +825,26 @@
 string_vector
 octave_base_value::map_keys (void) const
 {
-  string_vector retval;
   err_wrong_type_arg ("octave_base_value::map_keys()", type_name ());
-  return retval;
 }
 
 size_t
 octave_base_value::nparents (void) const
 {
-  size_t retval = 0;
   err_wrong_type_arg ("octave_base_value::nparents()", type_name ());
-  return retval;
 }
 
 std::list<std::string>
 octave_base_value::parent_class_name_list (void) const
 {
-  std::list<std::string> retval;
   err_wrong_type_arg ("octave_base_value::parent_class_name_list()",
                       type_name ());
-  return retval;
 }
 
 string_vector
 octave_base_value::parent_class_names (void) const
 {
-  string_vector retval;
-  err_wrong_type_arg ("octave_base_value::parent_class_names()",
-                      type_name ());
-  return retval;
+  err_wrong_type_arg ("octave_base_value::parent_class_names()", type_name ());
 }
 
 octave_function *
@@ -985,8 +853,8 @@
   octave_function *retval = 0;
 
   if (! silent)
-    err_wrong_type_arg ("octave_base_value::function_value()",
-                        type_name ());
+    err_wrong_type_arg ("octave_base_value::function_value()", type_name ());
+
   return retval;
 }
 
@@ -1007,8 +875,8 @@
   octave_user_script *retval = 0;
 
   if (! silent)
-    err_wrong_type_arg ("octave_base_value::user_script_value()",
-                        type_name ());
+    err_wrong_type_arg ("octave_base_value::user_script_value()", type_name ());
+
   return retval;
 }
 
@@ -1018,8 +886,8 @@
   octave_user_code *retval = 0;
 
   if (! silent)
-    err_wrong_type_arg ("octave_base_value::user_code_value()",
-                        type_name ());
+    err_wrong_type_arg ("octave_base_value::user_code_value()", type_name ());
+
   return retval;
 }
 
@@ -1029,8 +897,8 @@
   octave_fcn_handle *retval = 0;
 
   if (! silent)
-    err_wrong_type_arg ("octave_base_value::fcn_handle_value()",
-                        type_name ());
+    err_wrong_type_arg ("octave_base_value::fcn_handle_value()", type_name ());
+
   return retval;
 }
 
@@ -1040,38 +908,33 @@
   octave_fcn_inline *retval = 0;
 
   if (! silent)
-    err_wrong_type_arg ("octave_base_value::fcn_inline_value()",
-                        type_name ());
+    err_wrong_type_arg ("octave_base_value::fcn_inline_value()", type_name ());
+
   return retval;
 }
 
 octave_value_list
 octave_base_value::list_value (void) const
 {
-  octave_value_list retval;
   err_wrong_type_arg ("octave_base_value::list_value()", type_name ());
-  return retval;
 }
 
 bool
 octave_base_value::save_ascii (std::ostream&)
 {
   err_wrong_type_arg ("octave_base_value::save_ascii()", type_name ());
-  return false;
 }
 
 bool
 octave_base_value::load_ascii (std::istream&)
 {
   err_wrong_type_arg ("octave_base_value::load_ascii()", type_name ());
-  return false;
 }
 
 bool
 octave_base_value::save_binary (std::ostream&, bool&)
 {
   err_wrong_type_arg ("octave_base_value::save_binary()", type_name ());
-  return false;
 }
 
 bool
@@ -1079,23 +942,18 @@
                                 oct_mach_info::float_format)
 {
   err_wrong_type_arg ("octave_base_value::load_binary()", type_name ());
-  return false;
 }
 
 bool
 octave_base_value::save_hdf5 (octave_hdf5_id, const char *, bool)
 {
   err_wrong_type_arg ("octave_base_value::save_binary()", type_name ());
-
-  return false;
 }
 
 bool
 octave_base_value::load_hdf5 (octave_hdf5_id, const char *)
 {
   err_wrong_type_arg ("octave_base_value::load_binary()", type_name ());
-
-  return false;
 }
 
 int
@@ -1103,8 +961,6 @@
                           int, oct_mach_info::float_format) const
 {
   err_wrong_type_arg ("octave_base_value::write()", type_name ());
-
-  return false;
 }
 
 mxArray *
@@ -1117,24 +973,18 @@
 octave_base_value::diag (octave_idx_type) const
 {
   err_wrong_type_arg ("octave_base_value::diag ()", type_name ());
-
-  return octave_value ();
 }
 
 octave_value
 octave_base_value::diag (octave_idx_type, octave_idx_type) const
 {
   err_wrong_type_arg ("octave_base_value::diag ()", type_name ());
-
-  return octave_value ();
 }
 
 octave_value
 octave_base_value::sort (octave_idx_type, sortmode) const
 {
   err_wrong_type_arg ("octave_base_value::sort ()", type_name ());
-
-  return octave_value ();
 }
 
 octave_value
@@ -1142,32 +992,24 @@
                          octave_idx_type, sortmode) const
 {
   err_wrong_type_arg ("octave_base_value::sort ()", type_name ());
-
-  return octave_value ();
 }
 
 sortmode
 octave_base_value::is_sorted (sortmode) const
 {
   err_wrong_type_arg ("octave_base_value::is_sorted ()", type_name ());
-
-  return UNSORTED;
 }
 
 Array<octave_idx_type>
 octave_base_value::sort_rows_idx (sortmode) const
 {
   err_wrong_type_arg ("octave_base_value::sort_rows_idx ()", type_name ());
-
-  return Array<octave_idx_type> ();
 }
 
 sortmode
 octave_base_value::is_sorted_rows (sortmode) const
 {
   err_wrong_type_arg ("octave_base_value::is_sorted_rows ()", type_name ());
-
-  return UNSORTED;
 }
 
 
diff -r 61ca546e1942 -r 228b65504557 libinterp/octave-value/ov-class.cc
--- a/libinterp/octave-value/ov-class.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/octave-value/ov-class.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -842,9 +842,7 @@
 string_vector
 octave_class::map_keys (void) const
 {
-  string_vector retval;
   err_wrong_type_arg ("octave_class::map_keys()", type_name ());
-  return retval;
 }
 
 octave_base_value *
@@ -1618,8 +1616,6 @@
 octave_class::as_mxArray (void) const
 {
   err_wrong_type_arg ("octave_class::as_mxArray ()", type_name ());
-
-  return 0;
 }
 
 bool
diff -r 61ca546e1942 -r 228b65504557 libinterp/octave-value/ov.cc
--- a/libinterp/octave-value/ov.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/octave-value/ov.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -2172,14 +2172,11 @@
                 {
                   octave_base_value *tmp = cf2 (*tv2.rep);
 
-                  if (tmp)
-                    {
-                      tv2 = octave_value (tmp);
-                      t2 = tv2.type_id ();
-                    }
-                  else
-                    err_binary_op_conv
-                      (octave_value::binary_op_as_string (op));
+                  if (! tmp)
+                    err_binary_op_conv (octave_value::binary_op_as_string (op));
+
+                  tv2 = octave_value (tmp);
+                  t2 = tv2.type_id ();
                 }
 
               if (! cf1 && ! cf2)
diff -r 61ca546e1942 -r 228b65504557 libinterp/operators/op-int.h
--- a/libinterp/operators/op-int.h	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/operators/op-int.h	Thu Jan 21 12:54:17 2016 -0800
@@ -700,10 +700,10 @@
     dim_vector b_dims = b.dims (); \
     if (a_dims != b_dims) \
       { \
-        if (is_valid_bsxfun ("operator .^", a_dims, b_dims))     \
-          return bsxfun_pow (a, b); \
-        else \
+        if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \
           err_nonconformant ("operator .^", a_dims, b_dims);  \
+ \
+        return bsxfun_pow (a, b); \
       } \
     T1 ## NDArray result (a_dims); \
     for (int i = 0; i < a.numel (); i++) \
@@ -721,10 +721,10 @@
     dim_vector b_dims = b.dims (); \
     if (a_dims != b_dims) \
       { \
-        if (is_valid_bsxfun ("operator .^", a_dims, b_dims))     \
-          return bsxfun_pow (a, b); \
-        else \
+        if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \
           err_nonconformant ("operator .^", a_dims, b_dims);  \
+ \
+        return bsxfun_pow (a, b); \
       } \
     T1 ## NDArray result (a_dims); \
     for (int i = 0; i < a.numel (); i++) \
@@ -742,10 +742,10 @@
     dim_vector b_dims = b.dims (); \
     if (a_dims != b_dims) \
       { \
-        if (is_valid_bsxfun ("operator .^", a_dims, b_dims))     \
-          return bsxfun_pow (a, b); \
-        else \
-          err_nonconformant ("operator .^", a_dims, b_dims);  \
+        if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \
+          err_nonconformant ("operator .^", a_dims, b_dims); \
+ \
+        return bsxfun_pow (a, b); \
       } \
     T2 ## NDArray result (a_dims); \
     for (int i = 0; i < a.numel (); i++) \
@@ -763,10 +763,10 @@
     dim_vector b_dims = b.dims (); \
     if (a_dims != b_dims) \
       { \
-        if (is_valid_bsxfun ("operator .^", a_dims, b_dims))     \
-          return bsxfun_pow (a, b); \
-        else \
-          err_nonconformant ("operator .^", a_dims, b_dims);  \
+        if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \
+          err_nonconformant ("operator .^", a_dims, b_dims); \
+ \
+        return bsxfun_pow (a, b); \
       } \
     T1 ## NDArray result (a_dims); \
     for (int i = 0; i < a.numel (); i++) \
@@ -784,10 +784,10 @@
     dim_vector b_dims = b.dims (); \
     if (a_dims != b_dims) \
       { \
-        if (is_valid_bsxfun ("operator .^", a_dims, b_dims))     \
-          return bsxfun_pow (a, b); \
-        else \
-          err_nonconformant ("operator .^", a_dims, b_dims);  \
+        if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \
+          err_nonconformant ("operator .^", a_dims, b_dims); \
+ \
+        return bsxfun_pow (a, b); \
       } \
     T2 ## NDArray result (a_dims); \
     for (int i = 0; i < a.numel (); i++) \
diff -r 61ca546e1942 -r 228b65504557 libinterp/operators/ops.h
--- a/libinterp/operators/ops.h	Thu Jan 21 13:03:27 2016 -0500
+++ b/libinterp/operators/ops.h	Thu Jan 21 12:54:17 2016 -0800
@@ -387,8 +387,8 @@
 
 #define CATOP_NONCONFORMANT(msg) \
   err_nonconformant (msg, \
-                       a1.rows (), a1.columns (), \
-                       a2.rows (), a2.columns ()); \
+                     a1.rows (), a1.columns (), \
+                     a2.rows (), a2.columns ()); \
   return octave_value ()
 
 #endif
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/CColVector.cc
--- a/liboctave/array/CColVector.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/CColVector.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -284,10 +284,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (len != a_len)
-    {
-      err_nonconformant ("operator +=", len, a_len);
-      return *this;
-    }
+    err_nonconformant ("operator +=", len, a_len);
 
   if (len == 0)
     return *this;
@@ -306,10 +303,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (len != a_len)
-    {
-      err_nonconformant ("operator -=", len, a_len);
-      return *this;
-    }
+    err_nonconformant ("operator -=", len, a_len);
 
   if (len == 0)
     return *this;
@@ -383,10 +377,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (nc != a_len)
-    {
-      err_nonconformant ("operator *", nr, nc, a_len, 1);
-      return ComplexColumnVector ();
-    }
+    err_nonconformant ("operator *", nr, nc, a_len, 1);
 
   if (nc == 0 || nr == 0)
     return ComplexColumnVector (0);
@@ -411,10 +402,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (nc != a_len)
-    {
-      err_nonconformant ("operator *", nr, nc, a_len, 1);
-      return ComplexColumnVector ();
-    }
+    err_nonconformant ("operator *", nr, nc, a_len, 1);
 
   if (nc == 0 || nr == 0)
     return ComplexColumnVector (0);
@@ -439,10 +427,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (nc != a_len)
-    {
-      err_nonconformant ("operator *", nr, nc, a_len, 1);
-      return ComplexColumnVector ();
-    }
+    err_nonconformant ("operator *", nr, nc, a_len, 1);
 
   if (nc == 0 || nr == 0)
     return ComplexColumnVector (0);
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/CDiagMatrix.cc
--- a/liboctave/array/CDiagMatrix.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/CDiagMatrix.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -421,10 +421,7 @@
   octave_idx_type a_nc = a.cols ();
 
   if (r != a_nr || c != a_nc)
-    {
-      err_nonconformant ("operator +=", r, c, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator +=", r, c, a_nr, a_nc);
 
   if (r == 0 || c == 0)
     return *this;
@@ -470,10 +467,7 @@
   octave_idx_type b_nc = b.cols ();
 
   if (a_nc != b_nr)
-    {
-      err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
-      return ComplexDiagMatrix ();
-    }
+    err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
 
   if (a_nr == 0 || a_nc == 0 || b_nc == 0)
     return ComplexDiagMatrix (a_nr, a_nc, 0.0);
@@ -503,10 +497,7 @@
   octave_idx_type b_nc = b.cols ();
 
   if (a_nc != b_nr)
-    {
-      err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
-      return ComplexDiagMatrix ();
-    }
+    err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
 
   if (a_nr == 0 || a_nc == 0 || b_nc == 0)
     return ComplexDiagMatrix (a_nr, a_nc, 0.0);
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/CMatrix.cc
--- a/liboctave/array/CMatrix.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/CMatrix.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -3005,10 +3005,7 @@
   octave_idx_type a_nc = cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) += a.elem (i, i);
@@ -3026,10 +3023,7 @@
   octave_idx_type a_nc = cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) -= a.elem (i, i);
@@ -3047,10 +3041,7 @@
   octave_idx_type a_nc = cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) += a.elem (i, i);
@@ -3068,10 +3059,7 @@
   octave_idx_type a_nc = cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) -= a.elem (i, i);
@@ -3091,10 +3079,7 @@
   octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
 
   if (nr == 0 || nc == 0)
     return *this;
@@ -3115,10 +3100,7 @@
   octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
 
   if (nr == 0 || nc == 0)
     return *this;
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/CRowVector.cc
--- a/liboctave/array/CRowVector.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/CRowVector.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -276,10 +276,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (len != a_len)
-    {
-      err_nonconformant ("operator +=", len, a_len);
-      return *this;
-    }
+    err_nonconformant ("operator +=", len, a_len);
 
   if (len == 0)
     return *this;
@@ -298,10 +295,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (len != a_len)
-    {
-      err_nonconformant ("operator -=", len, a_len);
-      return *this;
-    }
+    err_nonconformant ("operator -=", len, a_len);
 
   if (len == 0)
     return *this;
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/DiagArray2.cc
--- a/liboctave/array/DiagArray2.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/DiagArray2.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -125,16 +125,10 @@
   bool ok = true;
 
   if (r < 0 || r >= dim1 ())
-    {
-      err_index_out_of_range (2, 1, r+1, dim1 (), dims ());
-      ok = false;
-    }
+    err_index_out_of_range (2, 1, r+1, dim1 (), dims ());
 
   if (c < 0 || c >= dim2 ())
-    {
-      err_index_out_of_range (2, 2, c+1, dim2 (), dims ());
-      ok = false;
-    }
+    err_index_out_of_range (2, 2, c+1, dim2 (), dims ());
 
   return ok;
 }
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/MDiagArray2.cc
--- a/liboctave/array/MDiagArray2.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/MDiagArray2.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -82,6 +82,7 @@
   { \
     if (a.d1 != b.d1 || a.d2 != b.d2) \
       err_nonconformant (#FCN, a.d1, a.d2, b.d1, b.d2); \
+ \
     return MDiagArray2<T> (do_mm_binary_op<T, T, T> (a, b, FN, FN, FN, #FCN), a.d1, a.d2); \
   }
 
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/PermMatrix.cc
--- a/liboctave/array/PermMatrix.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/PermMatrix.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -43,10 +43,7 @@
   if (check)
     {
       if (! idx_vector (p).is_permutation (p.numel ()))
-        {
-          err_invalid_permutation ();
-          Array<octave_idx_type>::operator = (Array<octave_idx_type> ());
-        }
+        err_invalid_permutation ();
     }
 
   if (! colp)
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/dMatrix.cc
--- a/liboctave/array/dMatrix.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/dMatrix.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -2595,10 +2595,7 @@
   octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) += a.elem (i, i);
@@ -2616,10 +2613,7 @@
   octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) -= a.elem (i, i);
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/fCColVector.cc
--- a/liboctave/array/fCColVector.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/fCColVector.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -287,10 +287,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (len != a_len)
-    {
-      err_nonconformant ("operator +=", len, a_len);
-      return *this;
-    }
+    err_nonconformant ("operator +=", len, a_len);
 
   if (len == 0)
     return *this;
@@ -309,10 +306,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (len != a_len)
-    {
-      err_nonconformant ("operator -=", len, a_len);
-      return *this;
-    }
+    err_nonconformant ("operator -=", len, a_len);
 
   if (len == 0)
     return *this;
@@ -385,10 +379,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (nc != a_len)
-    {
-      err_nonconformant ("operator *", nr, nc, a_len, 1);
-      return FloatComplexColumnVector ();
-    }
+    err_nonconformant ("operator *", nr, nc, a_len, 1);
 
   if (nc == 0 || nr == 0)
     return FloatComplexColumnVector (0);
@@ -413,10 +404,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (nc != a_len)
-    {
-      err_nonconformant ("operator *", nr, nc, a_len, 1);
-      return FloatComplexColumnVector ();
-    }
+    err_nonconformant ("operator *", nr, nc, a_len, 1);
 
   if (nc == 0 || nr == 0)
     return FloatComplexColumnVector (0);
@@ -441,10 +429,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (nc != a_len)
-    {
-      err_nonconformant ("operator *", nr, nc, a_len, 1);
-      return FloatComplexColumnVector ();
-    }
+    err_nonconformant ("operator *", nr, nc, a_len, 1);
 
   if (nc == 0 || nr == 0)
     return FloatComplexColumnVector (0);
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/fCDiagMatrix.cc
--- a/liboctave/array/fCDiagMatrix.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/fCDiagMatrix.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -425,10 +425,7 @@
   octave_idx_type a_nc = a.cols ();
 
   if (r != a_nr || c != a_nc)
-    {
-      err_nonconformant ("operator +=", r, c, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator +=", r, c, a_nr, a_nc);
 
   if (r == 0 || c == 0)
     return *this;
@@ -474,10 +471,7 @@
   octave_idx_type b_nc = b.cols ();
 
   if (a_nc != b_nr)
-    {
-      err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
-      return FloatComplexDiagMatrix ();
-    }
+    err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
 
   if (a_nr == 0 || a_nc == 0 || b_nc == 0)
     return FloatComplexDiagMatrix (a_nr, a_nc, 0.0);
@@ -507,10 +501,7 @@
   octave_idx_type b_nc = b.cols ();
 
   if (a_nc != b_nr)
-    {
-      err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
-      return FloatComplexDiagMatrix ();
-    }
+    err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
 
   if (a_nr == 0 || a_nc == 0 || b_nc == 0)
     return FloatComplexDiagMatrix (a_nr, a_nc, 0.0);
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/fCMatrix.cc
--- a/liboctave/array/fCMatrix.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/fCMatrix.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -3007,10 +3007,7 @@
   octave_idx_type a_nc = cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) += a.elem (i, i);
@@ -3028,10 +3025,7 @@
   octave_idx_type a_nc = cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) -= a.elem (i, i);
@@ -3049,10 +3043,7 @@
   octave_idx_type a_nc = cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) += a.elem (i, i);
@@ -3070,10 +3061,7 @@
   octave_idx_type a_nc = cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) -= a.elem (i, i);
@@ -3093,10 +3081,7 @@
   octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
 
   if (nr == 0 || nc == 0)
     return *this;
@@ -3117,10 +3102,7 @@
   octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
 
   if (nr == 0 || nc == 0)
     return *this;
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/fCRowVector.cc
--- a/liboctave/array/fCRowVector.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/fCRowVector.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -277,10 +277,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (len != a_len)
-    {
-      err_nonconformant ("operator +=", len, a_len);
-      return *this;
-    }
+    err_nonconformant ("operator +=", len, a_len);
 
   if (len == 0)
     return *this;
@@ -299,10 +296,7 @@
   octave_idx_type a_len = a.numel ();
 
   if (len != a_len)
-    {
-      err_nonconformant ("operator -=", len, a_len);
-      return *this;
-    }
+    err_nonconformant ("operator -=", len, a_len);
 
   if (len == 0)
     return *this;
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/fMatrix.cc
--- a/liboctave/array/fMatrix.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/fMatrix.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -2620,10 +2620,7 @@
   octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) += a.elem (i, i);
@@ -2641,10 +2638,7 @@
   octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
-    {
-      err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
-      return *this;
-    }
+    err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
 
   for (octave_idx_type i = 0; i < a.length (); i++)
     elem (i, i) -= a.elem (i, i);
diff -r 61ca546e1942 -r 228b65504557 liboctave/array/idx-vector.cc
--- a/liboctave/array/idx-vector.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/array/idx-vector.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -78,12 +78,9 @@
 idx_vector::idx_colon_rep::checkelem (octave_idx_type i) const
 {
   if (i < 0)
-    {
-      err_index_out_of_range ();
-      return 0;
-    }
-  else
-    return i;
+    err_index_out_of_range ();
+
+  return i;
 }
 
 idx_vector::idx_base_rep *
@@ -109,20 +106,11 @@
   : start(_start), len (_step ? std::max ((_limit - _start) / _step, static_cast<octave_idx_type> (0)) : -1), step (_step)
 {
   if (len < 0)
-    {
-      err_invalid_range ();
-      err = true;
-    }
-  else if (start < 0)
-    {
-      err_invalid_index (start);
-      err = true;
-    }
-  else if (step < 0 && start + (len-1)*step < 0)
-    {
-      err_invalid_index (start + (len-1)*step);
-      err = true;
-    }
+    err_invalid_range ();
+  if (start < 0)
+    err_invalid_index (start);
+  if (step < 0 && start + (len-1)*step < 0)
+    err_invalid_index (start + (len-1)*step);
 }
 
 idx_vector::idx_range_rep::idx_range_rep (const Range& r)
@@ -138,15 +126,9 @@
           start = static_cast<octave_idx_type> (r.base ()) - 1;
           step = static_cast<octave_idx_type> (r.inc ());
           if (start < 0)
-            {
-              err_invalid_index (start);
-              err = true;
-            }
-          else if (step < 0 && start + (len - 1)*step < 0)
-            {
-              err_invalid_index (start + (len - 1)*step);
-              err = true;
-            }
+            err_invalid_index (start);
+          if (step < 0 && start + (len - 1)*step < 0)
+            err_invalid_index (start + (len - 1)*step);
         }
       else
         {
@@ -154,7 +136,6 @@
           double b = r.base ();
           double inc = r.inc ();
           err_invalid_index (b != gnulib::floor (b) ? b : b + inc);
-          err = true;
         }
     }
 }
@@ -163,12 +144,9 @@
 idx_vector::idx_range_rep::checkelem (octave_idx_type i) const
 {
   if (i < 0 || i >= len)
-    {
-      err_index_out_of_range ();
-      return 0;
-    }
-  else
-    return start + i*step;
+    err_index_out_of_range ();
+
+  return start + i*step;
 }
 
 idx_vector::idx_base_rep *
@@ -246,10 +224,7 @@
   octave_idx_type i = static_cast<octave_idx_type> (x);
 
   if (static_cast<double> (i) != x)
-    {
-      err_invalid_index (x-1);
-      conv_error = true;
-    }
+    err_invalid_index (x-1);
 
   return convert_index (i, conv_error, ext);
 }
@@ -284,10 +259,7 @@
   : data (i)
 {
   if (data < 0)
-    {
-      err_invalid_index (data);
-      err = true;
-    }
+    err_invalid_index (data);
 }
 
 octave_idx_type
@@ -356,9 +328,8 @@
           octave_idx_type k = inda.xelem (i);
           if (k < 0)
             {
-              if (! err)         // only report first error, in case 1000s.
+              if (! err)
                 err_invalid_index (k);
-              err = true;
             }
           else if (k > max)
             max = k;
@@ -467,10 +438,7 @@
 idx_vector::idx_vector_rep::checkelem (octave_idx_type n) const
 {
   if (n < 0 || n >= len)
-    {
-      err_invalid_index (n);
-      return 0;
-    }
+    err_invalid_index (n);
 
   return xelem (n);
 }
@@ -717,10 +685,7 @@
 idx_vector::idx_mask_rep::checkelem (octave_idx_type n) const
 {
   if (n < 0 || n >= len)
-    {
-      err_invalid_index (n);
-      return 0;
-    }
+    err_invalid_index (n);
 
   return xelem (n);
 }
diff -r 61ca546e1942 -r 228b65504557 liboctave/numeric/CmplxGEPBAL.cc
--- a/liboctave/numeric/CmplxGEPBAL.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/numeric/CmplxGEPBAL.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -72,10 +72,7 @@
     }
 
   if (a.dims () != b.dims ())
-    {
-      err_nonconformant ("ComplexGEPBALANCE", n, n, b.rows(), b.cols());
-      return -1;
-    }
+    err_nonconformant ("ComplexGEPBALANCE", n, n, b.rows(), b.cols());
 
   octave_idx_type info;
   octave_idx_type ilo;
diff -r 61ca546e1942 -r 228b65504557 liboctave/numeric/dbleGEPBAL.cc
--- a/liboctave/numeric/dbleGEPBAL.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/numeric/dbleGEPBAL.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -71,10 +71,7 @@
     }
 
   if (a.dims () != b.dims ())
-    {
-      err_nonconformant ("GEPBALANCE", n, n, b.rows(), b.cols());
-      return -1;
-    }
+    err_nonconformant ("GEPBALANCE", n, n, b.rows(), b.cols());
 
   octave_idx_type info;
   octave_idx_type ilo;
diff -r 61ca546e1942 -r 228b65504557 liboctave/numeric/fCmplxGEPBAL.cc
--- a/liboctave/numeric/fCmplxGEPBAL.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/numeric/fCmplxGEPBAL.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -72,10 +72,7 @@
     }
 
   if (a.dims () != b.dims ())
-    {
-      err_nonconformant ("FloatComplexGEPBALANCE", n, n, b.rows(), b.cols());
-      return -1;
-    }
+    err_nonconformant ("FloatComplexGEPBALANCE", n, n, b.rows(), b.cols());
 
   octave_idx_type info;
   octave_idx_type ilo;
diff -r 61ca546e1942 -r 228b65504557 liboctave/numeric/floatGEPBAL.cc
--- a/liboctave/numeric/floatGEPBAL.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/numeric/floatGEPBAL.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -72,10 +72,7 @@
     }
 
   if (a.dims () != b.dims ())
-    {
-      err_nonconformant ("FloatGEPBALANCE", n, n, b.rows(), b.cols());
-      return -1;
-    }
+    err_nonconformant ("FloatGEPBALANCE", n, n, b.rows(), b.cols());
 
   octave_idx_type info;
   octave_idx_type ilo;
diff -r 61ca546e1942 -r 228b65504557 liboctave/operators/Sparse-diag-op-defs.h
--- a/liboctave/operators/Sparse-diag-op-defs.h	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/operators/Sparse-diag-op-defs.h	Thu Jan 21 12:54:17 2016 -0800
@@ -35,35 +35,30 @@
   const octave_idx_type a_nc = a.cols ();
 
   if (nc != a_nr)
-    {
-      err_nonconformant ("operator *", nr, nc, a_nr, a_nc);
-      return RT ();
-    }
-  else
+    err_nonconformant ("operator *", nr, nc, a_nr, a_nc);
+
+  RT r (nr, a_nc, a.nnz ());
+
+  octave_idx_type l = 0;
+
+  for (octave_idx_type j = 0; j < a_nc; j++)
     {
-      RT r (nr, a_nc, a.nnz ());
-
-      octave_idx_type l = 0;
-
-      for (octave_idx_type j = 0; j < a_nc; j++)
+      r.xcidx (j) = l;
+      const octave_idx_type colend = a.cidx (j+1);
+      for (octave_idx_type k = a.cidx (j); k < colend; k++)
         {
-          r.xcidx (j) = l;
-          const octave_idx_type colend = a.cidx (j+1);
-          for (octave_idx_type k = a.cidx (j); k < colend; k++)
-            {
-              const octave_idx_type i = a.ridx (k);
-              if (i >= nr) break;
-              r.xdata (l) = d.dgelem (i) * a.data (k);
-              r.xridx (l) = i;
-              l++;
-            }
+          const octave_idx_type i = a.ridx (k);
+          if (i >= nr) break;
+          r.xdata (l) = d.dgelem (i) * a.data (k);
+          r.xridx (l) = i;
+          l++;
         }
-
-      r.xcidx (a_nc) = l;
+    }
 
-      r.maybe_compress (true);
-      return r;
-    }
+  r.xcidx (a_nc) = l;
+
+  r.maybe_compress (true);
+  return r;
 }
 
 template <typename RT, typename SM, typename DM>
@@ -76,33 +71,27 @@
   const octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nc)
-    {
-      err_nonconformant ("operator *", a_nr, a_nc, nr, nc);
-      return RT ();
-    }
-  else
+    err_nonconformant ("operator *", a_nr, a_nc, nr, nc);
+
+  const octave_idx_type mnc = nc < a_nc ? nc: a_nc;
+  RT r (a_nr, nc, a.cidx (mnc));
+
+  for (octave_idx_type j = 0; j < mnc; ++j)
     {
-
-      const octave_idx_type mnc = nc < a_nc ? nc: a_nc;
-      RT r (a_nr, nc, a.cidx (mnc));
-
-      for (octave_idx_type j = 0; j < mnc; ++j)
+      const typename DM::element_type s = d.dgelem (j);
+      const octave_idx_type colend = a.cidx (j+1);
+      r.xcidx (j) = a.cidx (j);
+      for (octave_idx_type k = a.cidx (j); k < colend; ++k)
         {
-          const typename DM::element_type s = d.dgelem (j);
-          const octave_idx_type colend = a.cidx (j+1);
-          r.xcidx (j) = a.cidx (j);
-          for (octave_idx_type k = a.cidx (j); k < colend; ++k)
-            {
-              r.xdata (k) = s * a.data (k);
-              r.xridx (k) = a.ridx (k);
-            }
+          r.xdata (k) = s * a.data (k);
+          r.xridx (k) = a.ridx (k);
         }
-      for (octave_idx_type j = mnc; j <= nc; ++j)
-        r.xcidx (j) = a.cidx (mnc);
+    }
+  for (octave_idx_type j = mnc; j <= nc; ++j)
+    r.xcidx (j) = a.cidx (mnc);
 
-      r.maybe_compress (true);
-      return r;
-    }
+  r.maybe_compress (true);
+  return r;
 }
 
 // FIXME: functors such as this should be gathered somewhere
@@ -186,10 +175,7 @@
 RT do_add_dm_sm (const DM& d, const SM& a)
 {
   if (a.rows () != d.rows () || a.cols () != d.cols ())
-    {
-      err_nonconformant ("operator +", d.rows (), d.cols (), a.rows (), a.cols ());
-      return RT ();
-    }
+    err_nonconformant ("operator +", d.rows (), d.cols (), a.rows (), a.cols ());
   else
     return do_commutative_add_dm_sm<RT> (d, a);
 }
@@ -198,39 +184,30 @@
 RT do_sub_dm_sm (const DM& d, const SM& a)
 {
   if (a.rows () != d.rows () || a.cols () != d.cols ())
-    {
-      err_nonconformant ("operator -", d.rows (), d.cols (), a.rows (), a.cols ());
-      return RT ();
-    }
-  else
-    return inner_do_add_sm_dm<RT> (a, d, std::negate<typename SM::element_type> (),
-                                   identity_val<typename DM::element_type> ());
+    err_nonconformant ("operator -", d.rows (), d.cols (), a.rows (), a.cols ());
+
+  return inner_do_add_sm_dm<RT> (a, d, std::negate<typename SM::element_type> (),
+                                 identity_val<typename DM::element_type> ());
 }
 
 template <typename RT, typename SM, typename DM>
 RT do_add_sm_dm (const SM& a, const DM& d)
 {
   if (a.rows () != d.rows () || a.cols () != d.cols ())
-    {
-      err_nonconformant ("operator +", a.rows (), a.cols (), d.rows (), d.cols ());
-      return RT ();
-    }
-  else
-    return do_commutative_add_dm_sm<RT> (d, a);
+    err_nonconformant ("operator +", a.rows (), a.cols (), d.rows (), d.cols ());
+
+  return do_commutative_add_dm_sm<RT> (d, a);
 }
 
 template <typename RT, typename SM, typename DM>
 RT do_sub_sm_dm (const SM& a, const DM& d)
 {
   if (a.rows () != d.rows () || a.cols () != d.cols ())
-    {
-      err_nonconformant ("operator -", a.rows (), a.cols (), d.rows (), d.cols ());
-      return RT ();
-    }
-  else
-    return inner_do_add_sm_dm<RT> (a, d,
-                                   identity_val<typename SM::element_type> (),
-                                   std::negate<typename DM::element_type> ());
+    err_nonconformant ("operator -", a.rows (), a.cols (), d.rows (), d.cols ());
+
+  return inner_do_add_sm_dm<RT> (a, d,
+                                 identity_val<typename SM::element_type> (),
+                                 std::negate<typename DM::element_type> ());
 }
 
 #endif
diff -r 61ca546e1942 -r 228b65504557 liboctave/operators/Sparse-op-defs.h
--- a/liboctave/operators/Sparse-op-defs.h	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/operators/Sparse-op-defs.h	Thu Jan 21 12:54:17 2016 -0800
@@ -1741,10 +1741,7 @@
      return r; \
    } \
   else if (nc != a_nr) \
-    { \
-      err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \
-      return RET_TYPE (); \
-    } \
+    err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \
   else \
     { \
       OCTAVE_LOCAL_BUFFER (octave_idx_type, w, nr); \
@@ -1873,10 +1870,7 @@
       return retval; \
     } \
   else if (nc != a_nr) \
-    { \
-      err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \
-      return RET_TYPE (); \
-    } \
+    err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \
   else \
     { \
       RET_TYPE retval (nr, a_nc, ZERO); \
@@ -1908,10 +1902,7 @@
       return retval; \
     } \
   else if (nr != a_nr) \
-    { \
-      err_nonconformant ("operator *", nc, nr, a_nr, a_nc); \
-      return RET_TYPE (); \
-    } \
+    err_nonconformant ("operator *", nc, nr, a_nr, a_nc); \
   else \
     { \
       RET_TYPE retval (nc, a_nc); \
@@ -1944,10 +1935,7 @@
       return retval; \
     } \
   else if (nc != a_nr) \
-    { \
-      err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \
-      return RET_TYPE (); \
-    } \
+    err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \
   else \
     { \
       RET_TYPE retval (nr, a_nc, ZERO); \
@@ -1980,10 +1968,7 @@
       return retval; \
     } \
   else if (nc != a_nc) \
-    { \
-      err_nonconformant ("operator *", nr, nc, a_nc, a_nr); \
-      return RET_TYPE (); \
-    } \
+    err_nonconformant ("operator *", nr, nc, a_nc, a_nr); \
   else \
     { \
       RET_TYPE retval (nr, a_nr, ZERO); \
diff -r 61ca546e1942 -r 228b65504557 liboctave/operators/Sparse-perm-op-defs.h
--- a/liboctave/operators/Sparse-perm-op-defs.h	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/operators/Sparse-perm-op-defs.h	Thu Jan 21 12:54:17 2016 -0800
@@ -62,10 +62,7 @@
 {
   const octave_idx_type nr = a.rows ();
   if (p.cols () != nr)
-    {
-      err_nonconformant ("operator *", p.rows (), p.cols (), a.rows (), a.cols ());
-      return SM ();
-    }
+    err_nonconformant ("operator *", p.rows (), p.cols (), a.rows (), a.cols ());
 
   return octinternal_do_mul_colpm_sm (p.col_perm_vec ().data (), a);
 }
@@ -148,10 +145,7 @@
 {
   const octave_idx_type nc = a.cols ();
   if (p.rows () != nc)
-    {
-      err_nonconformant ("operator *", a.rows (), a.cols (), p.rows (), p.cols ());
-      return SM ();
-    }
+    err_nonconformant ("operator *", a.rows (), a.cols (), p.rows (), p.cols ());
 
   return octinternal_do_mul_sm_colpm (a, p.col_perm_vec ().data ());
 }
diff -r 61ca546e1942 -r 228b65504557 liboctave/operators/mx-inlines.cc
--- a/liboctave/operators/mx-inlines.cc	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/operators/mx-inlines.cc	Thu Jan 21 12:54:17 2016 -0800
@@ -379,10 +379,7 @@
       return do_bsxfun_op (x, y, op, op1, op2);
     }
   else
-    {
-      err_nonconformant (opname, dx, dy);
-      return Array<R> ();
-    }
+    err_nonconformant (opname, dx, dy);
 }
 
 template <class R, class X, class Y>
diff -r 61ca546e1942 -r 228b65504557 liboctave/operators/mx-op-defs.h
--- a/liboctave/operators/mx-op-defs.h	Thu Jan 21 13:03:27 2016 -0500
+++ b/liboctave/operators/mx-op-defs.h	Thu Jan 21 12:54:17 2016 -0800
@@ -403,19 +403,17 @@
  \
   if (m_nr != dm_nr || m_nc != dm_nc) \
     err_nonconformant (#OP, m_nr, m_nc, dm_nr, dm_nc); \
-  else \
-    { \
-      r.resize (m_nr, m_nc); \
+ \
+  r.resize (m_nr, m_nc); \
  \
-      if (m_nr > 0 && m_nc > 0) \
-        { \
-          r = R (m); \
+  if (m_nr > 0 && m_nc > 0) \
+    { \
+      r = R (m); \
  \
-          octave_idx_type len = dm.length (); \
+      octave_idx_type len = dm.length (); \
  \
-          for (octave_idx_type i = 0; i < len; i++) \
-            r.elem (i, i) OPEQ dm.elem (i, i); \
-        } \
+      for (octave_idx_type i = 0; i < len; i++) \
+        r.elem (i, i) OPEQ dm.elem (i, i); \
     } \
  \
   return r; \
@@ -435,21 +433,19 @@
  \
   if (m_nc != dm_nr) \
     err_nonconformant ("operator *", m_nr, m_nc, dm_nr, dm_nc); \
-  else \
-    { \
-      r = R (m_nr, dm_nc); \
-      R::element_type *rd = r.fortran_vec (); \
-      const M::element_type *md = m.data (); \
-      const DM::element_type *dd = dm.data (); \
+ \
+  r = R (m_nr, dm_nc); \
+  R::element_type *rd = r.fortran_vec (); \
+  const M::element_type *md = m.data (); \
+  const DM::element_type *dd = dm.data (); \
  \
-      octave_idx_type len = dm.length (); \
-      for (octave_idx_type i = 0; i < len; i++) \
-        { \
-          mx_inline_mul (m_nr, rd, md, dd[i]); \
-          rd += m_nr; md += m_nr; \
-        } \
-      mx_inline_fill (m_nr * (dm_nc - len), rd, R_ZERO); \
+  octave_idx_type len = dm.length (); \
+  for (octave_idx_type i = 0; i < len; i++) \
+    { \
+      mx_inline_mul (m_nr, rd, md, dd[i]); \
+      rd += m_nr; md += m_nr; \
     } \
+  mx_inline_fill (m_nr * (dm_nc - len), rd, R_ZERO); \
  \
   return r; \
 }
@@ -507,21 +503,19 @@
  \
   if (dm_nc != m_nr) \
     err_nonconformant ("operator *", dm_nr, dm_nc, m_nr, m_nc); \
-  else \
-    { \
-      r = R (dm_nr, m_nc); \
-      R::element_type *rd = r.fortran_vec (); \
-      const M::element_type *md = m.data (); \
-      const DM::element_type *dd = dm.data (); \
+ \
+  r = R (dm_nr, m_nc); \
+  R::element_type *rd = r.fortran_vec (); \
+  const M::element_type *md = m.data (); \
+  const DM::element_type *dd = dm.data (); \
  \
-      octave_idx_type len = dm.length (); \
-      for (octave_idx_type i = 0; i < m_nc; i++) \
-        { \
-          mx_inline_mul (len, rd, md, dd); \
-          rd += len; md += m_nr; \
-          mx_inline_fill (dm_nr - len, rd, R_ZERO); \
-          rd += dm_nr - len; \
-        } \
+  octave_idx_type len = dm.length (); \
+  for (octave_idx_type i = 0; i < m_nc; i++) \
+    { \
+      mx_inline_mul (len, rd, md, dd); \
+      rd += len; md += m_nr; \
+      mx_inline_fill (dm_nr - len, rd, R_ZERO); \
+      rd += dm_nr - len; \
     } \
  \
   return r; \
@@ -548,13 +542,11 @@
  \
     if (dm1_nr != dm2_nr || dm1_nc != dm2_nc) \
       err_nonconformant (#OP, dm1_nr, dm1_nc, dm2_nr, dm2_nc); \
-    else \
-      { \
-        r.resize (dm1_nr, dm1_nc); \
+ \
+    r.resize (dm1_nr, dm1_nc); \
  \
-        if (dm1_nr > 0 && dm1_nc > 0) \
-          F (dm1.length (), r.fortran_vec (), dm1.data (), dm2.data ()); \
-      } \
+    if (dm1_nr > 0 && dm1_nc > 0) \
+      F (dm1.length (), r.fortran_vec (), dm1.data (), dm2.data ()); \
  \
     return r; \
   }
@@ -622,8 +614,8 @@
   M result; \
   if (p.rows () != nc) \
     err_nonconformant ("operator *", nr, nc, p.rows (), p.columns ()); \
-  else \
-    result = x.index (idx_vector::colon, p.col_perm_vec ()); \
+  \
+  result = x.index (idx_vector::colon, p.col_perm_vec ()); \
   \
   return result; \
 }