33467: correct return status on functions and numerous other minor fixes

Completion/Unix/Command/_netcat

@@ -1,11 +1,10 @@
 #compdef nc netcat
 
-local curcontext="$curcontext" state line expl
-typeset -A opt_args
-
 # handle name clash with the nedit client
-[[ $service = nc ]] && ! _pick_variant netcat=connect nedit -h &&
-    _nedit && return
+if [[ $service = nc ]] && ! _pick_variant netcat=connect nedit -h; then
+  _nedit
+  return
+fi
 
 if (( ! $+_nc_args )); then
   local help="$(_call_program options $words[1] -h < /dev/null 2>&1)"
@@ -14,17 +13,17 @@ if (( ! $+_nc_args )); then
     '*-e prog*' '-e+[program to exec after connect]:prog:_command_names -e'
      '*-g gateway*' '-g+[source-routing hop point]:gateway:_hosts'
      '*-G num*' '-G[source-routing pointer: 4, 8, 12]'
-     '*-i secs*' '-i+[delay interval for lines sent or ports scanned]:secs:'
+     '*-i secs*' '-i+[delay interval for lines sent or ports scanned]:delay (secs)'
      '*-l*' '-l[listen mode]'
      '*-n*' '-n[numeric-only IP addresses, no DNS]'
      '*-o file*' '-o+[hex dump of traffic]:file:_files'
      '*-p port*' '-p+[local port number]:port:_ports'
      '*-r*' '-r[randomize local and remote ports]'
-     '*-q secs*' '-q+[quit after EOF on stdin and delay of secs]:secs:'
+     '*-q secs*' '-q+[quit after EOF on stdin and delay of secs]:delay (secs)'
      '*-t*' '-t[answer TELNET negotiation]'
      '*-u*' '-u[UDP mode]'
      '*-v*' '-v[verbose]'
-     '*-w secs*' '-w+[timeout for connects and final net reads]:secs:'
+     '*-w secs*' '-w+[timeout for connects and final net reads]:timeout (secs)'
      '*-z*' '-z[zero-I/O mode]'
      '*-x*' '-x'
      '*-b*' '-b[allow broadcasts]'
@@ -32,7 +31,7 @@ if (( ! $+_nc_args )); then
   _nc_args=($optionmap[(K)"$help"])
 fi
 
-_arguments -C -s \
+_arguments -s \
   "$_nc_args[@]" \
   ':host:_hosts' \
-  ':port:_ports' && return 0
+  ':port:_ports'