--- a/libinterp/octave-value/ov-fcn-handle.cc	Fri Dec 04 10:03:38 2015 -0800
+++ b/libinterp/octave-value/ov-fcn-handle.cc	Thu Dec 03 14:59:30 2015 -0500
@@ -1716,86 +1716,84 @@
 {
   octave_value retval;
 
-  if (args.length () == 1)
-    {
-      octave_fcn_handle *fh = args(0).fcn_handle_value ("functions: FCN_HANDLE argument must be a function handle object");
-
-      octave_function *fcn = fh ? fh->function_value () : 0;
-
-      if (fcn)
-        {
-          octave_scalar_map m;
-
-          std::string fh_nm = fh->fcn_name ();
+  if (args.length () != 1)
+    print_usage ();
 
-          if (fh_nm == octave_fcn_handle::anonymous)
-            {
-              std::ostringstream buf;
-              fh->print_raw (buf);
-              m.setfield ("function", buf.str ());
+  octave_fcn_handle *fh = args(0).fcn_handle_value ("functions: FCN_HANDLE argument must be a function handle object");
 
-              m.setfield ("type", "anonymous");
-            }
-          else
-            {
-              m.setfield ("function", fh_nm);
+  octave_function *fcn = fh ? fh->function_value () : 0;
 
-              if (fcn->is_subfunction ())
-                {
-                  m.setfield ("type", "subfunction");
-                  Cell parentage (dim_vector (1, 2));
-                  parentage.elem (0) = fh_nm;
-                  parentage.elem (1) = fcn->parent_fcn_name ();
-                  m.setfield ("parentage", octave_value (parentage));
-                }
-              else if (fcn->is_private_function ())
-                m.setfield ("type", "private");
-              else if (fh->is_overloaded ())
-                m.setfield ("type", "overloaded");
-              else
-                m.setfield ("type", "simple");
-            }
+  if (fcn)
+    {
+      octave_scalar_map m;
 
-          std::string nm = fcn->fcn_file_name ();
-
-          if (fh_nm == octave_fcn_handle::anonymous)
-            {
-              m.setfield ("file", nm);
-
-              octave_user_function *fu = fh->user_function_value ();
+      std::string fh_nm = fh->fcn_name ();
 
-              std::list<symbol_table::symbol_record> vars
-                = symbol_table::all_variables (fu->scope (), 0);
-
-              size_t varlen = vars.size ();
+      if (fh_nm == octave_fcn_handle::anonymous)
+        {
+          std::ostringstream buf;
+          fh->print_raw (buf);
+          m.setfield ("function", buf.str ());
 
-              if (varlen > 0)
-                {
-                  octave_scalar_map ws;
-                  for (std::list<symbol_table::symbol_record>::const_iterator
-                         p = vars.begin (); p != vars.end (); p++)
-                    {
-                      ws.assign (p->name (), p->varval (0));
-                    }
-
-                  m.setfield ("workspace", ws);
-                }
-            }
-          else if (fcn->is_user_function () || fcn->is_user_script ())
-            {
-              octave_function *fu = fh->function_value ();
-              m.setfield ("file", fu->fcn_file_name ());
-            }
-          else
-            m.setfield ("file", "");
-
-          retval = m;
+          m.setfield ("type", "anonymous");
         }
       else
-        error ("functions: FCN_HANDLE is not a valid function handle object");
+        {
+          m.setfield ("function", fh_nm);
+
+          if (fcn->is_subfunction ())
+            {
+              m.setfield ("type", "subfunction");
+              Cell parentage (dim_vector (1, 2));
+              parentage.elem (0) = fh_nm;
+              parentage.elem (1) = fcn->parent_fcn_name ();
+              m.setfield ("parentage", octave_value (parentage));
+            }
+          else if (fcn->is_private_function ())
+            m.setfield ("type", "private");
+          else if (fh->is_overloaded ())
+            m.setfield ("type", "overloaded");
+          else
+            m.setfield ("type", "simple");
+        }
+
+      std::string nm = fcn->fcn_file_name ();
+
+      if (fh_nm == octave_fcn_handle::anonymous)
+        {
+          m.setfield ("file", nm);
+
+          octave_user_function *fu = fh->user_function_value ();
+
+          std::list<symbol_table::symbol_record> vars
+            = symbol_table::all_variables (fu->scope (), 0);
+
+          size_t varlen = vars.size ();
+
+          if (varlen > 0)
+            {
+              octave_scalar_map ws;
+              for (std::list<symbol_table::symbol_record>::const_iterator
+                     p = vars.begin (); p != vars.end (); p++)
+                {
+                  ws.assign (p->name (), p->varval (0));
+                }
+
+              m.setfield ("workspace", ws);
+            }
+        }
+      else if (fcn->is_user_function () || fcn->is_user_script ())
+        {
+          octave_function *fu = fh->function_value ();
+          m.setfield ("file", fu->fcn_file_name ());
+        }
+      else
+        m.setfield ("file", "");
+
+      retval = m;
     }
   else
-    print_usage ();
+    error ("functions: FCN_HANDLE is not a valid function handle object");
 
   return retval;
 }
@@ -1810,30 +1808,28 @@
 {
   octave_value retval;
 
-  if (args.length () == 1)
-    {
-      octave_fcn_handle *fh = args(0).fcn_handle_value ("func2str: FCN_HANDLE argument must be a function handle object");
+  if (args.length () != 1)
+    print_usage ();
 
-      if (fh)
-        {
-          std::string fh_nm = fh->fcn_name ();
+  octave_fcn_handle *fh = args(0).fcn_handle_value ("func2str: FCN_HANDLE argument must be a function handle object");
 
-          if (fh_nm == octave_fcn_handle::anonymous)
-            {
-              std::ostringstream buf;
+  if (fh)
+    {
+      std::string fh_nm = fh->fcn_name ();
 
-              fh->print_raw (buf);
+      if (fh_nm == octave_fcn_handle::anonymous)
+        {
+          std::ostringstream buf;
 
-              retval = buf.str ();
-            }
-          else
-            retval = fh_nm;
+          fh->print_raw (buf);
+
+          retval = buf.str ();
         }
       else
-        error ("func2str: FCN_HANDLE must be a valid function handle");
+        retval = fh_nm;
     }
   else
-    print_usage ();
+    error ("func2str: FCN_HANDLE must be a valid function handle");
 
   return retval;
 }
@@ -1852,24 +1848,22 @@
   octave_value retval;
   int nargin = args.length ();
 
-  if (nargin == 1 || nargin == 2)
-    {
-      std::string nm = args(0).xstring_value ("str2func: FCN_NAME must be a string");
+  if (nargin < 1 || nargin > 2)
+    print_usage ();
+
+  std::string nm = args(0).xstring_value ("str2func: FCN_NAME must be a string");
 
-      if (nm[0] == '@')
-        {
-          int parse_status;
-          octave_value anon_fcn_handle =
-            eval_string (nm, true, parse_status);
+  if (nm[0] == '@')
+    {
+      int parse_status;
+      octave_value anon_fcn_handle =
+        eval_string (nm, true, parse_status);
 
-          if (parse_status == 0)
-            retval = anon_fcn_handle;
-        }
-      else
-        retval = make_fcn_handle (nm, nargin != 2);
+      if (parse_status == 0)
+        retval = anon_fcn_handle;
     }
   else
-    print_usage ();
+    retval = make_fcn_handle (nm, nargin != 2);
 
   return retval;
 }
@@ -1913,16 +1907,12 @@
 @seealso{isa, typeinfo, class, functions}\n\
 @end deftypefn")
 {
-  octave_value retval;
-
   int nargin = args.length ();
 
-  if (nargin == 1)
-    retval = args(0).is_function_handle ();
-  else
+  if (nargin != 1)
     print_usage ();
 
-  return retval;
+  return octave_value (args(0).is_function_handle ());
 }
 
 /*