--- a/libinterp/corefcn/urlwrite.cc	Thu Dec 03 15:07:01 2015 -0500
+++ b/libinterp/corefcn/urlwrite.cc	Thu Dec 03 16:40:05 2015 -0500
@@ -340,10 +340,7 @@
 
   // verify arguments
   if (nargin != 2 && nargin != 4)
-    {
-      print_usage ();
-      return retval;
-    }
+    print_usage ();
 
   std::string url = args(0).xstring_value ("urlwrite: URL must be a string");
 
@@ -477,10 +474,7 @@
 
   // verify arguments
   if (nargin != 1 && nargin != 3)
-    {
-      print_usage ();
-      return retval;
-    }
+    print_usage ();
 
   std::string url = args(0).xstring_value ("urlread: URL must be a string");
 
@@ -538,35 +532,25 @@
 Undocumented internal function\n\
 @end deftypefn")
 {
-  octave_value retval;
-
   int nargin = args.length ();
-  std::string host;
-  std::string user = "anonymous";
-  std::string passwd = "";
 
   if (nargin < 1 || nargin > 3)
-    {
-      print_usage ();
-      return retval;
-    }
-  else
-    {
-      host = args(0).xstring_value ("__ftp__: HOST must be a string");
+    print_usage ();
+
+  std::string host = args(0).xstring_value ("__ftp__: HOST must be a string");
 
-      if (nargin > 1)
-        user = args(1).xstring_value ("__ftp__: USER must be a string");
+  std::string user = (nargin > 1)
+    ? args(1).xstring_value ("__ftp__: USER must be a string")
+    : std::string ("anonymous");
 
-      if (nargin > 2)
-        passwd = args(2).xstring_value ("__ftp__: PASSWD must be a string");
+  std::string passwd = (nargin > 2)
+    ? args(2).xstring_value ("__ftp__: PASSWD must be a string")
+    : std::string ();
 
-      curl_handle ch
-        = ch_manager::make_curl_handle (host, user, passwd, octave_stdout);
+  curl_handle ch
+    = ch_manager::make_curl_handle (host, user, passwd, octave_stdout);
 
-      retval = ch.value ();
-    }
-
-  return retval;
+  return octave_value (ch.value ());
 }
 
 DEFUN (__ftp_pwd__, args, ,