diff --git a/share/completions/busctl.fish b/share/completions/busctl.fish
index 77d384c57..4590bc404 100644
--- a/share/completions/busctl.fish
+++ b/share/completions/busctl.fish
@@ -119,7 +119,7 @@ end
 ### Commands
 set -l commands list status monitor capture tree introspect call get-property set-property help
 
-complete -f -e -c busctl
+complete -f -c busctl
 complete -f -c busctl -n "not __fish_seen_subcommand_from $commands" -a "$commands"
 
 ### Arguments to commands
diff --git a/share/completions/dconf.fish b/share/completions/dconf.fish
index 45d427d67..c5310dee7 100644
--- a/share/completions/dconf.fish
+++ b/share/completions/dconf.fish
@@ -21,7 +21,7 @@ end
 ### Commands
 set -l commands read list write reset compile update watch dump load help
 
-complete -f -e -c dconf
+complete -f -c dconf
 complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a read -d 'Read the value of a key'
 complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a list -d 'List the sub-keys and sub-directories of a directory'
 complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a write -d 'Write a new value to a key'
diff --git a/share/completions/gsettings.fish b/share/completions/gsettings.fish
index f81a76ba8..86dfb07e3 100644
--- a/share/completions/gsettings.fish
+++ b/share/completions/gsettings.fish
@@ -74,7 +74,7 @@ end
 
 set -l valid_commands get monitor writable range describe set reset reset-recursively list-schemas list-relocatable-schemas list-keys list-children list-recursively help
 
-complete -f -e -c gsettings
+complete -f -c gsettings
 
 complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -l version -d 'Print the version information'
 complete -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -l schemadir -d 'Specify a custom schemas directory' -xa "(__fish_complete_directories (commandline -ct))"
diff --git a/share/completions/machinectl.fish b/share/completions/machinectl.fish
index 40bac091e..5d5aea148 100644
--- a/share/completions/machinectl.fish
+++ b/share/completions/machinectl.fish
@@ -1,4 +1,4 @@
-complete -f -e -c machinectl
+complete -f -c machinectl
 
 set -l commands list status show start login enable disable poweroff reboot \
     terminate kill bind copy-{to,from} list-images image-status show-image clone rename read-only remove set-limit pull-{tar,raw,dkr} \
diff --git a/share/completions/pacaur.fish b/share/completions/pacaur.fish
index cd44922df..4467cadc6 100644
--- a/share/completions/pacaur.fish
+++ b/share/completions/pacaur.fish
@@ -1,7 +1,4 @@
-# Completions for pacaur
-
 set -l progname pacaur
-complete -e -c $progname
 complete -c $progname -f
 
 set -l listinstalled "(pacman -Q | string replace ' ' \t)"
diff --git a/share/completions/pacmd.fish b/share/completions/pacmd.fish
index 664578813..9e5a7a8bc 100644
--- a/share/completions/pacmd.fish
+++ b/share/completions/pacmd.fish
@@ -1,7 +1,7 @@
 # Pulseaudio's pacmd
 # This covers the most useful commands
 set -l commands (pacmd help | string match -r '^ +[-\w]+' | string trim)
-complete -f -e -c pacmd
+complete -f -c pacmd
 complete -f -c pacmd -w pactl
 
 # These descriptions are a bit wordy and unnecessary
diff --git a/share/completions/pactl.fish b/share/completions/pactl.fish
index 895faa764..089c06c26 100644
--- a/share/completions/pactl.fish
+++ b/share/completions/pactl.fish
@@ -47,7 +47,7 @@ function __fish_pa_complete_unloaded_modules
     end
 end
 
-complete -f -e -c pactl
+complete -f -c pactl
 complete -f -c pactl -n "not __fish_seen_subcommand_from $commands" -a "$ctlcommands"
 
 complete -f -c pactl -n "not __fish_seen_subcommand_from $commands" -a stat -d 'Show statistics about memory usage'
diff --git a/share/completions/rustc.fish b/share/completions/rustc.fish
index 444eeba50..248d5dbef 100644
--- a/share/completions/rustc.fish
+++ b/share/completions/rustc.fish
@@ -1,7 +1,3 @@
-# Tab completion for rustc (https://github.com/rust-lang/rust).
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
-complete -e -c rustc
-
 complete -c rustc -s h -l help
 
 complete -c rustc -x -l cfg
diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
index 2b3a91eaf..f66ab7b28 100644
--- a/share/completions/rustup.fish
+++ b/share/completions/rustup.fish
@@ -1,4 +1,4 @@
-complete -c rustup -e
+complete -c rustup
 
 set -l subcmds \
     show \
diff --git a/share/completions/yaourt.fish b/share/completions/yaourt.fish
index 9cbbb8578..59b1e6b2f 100644
--- a/share/completions/yaourt.fish
+++ b/share/completions/yaourt.fish
@@ -1,7 +1,4 @@
-# Completions for yaourt
-
 set -l progname yaourt
-complete -e -c $progname
 complete -c $progname -f
 
 set -l listinstalled "(pacman -Q | string replace ' ' \t)"