diff --git a/share/completions/configure.fish b/share/completions/configure.fish
index 8834842be..8ef9f044d 100644
--- a/share/completions/configure.fish
+++ b/share/completions/configure.fish
@@ -10,5 +10,3 @@ complete -c configure -l exec-prefix --description "Architecture-dependent insta
 complete -c configure -l build --description "Configure for building on BUILD" -x
 complete -c configure -l host --description "Cross-compile to build programs to run on HOST" -x
 complete -c configure -l target --description "Configure for building compilers for TARGET" -x
-
-complete -c configure -u
diff --git a/share/completions/echo.fish b/share/completions/echo.fish
index 28ffa03e3..bfb962fd3 100644
--- a/share/completions/echo.fish
+++ b/share/completions/echo.fish
@@ -3,4 +3,3 @@ complete -c echo -s s --description "Do not separate arguments with spaces"
 complete -c echo -s E --description "Disable backslash escapes"
 complete -c echo -s e --description "Enable backslash escapes"
 complete -c echo -s h -l help --description "Display help and exit"
-complete -c echo -u
diff --git a/share/completions/env.fish b/share/completions/env.fish
index c6359da0a..e00601717 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -7,6 +7,3 @@ complete -c env -s i -l ignore-environment --description "Start with an empty en
 complete -c env -s u -l unset --description "Remove variable from the environment" -x -a "(set -n)"
 complete -c env -l help --description "Display help and exit"
 complete -c env -l version --description "Display version and exit"
-
-# Since env runs subcommands, it can accept any switches
-complete -c env -u
diff --git a/share/completions/journalctl.fish b/share/completions/journalctl.fish
index 8bbd0136d..f582f4e54 100644
--- a/share/completions/journalctl.fish
+++ b/share/completions/journalctl.fish
@@ -25,7 +25,7 @@ end
 complete -c journalctl -n "not __fish_journalctl_is_field" -a '(__fish_journalctl_fields)' -d "Journal field" -f
 complete -c journalctl -n "not __fish_journalctl_is_field" -a '(command journalctl -F _EXE ^/dev/null)' -d "Executable"
 complete -c journalctl -n "not __fish_journalctl_is_field" -a '+' -d "OR"
-complete -c journalctl -n "__fish_journalctl_is_field" -a '(__fish_journalctl_field_values)' -f -r -A
+complete -c journalctl -n "__fish_journalctl_is_field" -a '(__fish_journalctl_field_values)' -f -r
 
 complete -c journalctl -f -s h -l help -d 'Prints a short help text and exits'
 complete -c journalctl -f -l version -d 'Prints a short version string and exits'
diff --git a/share/completions/mosh.fish b/share/completions/mosh.fish
index 064c7023b..150dcd5f7 100644
--- a/share/completions/mosh.fish
+++ b/share/completions/mosh.fish
@@ -21,6 +21,3 @@ complete -c mosh -f -l predict --description 'Controls use of speculative local
 complete -c mosh -s a --description 'Synonym for --predict=always'
 complete -c mosh -s n --description 'Synonym for --predict=never'
 complete -c mosh -s p -l port --description 'Use a particular server-side UDP port or port range'
-
-# Since mosh runs subcommands, it can accept any switches
-complete -c mosh -u
diff --git a/share/completions/mplayer.fish b/share/completions/mplayer.fish
index eb72628fb..b3a48635a 100644
--- a/share/completions/mplayer.fish
+++ b/share/completions/mplayer.fish
@@ -82,6 +82,4 @@ complete -c mplayer -o vfm -x --description "Video output" -a "
 complete -c mplayer -l help --description "Display help and exit"
 complete -c mplayer -l version --description "Display version and exit"
 
-complete -c mplayer -u
-
 set -e mplayer_lang
diff --git a/share/completions/set.fish b/share/completions/set.fish
index cadbec0f1..4184d297d 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -78,5 +78,3 @@ complete -c set -n '__fish_set_is_color' -s o -l bold --description 'Make font b
 complete -c set -n '__fish_is_first_token' -x -a '$__fish_locale_vars' -d 'Locale variable'
 complete -c set -n '__fish_set_is_locale' -x -a '(locale -a)' -d (_ Locale)
 complete -c set -s L -l long -d 'Do not truncate long lines'
-
-complete -c set -u
diff --git a/share/completions/ssh.fish b/share/completions/ssh.fish
index 6131c2545..a8896b627 100644
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -46,6 +46,3 @@ complete -c ssh -s X --description "Enable X11 forwarding"
 complete -c ssh -s L --description "Locally forwarded ports"
 complete -c ssh -s R --description "Remotely forwarded ports"
 complete -c ssh -s D --description "Dynamic port forwarding"
-
-# Since ssh runs subcommands, it can accept any switches
-complete -c ssh -u
diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish
index afe1380f8..6d5260a78 100644
--- a/share/completions/sudo.fish
+++ b/share/completions/sudo.fish
@@ -24,5 +24,3 @@ complete -c sudo -s u -a "(__fish_complete_users)" -x -d "Run command as user"
 complete -c sudo -s v -n "__fish_no_arguments" -d "Validate the credentials, extending timeout"
 
 complete -c sudo -d "Command to run" -x -a "(__fish_complete_subcommand_root -u -g)"
-# Since sudo runs subcommands, it can accept any switches
-complete -c sudo -u
diff --git a/share/completions/systemd-nspawn.fish b/share/completions/systemd-nspawn.fish
index f8002a700..773d39b78 100644
--- a/share/completions/systemd-nspawn.fish
+++ b/share/completions/systemd-nspawn.fish
@@ -21,7 +21,7 @@ complete -c systemd-nspawn -s L -l selinux-apifs-context -d 'Sets the SELinux se
 complete -c systemd-nspawn -l capability -d 'Grant additional capabilities to the container'
 complete -c systemd-nspawn -l drop-capability -d 'Drop capabilities from the container'
 complete -c systemd-nspawn -l kill-signal -d "Signal to send to the container's PID1 when nspawn receives SIGTERM"
-complete -c systemd-nspawn -l link-journal -d 'Set container journal visibility' -a 'no host try-host guest try-guest auto' -r -A
+complete -c systemd-nspawn -l link-journal -d 'Set container journal visibility' -a 'no host try-host guest try-guest auto' -r
 complete -c systemd-nspawn -s j -d 'Equivalent to --link-journal=try-guest'
 complete -c systemd-nspawn -l read-only -d 'Mount the root file system read-only for the container'
 complete -c systemd-nspawn -l bind -l bind-ro -d 'Bind mount a file or directory from the host in the container' -r
diff --git a/share/completions/time.fish b/share/completions/time.fish
index f072f0b0c..bb496322b 100644
--- a/share/completions/time.fish
+++ b/share/completions/time.fish
@@ -8,6 +8,3 @@ complete -c time -s a -l append -n "__fish_no_arguments" --description "(Used to
 complete -c time -s v -l verbose -n "__fish_no_arguments" --description "Verbose mode"
 complete -c time -l help -n "__fish_no_arguments" --description "Display help and exit"
 complete -c time -s V -l version -n "__fish_no_arguments" --description "Display version and exit"
-
-# Since time runs subcommands, it can accept any switches
-complete -c time -u