diff --git a/benchmarks/benchmarks/aliases.fish b/benchmarks/benchmarks/aliases.fish
index e6a366685..b33f87fcd 100644
--- a/benchmarks/benchmarks/aliases.fish
+++ b/benchmarks/benchmarks/aliases.fish
@@ -1,5 +1,5 @@
 function alias --description 'Creates a function wrapping a command'
-    set -l options 'h/help' 's/save'
+    set -l options h/help s/save
     argparse -n alias --max-args=2 $options -- $argv
     or return
 
diff --git a/build_tools/lint.fish b/build_tools/lint.fish
index cce1b488a..f194c4324 100755
--- a/build_tools/lint.fish
+++ b/build_tools/lint.fish
@@ -31,7 +31,7 @@ end
 # be harmless everywhere else.
 set cppcheck_args $cppcheck_args -I /usr/include -I .
 
-if test "$machine_type" = "x86_64"
+if test "$machine_type" = x86_64
     set cppcheck_args -D__x86_64__ -D__LP64__ $cppcheck_args
 end
 
diff --git a/build_tools/style.fish b/build_tools/style.fish
index 4075bc9ef..d567c8b01 100755
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -9,7 +9,7 @@ set fish_files
 set python_files
 set all no
 
-if test "$argv[1]" = "--all"
+if test "$argv[1]" = --all
     set all yes
     set -e argv[1]
 end
diff --git a/share/completions/abbr.fish b/share/completions/abbr.fish
index f9557a32f..e82042d82 100644
--- a/share/completions/abbr.fish
+++ b/share/completions/abbr.fish
@@ -4,4 +4,4 @@ complete -c abbr -f -s a -l add -d 'Add abbreviation'
 complete -c abbr -s e -l erase -d 'Erase abbreviation' -xa '(abbr --list)'
 complete -c abbr -f -s s -l show -d 'Print all abbreviations'
 complete -c abbr -f -s l -l list -d 'Print all abbreviation names'
-complete -c abbr -f -s h -l help -d 'Help'
+complete -c abbr -f -s h -l help -d Help
diff --git a/share/completions/adb.fish b/share/completions/adb.fish
index b055347ee..64acadfdb 100644
--- a/share/completions/adb.fish
+++ b/share/completions/adb.fish
@@ -38,9 +38,9 @@ function __fish_adb_run_command -d 'Runs adb with any -s parameters already give
     # If no -s option, see if there's a -d or -e instead
     if test -z "$sopt"
         if contains -- -d $cmd
-            set sopt '-d'
+            set sopt -d
         else if contains -- -e $cmd
-            set sopt '-e'
+            set sopt -e
         end
     end
 
@@ -63,7 +63,7 @@ function __fish_adb_list_files
 
     # Have tab complete show initial / if nothing on current token
     if test -z "$token"
-        set token "/"
+        set token /
     end
 
     # Return list of directories suffixed with '/'
@@ -74,52 +74,52 @@ end
 
 
 # Generic options, must come before command
-complete -n '__fish_adb_no_subcommand' -c adb -s s -x -a "(__fish_adb_get_devices)" -d 'Device to communicate with'
-complete -n '__fish_adb_no_subcommand' -c adb -s d -d 'Communicate with first USB device'
-complete -n '__fish_adb_no_subcommand' -c adb -s e -d 'Communicate with emulator'
+complete -n __fish_adb_no_subcommand -c adb -s s -x -a "(__fish_adb_get_devices)" -d 'Device to communicate with'
+complete -n __fish_adb_no_subcommand -c adb -s d -d 'Communicate with first USB device'
+complete -n __fish_adb_no_subcommand -c adb -s e -d 'Communicate with emulator'
 
 # Commands
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'connect' -d 'Connect to device'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'disconnect' -d 'Disconnect from device'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'devices' -d 'List all connected devices'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'push' -d 'Copy file to device'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'pull' -d 'Copy file from device'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'sync' -d 'Copy host->device only if changed'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'shell' -d 'Run remote shell [command]'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'emu' -d 'Run emulator console command'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'logcat' -d 'View device log'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'install' -d 'Install package'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'uninstall' -d 'Uninstall package'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'jdwp' -d 'List PIDs of processes hosting a JDWP transport'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'forward' -d 'Port forwarding'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'bugreport' -d 'Return bugreport information'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'backup' -d 'Perform device backup'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'restore' -d 'Restore device from backup'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'version' -d 'Show adb version'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'help' -d 'Show adb help'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'wait-for-device' -d 'Block until device is online'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'start-server' -d 'Ensure that there is a server running'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'kill-server' -d 'Kill the server if it is running'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'remount' -d 'Remounts the /system partition on the device read-write'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'reboot' -d 'Reboots the device, optionally into the bootloader or recovery program'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'get-state' -d 'Prints state of the device'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'get-serialno' -d 'Prints serial number of the device'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'get-devpath' -d 'Prints device path'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'status-window' -d 'Continuously print the device status'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'root' -d 'Restart the adbd daemon with root permissions'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'usb' -d 'Restart the adbd daemon listening on USB'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'tcpip' -d 'Restart the adbd daemon listening on TCP'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'ppp' -d 'Run PPP over USB'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'sideload' -d 'Sideloads the given package'
-complete -f -n '__fish_adb_no_subcommand' -c adb -a 'reconnect' -d 'Kick current connection from host side and make it reconnect.'
+complete -f -n __fish_adb_no_subcommand -c adb -a connect -d 'Connect to device'
+complete -f -n __fish_adb_no_subcommand -c adb -a disconnect -d 'Disconnect from device'
+complete -f -n __fish_adb_no_subcommand -c adb -a devices -d 'List all connected devices'
+complete -f -n __fish_adb_no_subcommand -c adb -a push -d 'Copy file to device'
+complete -f -n __fish_adb_no_subcommand -c adb -a pull -d 'Copy file from device'
+complete -f -n __fish_adb_no_subcommand -c adb -a sync -d 'Copy host->device only if changed'
+complete -f -n __fish_adb_no_subcommand -c adb -a shell -d 'Run remote shell [command]'
+complete -f -n __fish_adb_no_subcommand -c adb -a emu -d 'Run emulator console command'
+complete -f -n __fish_adb_no_subcommand -c adb -a logcat -d 'View device log'
+complete -f -n __fish_adb_no_subcommand -c adb -a install -d 'Install package'
+complete -f -n __fish_adb_no_subcommand -c adb -a uninstall -d 'Uninstall package'
+complete -f -n __fish_adb_no_subcommand -c adb -a jdwp -d 'List PIDs of processes hosting a JDWP transport'
+complete -f -n __fish_adb_no_subcommand -c adb -a forward -d 'Port forwarding'
+complete -f -n __fish_adb_no_subcommand -c adb -a bugreport -d 'Return bugreport information'
+complete -f -n __fish_adb_no_subcommand -c adb -a backup -d 'Perform device backup'
+complete -f -n __fish_adb_no_subcommand -c adb -a restore -d 'Restore device from backup'
+complete -f -n __fish_adb_no_subcommand -c adb -a version -d 'Show adb version'
+complete -f -n __fish_adb_no_subcommand -c adb -a help -d 'Show adb help'
+complete -f -n __fish_adb_no_subcommand -c adb -a wait-for-device -d 'Block until device is online'
+complete -f -n __fish_adb_no_subcommand -c adb -a start-server -d 'Ensure that there is a server running'
+complete -f -n __fish_adb_no_subcommand -c adb -a kill-server -d 'Kill the server if it is running'
+complete -f -n __fish_adb_no_subcommand -c adb -a remount -d 'Remounts the /system partition on the device read-write'
+complete -f -n __fish_adb_no_subcommand -c adb -a reboot -d 'Reboots the device, optionally into the bootloader or recovery program'
+complete -f -n __fish_adb_no_subcommand -c adb -a get-state -d 'Prints state of the device'
+complete -f -n __fish_adb_no_subcommand -c adb -a get-serialno -d 'Prints serial number of the device'
+complete -f -n __fish_adb_no_subcommand -c adb -a get-devpath -d 'Prints device path'
+complete -f -n __fish_adb_no_subcommand -c adb -a status-window -d 'Continuously print the device status'
+complete -f -n __fish_adb_no_subcommand -c adb -a root -d 'Restart the adbd daemon with root permissions'
+complete -f -n __fish_adb_no_subcommand -c adb -a usb -d 'Restart the adbd daemon listening on USB'
+complete -f -n __fish_adb_no_subcommand -c adb -a tcpip -d 'Restart the adbd daemon listening on TCP'
+complete -f -n __fish_adb_no_subcommand -c adb -a ppp -d 'Run PPP over USB'
+complete -f -n __fish_adb_no_subcommand -c adb -a sideload -d 'Sideloads the given package'
+complete -f -n __fish_adb_no_subcommand -c adb -a reconnect -d 'Kick current connection from host side and make it reconnect.'
 
 # install options
 complete -n '__fish_seen_subcommand_from install' -c adb -s l -d 'Forward-lock the app'
 complete -n '__fish_seen_subcommand_from install' -c adb -s r -d 'Reinstall the app keeping its data'
 complete -n '__fish_seen_subcommand_from install' -c adb -s s -d 'Install on SD card instead of internal storage'
-complete -n '__fish_seen_subcommand_from install' -c adb -l 'algo' -d 'Algorithm name'
-complete -n '__fish_seen_subcommand_from install' -c adb -l 'key' -d 'Hex-encoded key'
-complete -n '__fish_seen_subcommand_from install' -c adb -l 'iv' -d 'Hex-encoded iv'
+complete -n '__fish_seen_subcommand_from install' -c adb -l algo -d 'Algorithm name'
+complete -n '__fish_seen_subcommand_from install' -c adb -l key -d 'Hex-encoded key'
+complete -n '__fish_seen_subcommand_from install' -c adb -l iv -d 'Hex-encoded iv'
 
 # uninstall
 complete -n '__fish_seen_subcommand_from uninstall' -c adb -s k -d 'Keep the data and cache directories'
@@ -133,31 +133,31 @@ complete -n '__fish_seen_subcommand_from disconnect' -c adb -x -a "(__fish_adb_g
 
 # backup
 complete -n '__fish_seen_subcommand_from backup' -c adb -s f -d 'File to write backup data to'
-complete -n '__fish_seen_subcommand_from backup' -c adb -o 'apk' -d 'Enable backup of the .apks themselves'
-complete -n '__fish_seen_subcommand_from backup' -c adb -o 'noapk' -d 'Disable backup of the .apks themselves (default)'
-complete -n '__fish_seen_subcommand_from backup' -c adb -o 'obb' -d 'Enable backup of any installed apk expansion'
-complete -n '__fish_seen_subcommand_from backup' -c adb -o 'noobb' -d 'Disable backup of any installed apk expansion (default)'
-complete -n '__fish_seen_subcommand_from backup' -c adb -o 'shared' -d 'Enable backup of the device\'s shared storage / SD card contents'
-complete -n '__fish_seen_subcommand_from backup' -c adb -o 'noshared' -d 'Disable backup of the device\'s shared storage / SD card contents (default)'
-complete -n '__fish_seen_subcommand_from backup' -c adb -o 'all' -d 'Back up all installed applications'
-complete -n '__fish_seen_subcommand_from backup' -c adb -o 'system' -d 'Include system applications in -all (default)'
-complete -n '__fish_seen_subcommand_from backup' -c adb -o 'nosystem' -d 'Exclude system applications in -all'
+complete -n '__fish_seen_subcommand_from backup' -c adb -o apk -d 'Enable backup of the .apks themselves'
+complete -n '__fish_seen_subcommand_from backup' -c adb -o noapk -d 'Disable backup of the .apks themselves (default)'
+complete -n '__fish_seen_subcommand_from backup' -c adb -o obb -d 'Enable backup of any installed apk expansion'
+complete -n '__fish_seen_subcommand_from backup' -c adb -o noobb -d 'Disable backup of any installed apk expansion (default)'
+complete -n '__fish_seen_subcommand_from backup' -c adb -o shared -d 'Enable backup of the device\'s shared storage / SD card contents'
+complete -n '__fish_seen_subcommand_from backup' -c adb -o noshared -d 'Disable backup of the device\'s shared storage / SD card contents (default)'
+complete -n '__fish_seen_subcommand_from backup' -c adb -o all -d 'Back up all installed applications'
+complete -n '__fish_seen_subcommand_from backup' -c adb -o system -d 'Include system applications in -all (default)'
+complete -n '__fish_seen_subcommand_from backup' -c adb -o nosystem -d 'Exclude system applications in -all'
 complete -n '__fish_seen_subcommand_from backup' -c adb -f -a "(__fish_adb_list_packages)" -d 'Package(s) to backup'
 
 # reboot
 complete -n '__fish_seen_subcommand_from reboot' -c adb -x -a 'bootloader recovery'
 
 # forward
-complete -n '__fish_seen_subcommand_from forward' -c adb -l 'list' -d 'List all forward socket connections'
-complete -n '__fish_seen_subcommand_from forward' -c adb -l 'no-rebind' -d 'Fails the forward if local is already forwarded'
-complete -n '__fish_seen_subcommand_from forward' -c adb -l 'remove' -d 'Remove a specific forward socket connection'
-complete -n '__fish_seen_subcommand_from forward' -c adb -l 'remove-all' -d 'Remove all forward socket connections'
+complete -n '__fish_seen_subcommand_from forward' -c adb -l list -d 'List all forward socket connections'
+complete -n '__fish_seen_subcommand_from forward' -c adb -l no-rebind -d 'Fails the forward if local is already forwarded'
+complete -n '__fish_seen_subcommand_from forward' -c adb -l remove -d 'Remove a specific forward socket connection'
+complete -n '__fish_seen_subcommand_from forward' -c adb -l remove-all -d 'Remove all forward socket connections'
 
 # sideload
 complete -n '__fish_seen_subcommand_from sideload' -c adb -xa '(__fish_complete_suffix .zip)'
 
 # reconnect
-complete -n '__fish_seen_subcommand_from reconnect' -c adb -x -a 'device' -d 'Kick current connection from device side and make it reconnect.'
+complete -n '__fish_seen_subcommand_from reconnect' -c adb -x -a device -d 'Kick current connection from device side and make it reconnect.'
 
 # commands that accept listing device files
 complete -n '__fish_seen_subcommand_from shell' -c adb -f -a "(__fish_adb_list_files)" -d 'File on device'
diff --git a/share/completions/alsactl.fish b/share/completions/alsactl.fish
index c3b2d9cf7..ff4debe76 100644
--- a/share/completions/alsactl.fish
+++ b/share/completions/alsactl.fish
@@ -1,17 +1,17 @@
 set -l commands store restore nrestore init daemon rdaemon kill monitor
 
-complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a "store" -d "Save current driver state" -f
-complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a "restore" -d "Load driver state" -f
-complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a "nrestore" -d "Restore and rescan for available soundcards" -f
+complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a store -d "Save current driver state" -f
+complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a restore -d "Load driver state" -f
+complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a nrestore -d "Restore and rescan for available soundcards" -f
 complete -c alsactl -s F -l force -n "__fish_seen_subcommand_from restore nrestore" -d 'Try to restore control elements as much as possible' -f
 complete -c alsactl -s g -l ignore -n "__fish_seen_subcommand_from store restore nrestore" -d 'Ignore missing soundcards' -f
 complete -c alsactl -s P -l pedantic -n "__fish_seen_subcommand_from restore nrestore" -d 'Do not restore mismatching control elements' -f
 complete -c alsactl -s I -l no-init-fallback -n "__fish_seen_subcommand_from restore nrestore" -d 'Do not init if restore fails' -f
-complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a "init" -d "Initialize all devices to a default state" -f
-complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a "daemon" -d "Periodically save state" -f
-complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a "rdaemon" -d "Restore state and then periodically save it" -f
-complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a "kill" -d "Notify daemon to do an operation" -f
-complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a "monitor" -d "Monitor events" -f
+complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a init -d "Initialize all devices to a default state" -f
+complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a daemon -d "Periodically save state" -f
+complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a rdaemon -d "Restore state and then periodically save it" -f
+complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a kill -d "Notify daemon to do an operation" -f
+complete -c alsactl -n "not __fish_seen_subcommand_from $commands" -a monitor -d "Monitor events" -f
 
 complete -c alsactl -s h -l help -d 'Show available flags and commands' -f
 complete -c alsactl -s d -l debug -d 'Make output a bit more verbose' -f
diff --git a/share/completions/ansible-vault.fish b/share/completions/ansible-vault.fish
index 6a50495c2..c0a642132 100644
--- a/share/completions/ansible-vault.fish
+++ b/share/completions/ansible-vault.fish
@@ -22,13 +22,13 @@ complete -c ansible-vault -l vault-id -r -d "the vault identity to use"
 complete -c ansible-vault -l vault-password-file -r -d "Vault password file"
 
 # subcommands
-complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -a decrypt -d 'Decrypt encrypted file or stdin'
-complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -a encrypt -d 'Encrypt a file or stdin'
-complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -ra create -d 'Create encrypted file'
-complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -ra edit -d 'Edit encrypted file'
-complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -ra rekey -d 'Rekey encrypted file'
-complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -ra view -d 'View contents of something encrypted'
-complete -f -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -a encrypt_string -d 'Encrypt string'
+complete -c ansible-vault -n __fish_ansible_vault_no_subcommand -a decrypt -d 'Decrypt encrypted file or stdin'
+complete -c ansible-vault -n __fish_ansible_vault_no_subcommand -a encrypt -d 'Encrypt a file or stdin'
+complete -c ansible-vault -n __fish_ansible_vault_no_subcommand -ra create -d 'Create encrypted file'
+complete -c ansible-vault -n __fish_ansible_vault_no_subcommand -ra edit -d 'Edit encrypted file'
+complete -c ansible-vault -n __fish_ansible_vault_no_subcommand -ra rekey -d 'Rekey encrypted file'
+complete -c ansible-vault -n __fish_ansible_vault_no_subcommand -ra view -d 'View contents of something encrypted'
+complete -f -c ansible-vault -n __fish_ansible_vault_no_subcommand -a encrypt_string -d 'Encrypt string'
 
 # encrypt_string options
 complete -c ansible-vault -n '__fish_ansible_vault_using_command encrypt encrypt_string' -r -l stdin-name -f -d 'Specify the variable name for stdin'
diff --git a/share/completions/apm.fish b/share/completions/apm.fish
index da226eead..10b7fee6c 100644
--- a/share/completions/apm.fish
+++ b/share/completions/apm.fish
@@ -7,7 +7,7 @@ function __fish_apm_needs_command
         for c in $cmd[2..-1]
             switch $c
                 # Exclude options that are allowed to appear before command
-                case '--color' '--no-color' 'help'
+                case --color --no-color help
                     continue
                 case '*'
                     return 1
@@ -77,28 +77,28 @@ if apm -h 2>| string match -q "*Atom Package Manager*"
     ##################
 
     # help
-    complete -f -c apm -n '__fish_apm_needs_command' -s h -l help -d "Display help"
-    complete -f -c apm -n '__fish_apm_needs_command' -a help -d "Display help"
+    complete -f -c apm -n __fish_apm_needs_command -s h -l help -d "Display help"
+    complete -f -c apm -n __fish_apm_needs_command -a help -d "Display help"
     complete -f -c apm -n '__fish_apm_using_command clean config dedupe deinstall delete dev develop docs erase featured home init install link linked links list ln lns login ls open outdated publish rebuild rebuild-module-cache remove rm search show star starred stars test uninstall unlink unpublish unstar update upgrade view' -s h -l help -d 'Display help'
 
     # version
-    complete -f -c apm -n '__fish_apm_needs_command' -s v -l version -d "Display version"
+    complete -f -c apm -n __fish_apm_needs_command -s v -l version -d "Display version"
 
     # color
-    complete -f -c apm -n '__fish_apm_needs_command' -l color -d "Enable colored output"
-    complete -f -c apm -n '__fish_apm_needs_command' -l no-color -d "Disable colored output"
+    complete -f -c apm -n __fish_apm_needs_command -l color -d "Enable colored output"
+    complete -f -c apm -n __fish_apm_needs_command -l no-color -d "Disable colored output"
 
     ############
     # commands #
     ############
 
     # clean
-    complete -f -c apm -n '__fish_apm_needs_command' -a clean -d "Deletes packages in node_modules not referenced
+    complete -f -c apm -n __fish_apm_needs_command -a clean -d "Deletes packages in node_modules not referenced
 as dependency in package.json"
 
     # config
     set -l config_subcommands "get set edit delete list"
-    complete -f -c apm -n '__fish_apm_needs_command' -a config -d "Modify or list configuration items"
+    complete -f -c apm -n __fish_apm_needs_command -a config -d "Modify or list configuration items"
     complete -x -c apm -n "__fish_apm_using_command config; and not __fish_apm_includes_subcommand $config_subcommands" -a set -d 'Set config item'
     complete -x -c apm -n "__fish_apm_using_command config; and not __fish_apm_includes_subcommand $config_subcommands" -a get -d 'Get config item'
     complete -x -c apm -n "__fish_apm_using_command config; and not __fish_apm_includes_subcommand $config_subcommands" -a delete -d 'Delete config item'
@@ -107,35 +107,35 @@ as dependency in package.json"
     complete -x -c apm -n '__fish_apm_using_command config set get delete; and __fish_apm_includes_subcommand set get delete' -a '(__fish_apm_config_items)'
 
     # dedupe
-    complete -f -c apm -n '__fish_apm_needs_command' -a dedupe -d "Reduce duplication in node_modules in current directory"
+    complete -f -c apm -n __fish_apm_needs_command -a dedupe -d "Reduce duplication in node_modules in current directory"
 
     # deinstall & delete & erase & remove & rm & uninstall
     set -l uninstall_commands "deinstall delete erase remove rm uninstall"
-    complete -f -c apm -n '__fish_apm_needs_command' -a $uninstall_commands -d "Delete installed package(s) from ~/.atom/packages"
+    complete -f -c apm -n __fish_apm_needs_command -a $uninstall_commands -d "Delete installed package(s) from ~/.atom/packages"
     complete -f -c apm -n "__fish_apm_using_command $uninstall_commands" -a '(__fish_apm_list_packages)'
     complete -f -c apm -n "__fish_apm_using_command $uninstall_commands" -l hard -d "Unlink package from ~/.atom/packages and ~/.atom/dev/packages"
     complete -f -c apm -n "__fish_apm_using_command $uninstall_commands" -s d -l dev -d "Unlink package from ~/.atom/dev/packages"
 
     # dev(elop)
     set -l dev_commands "dev develop"
-    complete -f -c apm -n '__fish_apm_needs_command' -a $dev_commands -d "Clone install dependencies and link a package for development"
+    complete -f -c apm -n __fish_apm_needs_command -a $dev_commands -d "Clone install dependencies and link a package for development"
     complete -f -c apm -n "__fish_apm_using_command $dev_commands" -a '(__fish_apm_list_packages)'
 
     # docs & home & open
     set -l open_commands "docs home open"
-    complete -f -c apm -n '__fish_apm_needs_command' -a $open_commands -d "Open a package's homepage in the default browser"
+    complete -f -c apm -n __fish_apm_needs_command -a $open_commands -d "Open a package's homepage in the default browser"
     complete -f -c apm -n "__fish_apm_using_command $open_commands" -s p -l print -d "Print URL instead of opening"
     complete -f -c apm -n "__fish_apm_using_command $open_commands" -a '(__fish_apm_list_packages)'
 
     # featured
-    complete -f -c apm -n '__fish_apm_needs_command' -a featured -d "List Atom packages and themes currently featured in the
+    complete -f -c apm -n __fish_apm_needs_command -a featured -d "List Atom packages and themes currently featured in the
 atom.io registry"
     complete -f -c apm -n '__fish_apm_using_command featured' -l json -d "Output featured packages as JSON array"
     complete -f -c apm -n '__fish_apm_using_command featured' -s t -l themes -d "Only list themes"
     complete -x -c apm -n '__fish_apm_using_command featured' -s c -l compatible -d "Only list packages/themes compatible with specified Atom version"
 
     # init
-    complete -f -c apm -n '__fish_apm_needs_command' -a init -d "Generates code scaffolding for theme or package"
+    complete -f -c apm -n __fish_apm_needs_command -a init -d "Generates code scaffolding for theme or package"
     complete -r -c apm -n '__fish_apm_using_command init' -l template -d "Path to the package or theme template"
     complete -x -c apm -n '__fish_apm_using_command init' -s p -l package -d "Generates a basic package"
     complete -x -c apm -n '__fish_apm_using_command init' -s t -l theme -d "Generates a basic theme"
@@ -143,7 +143,7 @@ atom.io registry"
     complete -r -c apm -n '__fish_apm_using_command init' -s c -l convert -d "Convert TextMate bundle/theme"
 
     # install
-    complete -f -c apm -n '__fish_apm_needs_command' -a install -d "Install Atom package to ~/.atom/packages/<package_name>"
+    complete -f -c apm -n __fish_apm_needs_command -a install -d "Install Atom package to ~/.atom/packages/<package_name>"
     complete -f -c apm -n '__fish_apm_using_command install' -l check -d "Check native build tools are installed"
     complete -f -c apm -n '__fish_apm_using_command install' -l verbose -d "Show verbose debug information"
     complete -r -c apm -n '__fish_apm_using_command install' -l packages-file -d "Specify text file containing packages to install"
@@ -154,17 +154,17 @@ atom.io registry"
 
     # link & ln
     set -l link_commands "link ln"
-    complete -f -c apm -n '__fish_apm_needs_command' -a $link_commands -d "Create a symlink for the package in ~/.atom/packages"
+    complete -f -c apm -n __fish_apm_needs_command -a $link_commands -d "Create a symlink for the package in ~/.atom/packages"
     complete -f -c apm -n "__fish_apm_using_command $link_commands" -s d -l dev -d "Link to ~/.atom/dev/packages"
 
     # linked & links & lns
     set -l linked_commands "linked links lns"
-    complete -f -c apm -n '__fish_apm_needs_command' -a $linked_commands -d "List all symlinked packages in ~/.atom/packages and
+    complete -f -c apm -n __fish_apm_needs_command -a $linked_commands -d "List all symlinked packages in ~/.atom/packages and
 ~/.atom/dev/packages"
 
     # list & ls
     set -l list_commands "list ls"
-    complete -f -c apm -n '__fish_apm_needs_command' -a $list_commands -d "List all installed and bundled packages"
+    complete -f -c apm -n __fish_apm_needs_command -a $list_commands -d "List all installed and bundled packages"
     complete -f -c apm -n "__fish_apm_using_command $list_commands" -s b -l bare -d "Print packages one per line with no formatting"
     complete -f -c apm -n "__fish_apm_using_command $list_commands" -s d -l dev -d "Include dev packages"
     complete -f -c apm -n "__fish_apm_using_command $list_commands" -s i -l installed -d "Only list installed packages/themes"
@@ -174,12 +174,12 @@ atom.io registry"
     complete -f -c apm -n "__fish_apm_using_command $list_commands" -s p -l packages -d "Only list packages"
 
     # login
-    complete -f -c apm -n '__fish_apm_needs_command' -a login -d "Save Atom API token to keychain"
+    complete -f -c apm -n __fish_apm_needs_command -a login -d "Save Atom API token to keychain"
     complete -x -c apm -n "__fish_apm_using_command login" -l token -d "Specify API token"
 
     # outdated & upgrade & update
     set -l upgrade_commands "outdated upgrade update"
-    complete -f -c apm -n '__fish_apm_needs_command' -a $upgrade_commands -d "Upgrade out of date packages"
+    complete -f -c apm -n __fish_apm_needs_command -a $upgrade_commands -d "Upgrade out of date packages"
     complete -f -c apm -n "__fish_apm_using_command $upgrade_commands" -l json -d "Output outdated packages as JSON array"
     complete -x -c apm -n "__fish_apm_using_command $upgrade_commands" -l compatible -d "Only install packages/themes compatible with specified Atom version"
     complete -f -c apm -n "__fish_apm_using_command $upgrade_commands" -l verbose -d "Show verbose debug information"
@@ -188,57 +188,57 @@ atom.io registry"
 
     # publish
     set -l publish_subcommands "major minor patch build"
-    complete -f -c apm -n '__fish_apm_needs_command' -a publish -d "Publish new version of package in current working directory"
+    complete -f -c apm -n __fish_apm_needs_command -a publish -d "Publish new version of package in current working directory"
     complete -f -c apm -n "__fish_apm_using_command publish; and not __fish_apm_includes_subcommand $publish_subcommands" -a $publish_subcommands -d "Semantic version category for new version"
     complete -x -c apm -n '__fish_apm_using_command publish' -s t -l tag -d "Specify a tag to publish"
     complete -x -c apm -n '__fish_apm_using_command publish' -s r -l rename -d "Specify a new name for the package"
 
     # rebuild
-    complete -f -c apm -n '__fish_apm_needs_command' -a rebuild -d "Rebuild modules installed in node_modules in current working directory"
+    complete -f -c apm -n __fish_apm_needs_command -a rebuild -d "Rebuild modules installed in node_modules in current working directory"
 
     # rebuild-module-cache
-    complete -f -c apm -n '__fish_apm_needs_command' -a rebuild-module-cache -d "Rebuild module cache for installed packages"
+    complete -f -c apm -n __fish_apm_needs_command -a rebuild-module-cache -d "Rebuild module cache for installed packages"
 
     # search
-    complete -f -c apm -n '__fish_apm_needs_command' -a search -d "Search for Atom packages/themes in the atom.io registry"
+    complete -f -c apm -n __fish_apm_needs_command -a search -d "Search for Atom packages/themes in the atom.io registry"
     complete -f -c apm -n '__fish_apm_using_command search' -l json -d "Output matching packages as JSON array"
     complete -f -c apm -n '__fish_apm_using_command search' -s p -l packages -d "Search only non-theme packages"
     complete -f -c apm -n '__fish_apm_using_command search' -s t -l themes -d "Search only themes"
 
     # show & view
     set -l show_commands "show view"
-    complete -f -c apm -n '__fish_apm_needs_command' -a $show_commands -d "View information about package/theme in the atom.io registry"
+    complete -f -c apm -n __fish_apm_needs_command -a $show_commands -d "View information about package/theme in the atom.io registry"
     complete -f -c apm -n "__fish_apm_using_command $show_commands" -l json -d "Output as JSON array"
     complete -x -c apm -n "__fish_apm_using_command $show_commands" -l compatible -d "Show latest version compatible with specified Atom version"
 
     # star
-    complete -f -c apm -n '__fish_apm_needs_command' -a star -d "Star the given packages on https://atom.io"
+    complete -f -c apm -n __fish_apm_needs_command -a star -d "Star the given packages on https://atom.io"
     complete -f -c apm -n '__fish_apm_using_command star' -l installed -d "Star all packages in ~/.atom/packages"
 
     # starred & stars
     set -l stars_commands "starred stars"
-    complete -f -c apm -n '__fish_apm_needs_command' -a $stars_commands -d "List or install starred Atom packages and themes"
+    complete -f -c apm -n __fish_apm_needs_command -a $stars_commands -d "List or install starred Atom packages and themes"
     complete -f -c apm -n "__fish_apm_using_command $stars_commands" -l json -d "Output packages as JSON array"
     complete -f -c apm -n "__fish_apm_using_command $stars_commands" -s i -l install -d "Install the starred packages"
     complete -f -c apm -n "__fish_apm_using_command $stars_commands" -s t -l themes -d "Only list themes"
     complete -x -c apm -n "__fish_apm_using_command $stars_commands" -s u -l user -d "GitHub username to show starred packages for"
 
     # test
-    complete -f -c apm -n '__fish_apm_needs_command' -a test -d "Runs the package's tests contained within the spec directory"
+    complete -f -c apm -n __fish_apm_needs_command -a test -d "Runs the package's tests contained within the spec directory"
     complete -r -c apm -n '__fish_apm_using_command test' -s p -l path -d "Path to atom command"
 
     # unlink
-    complete -f -c apm -n '__fish_apm_needs_command' -a unlink -d "Delete the symlink in ~/.atom/packages for the package"
+    complete -f -c apm -n __fish_apm_needs_command -a unlink -d "Delete the symlink in ~/.atom/packages for the package"
     complete -f -c apm -n '__fish_apm_using_command unlink' -l hard -d "Unlink package from ~/.atom/packages and ~/.atom/dev/packages"
     complete -f -c apm -n '__fish_apm_using_command unlink' -s d -l dev -d "Unlink package from ~/.atom/dev/packages"
     complete -f -c apm -n '__fish_apm_using_command unlink' -s a -l all -d "Unlink all packages in ~/.atom/packages and ~/.atom/dev/packages"
 
     # unpublish
-    complete -f -c apm -n '__fish_apm_needs_command' -a unpublish -d "Remove published package or version from the atom.io registry"
+    complete -f -c apm -n __fish_apm_needs_command -a unpublish -d "Remove published package or version from the atom.io registry"
     complete -f -c apm -n '__fish_apm_using_command unpublish' -s f -l force -d "Do not prompt for confirmation"
 
     # unstar
-    complete -f -c apm -n '__fish_apm_needs_command' -a unstar -d "Unstar given packages on https://atom.io"
+    complete -f -c apm -n __fish_apm_needs_command -a unstar -d "Unstar given packages on https://atom.io"
 
 else
     # Completions for the Advanced Power Management client
diff --git a/share/completions/apt-cache.fish b/share/completions/apt-cache.fish
index 4070a343b..c9cd162b3 100644
--- a/share/completions/apt-cache.fish
+++ b/share/completions/apt-cache.fish
@@ -38,5 +38,5 @@ function __fish_apt-cache_use_package -d 'Test if apt command should have packag
     return 1
 end
 
-complete -c apt-cache -n '__fish_apt-cache_use_package' -a '(__fish_print_packages)' -d 'Package'
+complete -c apt-cache -n __fish_apt-cache_use_package -a '(__fish_print_packages)' -d Package
 
diff --git a/share/completions/apt-get.fish b/share/completions/apt-get.fish
index f691ce87f..04e057894 100644
--- a/share/completions/apt-get.fish
+++ b/share/completions/apt-get.fish
@@ -18,23 +18,23 @@ function __fish_apt_use_package -d 'Test if apt command should have packages as
     return 1
 end
 
-complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
+complete -c apt-get -n __fish_apt_use_package -a '(__fish_print_packages)' -d Package
 
 complete -c apt-get -s h -l help -d 'Display help and exit'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'update' -d 'Update sources'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'upgrade' -d 'Upgrade or install newest packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dselect-upgrade' -d 'Use with dselect front-end'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dist-upgrade' -d 'Distro upgrade'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'install' -d 'Install one or more packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'changelog' -d 'Display changelog of one or more packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'purge' -d 'Remove and purge one or more packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'remove' -d 'Remove one or more packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'source' -d 'Fetch source packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'build-dep' -d 'Install/remove packages for dependencies'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'check' -d 'Update cache and check dependencies'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'clean' -d 'Clean local caches and packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'autoclean' -d 'Clean packages no longer be downloaded'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'autoremove' -d 'Remove automatically installed packages'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a update -d 'Update sources'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a upgrade -d 'Upgrade or install newest packages'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a dselect-upgrade -d 'Use with dselect front-end'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a dist-upgrade -d 'Distro upgrade'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a install -d 'Install one or more packages'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a changelog -d 'Display changelog of one or more packages'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a purge -d 'Remove and purge one or more packages'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a remove -d 'Remove one or more packages'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a source -d 'Fetch source packages'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a build-dep -d 'Install/remove packages for dependencies'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a check -d 'Update cache and check dependencies'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a clean -d 'Clean local caches and packages'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a autoclean -d 'Clean packages no longer be downloaded'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a autoremove -d 'Remove automatically installed packages'
 complete -c apt-get -l no-install-recommends -d 'Do not install recommended packages'
 complete -c apt-get -s d -l download-only -d 'Download Only'
 complete -c apt-get -s f -l fix-broken -d 'Correct broken dependencies'
diff --git a/share/completions/apt-listbugs.fish b/share/completions/apt-listbugs.fish
index 87e8802c0..737fc7e82 100644
--- a/share/completions/apt-listbugs.fish
+++ b/share/completions/apt-listbugs.fish
@@ -15,7 +15,7 @@ complete -f -c apt-listbugs -s P -l pin-priority -d "Specify Pin-Priority value"
 complete -f -c apt-listbugs -l title -d "Specify the title of rss"
 complete -f -c apt-listbugs -s f -l force-download -d "Retrieve fresh bugs"
 complete -f -c apt-listbugs -s q -l quiet -d "Do not display progress bar"
-complete -f -c apt-listbugs -s c -l cache-dir -a "/var/cache/apt-listbugs/" -d "Specify local cache dir"
+complete -f -c apt-listbugs -s c -l cache-dir -a /var/cache/apt-listbugs/ -d "Specify local cache dir"
 complete -f -c apt-listbugs -s t -l timer -d "Specify the expire cache timer"
 complete -c apt-listbugs -s C -l aptconf -d "Specify apt config file"
 complete -f -c apt-listbugs -s y -l force-yes -d "Assume yes to all questions"
diff --git a/share/completions/apt-mark.fish b/share/completions/apt-mark.fish
index c118609b8..942b3f5a2 100644
--- a/share/completions/apt-mark.fish
+++ b/share/completions/apt-mark.fish
@@ -18,16 +18,16 @@ function __fish_apt_use_package -d 'Test if apt command should have packages as
     return 1
 end
 
-complete -c apt-mark -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
+complete -c apt-mark -n __fish_apt_use_package -a '(__fish_print_packages)' -d Package
 
 complete -c apt-mark -s h -l help -d 'Display help and exit'
-complete -f -n '__fish_apt_no_subcommand' -c apt-mark -a 'auto' -d 'Mark a package as automatically installed'
-complete -f -n '__fish_apt_no_subcommand' -c apt-mark -a 'manual' -d 'Mark a package as manually installed'
-complete -f -n '__fish_apt_no_subcommand' -c apt-mark -a 'hold' -d 'Hold a package, prevent automatic installation or removal'
-complete -f -n '__fish_apt_no_subcommand' -c apt-mark -a 'unhold' -d 'Cancel a hold on a package'
-complete -f -n '__fish_apt_no_subcommand' -c apt-mark -a 'showauto' -d 'Show automatically installed packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-mark -a 'showmanual' -d 'Show manually installed packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-mark -a 'showhold' -d 'Show held packages'
+complete -f -n __fish_apt_no_subcommand -c apt-mark -a auto -d 'Mark a package as automatically installed'
+complete -f -n __fish_apt_no_subcommand -c apt-mark -a manual -d 'Mark a package as manually installed'
+complete -f -n __fish_apt_no_subcommand -c apt-mark -a hold -d 'Hold a package, prevent automatic installation or removal'
+complete -f -n __fish_apt_no_subcommand -c apt-mark -a unhold -d 'Cancel a hold on a package'
+complete -f -n __fish_apt_no_subcommand -c apt-mark -a showauto -d 'Show automatically installed packages'
+complete -f -n __fish_apt_no_subcommand -c apt-mark -a showmanual -d 'Show manually installed packages'
+complete -f -n __fish_apt_no_subcommand -c apt-mark -a showhold -d 'Show held packages'
 complete -c apt-mark -s v -l version -d 'Display version and exit'
 complete -r -c apt-mark -s c -l config-file -d 'Specify a config file'
 complete -r -c apt-mark -s o -l option -d 'Set a config option'
diff --git a/share/completions/apt-spy.fish b/share/completions/apt-spy.fish
index 16ff915c6..e7c292e3b 100644
--- a/share/completions/apt-spy.fish
+++ b/share/completions/apt-spy.fish
@@ -14,7 +14,7 @@ complete -f -c apt-spy -s t -d "How long in sec to download"
 complete -f -c apt-spy -s u -d "Custom URL to get mirror list"
 complete -c apt-spy -s w -d "Write top servers to file"
 complete -f -c apt-spy -s n -d "Number of top servers"
-complete -f -c apt-spy -a "update" -d "Update mirror list"
+complete -f -c apt-spy -a update -d "Update mirror list"
 complete -f -c apt-spy -s v -d "Version number"
 
 
diff --git a/share/completions/apt-src.fish b/share/completions/apt-src.fish
index 3b8365d53..56c9921b9 100644
--- a/share/completions/apt-src.fish
+++ b/share/completions/apt-src.fish
@@ -1,16 +1,16 @@
 #apt-src
 complete -c apt-src -s h -l help -d "Display help and exit"
-complete -f -c apt-src -a "update" -d "Update list of source packages"
-complete -f -c apt-src -a "install" -d "Install source packages"
-complete -f -c apt-src -a "upgrade" -d "Upgrade source packages"
-complete -f -c apt-src -a "remove" -d "Remove source packages"
-complete -f -c apt-src -a "build" -d "Build source packages"
-complete -f -c apt-src -a "clean" -d "Clean source packages"
-complete -f -c apt-src -a "import" -d "Detect known source tree"
-complete -f -c apt-src -a "list" -d "List installed source package\(s\)"
-complete -f -c apt-src -a "location" -d "Root source tree"
-complete -f -c apt-src -a "version" -d "Version of source package"
-complete -f -c apt-src -a "name" -d "Name of the source package"
+complete -f -c apt-src -a update -d "Update list of source packages"
+complete -f -c apt-src -a install -d "Install source packages"
+complete -f -c apt-src -a upgrade -d "Upgrade source packages"
+complete -f -c apt-src -a remove -d "Remove source packages"
+complete -f -c apt-src -a build -d "Build source packages"
+complete -f -c apt-src -a clean -d "Clean source packages"
+complete -f -c apt-src -a import -d "Detect known source tree"
+complete -f -c apt-src -a list -d "List installed source package\(s\)"
+complete -f -c apt-src -a location -d "Root source tree"
+complete -f -c apt-src -a version -d "Version of source package"
+complete -f -c apt-src -a name -d "Name of the source package"
 complete -f -c apt-src -s b -l build -d "Build source packages"
 complete -f -c apt-src -s i -l installdebs -d "Install after build"
 complete -f -c apt-src -s p -l patch -d "Patch local changes"
diff --git a/share/completions/apt.fish b/share/completions/apt.fish
index fd6a1ce2c..919eb0a6e 100644
--- a/share/completions/apt.fish
+++ b/share/completions/apt.fish
@@ -20,7 +20,7 @@ end
 complete -c apt -f
 
 complete -k -c apt -n "__fish_seen_subcommand_from $pkg_subcmds" -a '(__fish_print_packages | head -n 250 | sort)'
-complete -c apt -n "__fish_seen_subcommand_from $installed_pkg_subcmds" -a '(__fish_print_packages --installed | string match -re -- "(?:\\b|_)"(commandline -ct | string escape --style=regex) | head -n 250)' -d 'Package'
+complete -c apt -n "__fish_seen_subcommand_from $installed_pkg_subcmds" -a '(__fish_print_packages --installed | string match -re -- "(?:\\b|_)"(commandline -ct | string escape --style=regex) | head -n 250)' -d Package
 complete -k -c apt -n "__fish_seen_subcommand_from $handle_file_pkg_subcmds" -a '(__fish_complete_suffix .deb)'
 
 # Support flags
diff --git a/share/completions/aptitude.fish b/share/completions/aptitude.fish
index 089ffdd23..a40ce153d 100644
--- a/share/completions/aptitude.fish
+++ b/share/completions/aptitude.fish
@@ -18,31 +18,31 @@ function __fish_apt_use_package -d 'Test if aptitude command should have package
     return 1
 end
 
-complete -c aptitude -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
+complete -c aptitude -n __fish_apt_use_package -a '(__fish_print_packages)' -d Package
 
 complete -c aptitude -s h -l help -d 'Display a brief help message. Identical to the help action'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'autoclean' -d 'Remove any cached packages which can no longer be downloaded'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'clean' -d 'Remove all downloaded .deb files from the package cache directory'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forget-new' -d 'Forget all internal information about what packages are \'new\''
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep-all' -d 'Cancel all scheduled actions on all packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'update' -d 'Update the list of available packages from the apt sources'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'safe-upgrade' -d 'Upgrade installed packages to their most recent version'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'changelog' -d 'Download and displays the Debian changelog for the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'full-upgrade' -d 'Upgrade, removing or installing packages as necessary'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'download' -d 'Download the packages to the current directory'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forbid-version' -d 'Forbid the upgrade to a particular version'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'hold' -d 'Ignore the packages by future upgrade commands'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'install' -d 'Install the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep' -d 'Cancel any scheduled actions on the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'markauto' -d 'Mark packages as automatically installed'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'purge' -d 'Remove and delete all associated configuration and data files'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'reinstall' -d 'Reinstall the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'remove' -d 'Remove the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'show' -d 'Display detailed information about the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'unhold' -d 'Consider the packages by future upgrade commands'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'unmarkauto' -d 'Mark packages as manually installed'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'search' -d 'Search for packages matching one of the patterns'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'help' -d 'Display brief summary of the available commands and options'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a autoclean -d 'Remove any cached packages which can no longer be downloaded'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a clean -d 'Remove all downloaded .deb files from the package cache directory'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a forget-new -d 'Forget all internal information about what packages are \'new\''
+complete -f -n __fish_apt_no_subcommand -c aptitude -a keep-all -d 'Cancel all scheduled actions on all packages'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a update -d 'Update the list of available packages from the apt sources'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a safe-upgrade -d 'Upgrade installed packages to their most recent version'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a changelog -d 'Download and displays the Debian changelog for the packages'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a full-upgrade -d 'Upgrade, removing or installing packages as necessary'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a download -d 'Download the packages to the current directory'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a forbid-version -d 'Forbid the upgrade to a particular version'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a hold -d 'Ignore the packages by future upgrade commands'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a install -d 'Install the packages'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a keep -d 'Cancel any scheduled actions on the packages'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a markauto -d 'Mark packages as automatically installed'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a purge -d 'Remove and delete all associated configuration and data files'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a reinstall -d 'Reinstall the packages'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a remove -d 'Remove the packages'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a show -d 'Display detailed information about the packages'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a unhold -d 'Consider the packages by future upgrade commands'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a unmarkauto -d 'Mark packages as manually installed'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a search -d 'Search for packages matching one of the patterns'
+complete -f -n __fish_apt_no_subcommand -c aptitude -a help -d 'Display brief summary of the available commands and options'
 
 complete -c aptitude -s D -l show-deps -d 'Show explanations of automatic installations and removals'
 complete -c aptitude -s d -l download-only -d 'Download Only'
diff --git a/share/completions/arc.fish b/share/completions/arc.fish
index 13757afa0..d230ccc25 100644
--- a/share/completions/arc.fish
+++ b/share/completions/arc.fish
@@ -10,7 +10,7 @@ function __fish_arc_needs_command
         for c in $cmd[2..-1]
             switch $c
                 # General options that can still take a command
-                case "--trace" "--no-ansi" "--ansi" "--load-phutil-library" "config" "skip-arcconfig" "arcrc-file" --conduit-{uri,token,version,timeout}
+                case --trace --no-ansi --ansi --load-phutil-library config skip-arcconfig arcrc-file --conduit-{uri,token,version,timeout}
                     continue
                 case "*"
                     echo $c
@@ -31,37 +31,37 @@ function __fish_arc_using_command
 end
 
 ### Global options
-complete -f -c arc -n '__fish_arc_needs_command' -l trace -d 'Debugging command'
-complete -f -c arc -n '__fish_arc_needs_command' -l no-ansi -d 'Don\'t use color or style for output'
-complete -f -c arc -n '__fish_arc_needs_command' -l ansi -d 'Always use fromatting'
-complete -f -c arc -n '__fish_arc_needs_command' -l no-ansi -d 'Don\'t use color or style for output'
-complete -f -c arc -n '__fish_arc_needs_command' -l load-phutil-library -d 'Specify which libraies to load'
-complete -f -c arc -n '__fish_arc_needs_command' -l conduit-uri -d 'Specify the Conduit URI'
-complete -f -c arc -n '__fish_arc_needs_command' -l conduit-token -d 'Specify the Conduit token'
-complete -f -c arc -n '__fish_arc_needs_command' -l conduit-version -d 'Force a version'
-complete -f -c arc -n '__fish_arc_needs_command' -l conduit-timeout -d 'Sets the timeout'
-complete -f -c arc -n '__fish_arc_needs_command' -l config -d 'Sets a config'
-complete -f -c arc -n '__fish_arc_needs_command' -l skip-arcconfig -d 'Skip the working copy configuration file'
-complete -c arc -n '__fish_arc_needs_command' -l arcrc-file -d 'Use provided file instead of ~/.arcrc'
+complete -f -c arc -n __fish_arc_needs_command -l trace -d 'Debugging command'
+complete -f -c arc -n __fish_arc_needs_command -l no-ansi -d 'Don\'t use color or style for output'
+complete -f -c arc -n __fish_arc_needs_command -l ansi -d 'Always use fromatting'
+complete -f -c arc -n __fish_arc_needs_command -l no-ansi -d 'Don\'t use color or style for output'
+complete -f -c arc -n __fish_arc_needs_command -l load-phutil-library -d 'Specify which libraies to load'
+complete -f -c arc -n __fish_arc_needs_command -l conduit-uri -d 'Specify the Conduit URI'
+complete -f -c arc -n __fish_arc_needs_command -l conduit-token -d 'Specify the Conduit token'
+complete -f -c arc -n __fish_arc_needs_command -l conduit-version -d 'Force a version'
+complete -f -c arc -n __fish_arc_needs_command -l conduit-timeout -d 'Sets the timeout'
+complete -f -c arc -n __fish_arc_needs_command -l config -d 'Sets a config'
+complete -f -c arc -n __fish_arc_needs_command -l skip-arcconfig -d 'Skip the working copy configuration file'
+complete -c arc -n __fish_arc_needs_command -l arcrc-file -d 'Use provided file instead of ~/.arcrc'
 
 ### shell-complete
-complete -f -c arc -n '__fish_arc_needs_command' -a shell-complete -d 'Implements shell completion'
+complete -f -c arc -n __fish_arc_needs_command -a shell-complete -d 'Implements shell completion'
 complete -f -c arc -n '__fish_arc_using_command shell-complete' -l current -d 'Current term in the argument list being completed'
 
 ### get-config
-complete -f -c arc -n '__fish_arc_needs_command' -a get-config -d 'Reads an arc configuration option'
+complete -f -c arc -n __fish_arc_needs_command -a get-config -d 'Reads an arc configuration option'
 complete -f -c arc -n '__fish_arc_using_command get-config' -l verbose -d 'Show detailed information about options'
 
 ### download
-complete -f -c arc -n '__fish_arc_needs_command' -a download -d 'Download a file to local disk'
+complete -f -c arc -n __fish_arc_needs_command -a download -d 'Download a file to local disk'
 complete -c arc -n '__fish_arc_using_command download' -l as -d 'Save the file with a specific name rather than the default'
 complete -f -c arc -n '__fish_arc_using_command download' -l show -d 'Write file to stdout instead of to disk'
 
 ### list
-complete -f -c arc -n '__fish_arc_needs_command' -a list -d 'List your open Differential revisions'
+complete -f -c arc -n __fish_arc_needs_command -a list -d 'List your open Differential revisions'
 
 ### lint
-complete -f -c arc -n '__fish_arc_needs_command' -a lint -d 'Run static analysis on changes to check for mistakes'
+complete -f -c arc -n __fish_arc_needs_command -a lint -d 'Run static analysis on changes to check for mistakes'
 complete -f -c arc -n '__fish_arc_using_command lint' -l engine -d 'Override configured lint engine for this project'
 complete -f -c arc -n '__fish_arc_using_command lint' -l apply-patches -d 'Apply patches suggested by lint to the working copy'
 complete -f -c arc -n '__fish_arc_using_command lint' -l severity -d 'Set minimum message severity'
@@ -77,14 +77,14 @@ complete -f -c arc -n '__fish_arc_using_command lint' -l only-changed -d 'Show l
 complete -f -c arc -n '__fish_arc_using_command lint' -l amend-autofixes -d 'When linting git repositories, amend HEAD with autofix'
 
 ### flag
-complete -f -c arc -n '__fish_arc_needs_command' -a flag -d 'In the first form, list objects you\'ve flagged'
+complete -f -c arc -n __fish_arc_needs_command -a flag -d 'In the first form, list objects you\'ve flagged'
 complete -f -c arc -n '__fish_arc_using_command flag' -l edit -d 'Edit the flag on an object'
 complete -f -c arc -n '__fish_arc_using_command flag' -l color -d 'Set the color of a flag'
 complete -f -c arc -n '__fish_arc_using_command flag' -l clear -d 'Delete the flag on an object'
 complete -f -c arc -n '__fish_arc_using_command flag' -l note -d 'Set the note on a flag'
 
 ### export
-complete -c arc -n '__fish_arc_needs_command' -a export -d 'Export the local changeset to a file'
+complete -c arc -n __fish_arc_needs_command -a export -d 'Export the local changeset to a file'
 complete -f -c arc -n '__fish_arc_using_command export' -l unified -d 'Export change as a unified patch'
 complete -f -c arc -n '__fish_arc_using_command export' -l git -d 'Export change as a git patch'
 complete -f -c arc -n '__fish_arc_using_command export' -l encoding -d 'Attempt to convert non UTF-8 patch into specified encoding'
@@ -93,45 +93,45 @@ complete -f -c arc -n '__fish_arc_using_command export' -l diff -d 'Export from
 complete -f -c arc -n '__fish_arc_using_command export' -l revision -d 'Export from a Differential revision'
 
 ### browse
-complete -c arc -n '__fish_arc_needs_command' -a browse -d 'Open a file or object in your web browser'
+complete -c arc -n __fish_arc_needs_command -a browse -d 'Open a file or object in your web browser'
 complete -f -c arc -n '__fish_arc_using_command browse' -l force -d 'Open arguments as paths, even if they do not exist in the working copy'
 complete -f -c arc -n '__fish_arc_using_command browse' -l branch -d 'Default branch name to view on server'
 
 ### todo
-complete -f -c arc -n '__fish_arc_needs_command' -a todo -d 'Quickly create a task for yourself'
+complete -f -c arc -n __fish_arc_needs_command -a todo -d 'Quickly create a task for yourself'
 complete -f -c arc -n '__fish_arc_using_command todo' -l cc -d 'Other users to CC on the new task'
 complete -f -c arc -n '__fish_arc_using_command todo' -l project -d 'Projects to assign to the task'
 complete -f -c arc -n '__fish_arc_using_command todo' -l browse -d 'After creating the task, open it in a web browser'
 
 ### linters
-complete -f -c arc -n '__fish_arc_needs_command' -a linters -d 'what they do and which versions are installed'
+complete -f -c arc -n __fish_arc_needs_command -a linters -d 'what they do and which versions are installed'
 complete -f -c arc -n '__fish_arc_using_command linters' -l search -d 'Search for linters'
 complete -f -c arc -n '__fish_arc_using_command linters' -l verbose -d 'Show detailed information, including options'
 
 ### time
-complete -f -c arc -n '__fish_arc_needs_command' -a time -d 'Show what you\'re currently tracking in Phrequent'
+complete -f -c arc -n __fish_arc_needs_command -a time -d 'Show what you\'re currently tracking in Phrequent'
 
 ### stop
-complete -f -c arc -n '__fish_arc_needs_command' -a stop -d 'Stop tracking work in Phrequent'
+complete -f -c arc -n __fish_arc_needs_command -a stop -d 'Stop tracking work in Phrequent'
 complete -f -c arc -n '__fish_arc_using_command stop' -l note -d 'A note to attach to the tracked time'
 
 ### alias
-complete -f -c arc -n '__fish_arc_needs_command' -a alias -d 'Create an alias'
+complete -f -c arc -n __fish_arc_needs_command -a alias -d 'Create an alias'
 
 ### set-config
-complete -f -c arc -n '__fish_arc_needs_command' -a set-config -d 'Sets an arc configuration option'
+complete -f -c arc -n __fish_arc_needs_command -a set-config -d 'Sets an arc configuration option'
 complete -f -c arc -n '__fish_arc_using_command set-config' -l local -d 'Set a local config value instead of a user one'
 
 ### start
-complete -f -c arc -n '__fish_arc_needs_command' -a start -d 'Start tracking work in Phrequent'
+complete -f -c arc -n __fish_arc_needs_command -a start -d 'Start tracking work in Phrequent'
 
 ### close
-complete -f -c arc -n '__fish_arc_needs_command' -a close -d 'Close a task or otherwise update its status'
+complete -f -c arc -n __fish_arc_needs_command -a close -d 'Close a task or otherwise update its status'
 complete -f -c arc -n '__fish_arc_using_command close' -l message -d 'Provide a comment with your status change'
 complete -f -c arc -n '__fish_arc_using_command close' -l list-statuses -d 'Show available status options and exit'
 
 ### land
-complete -f -c arc -n '__fish_arc_needs_command' -a land -d 'Publish an accepted revision after review'
+complete -f -c arc -n __fish_arc_needs_command -a land -d 'Publish an accepted revision after review'
 complete -f -c arc -n '__fish_arc_using_command land' -l preview -d 'Prints the commits that would be landed'
 complete -f -c arc -n '__fish_arc_using_command land' -l remote -d 'Push to a remote other than the default'
 complete -f -c arc -n '__fish_arc_using_command land' -l delete-remote -d 'Delete the feature branch in the remote after landing it'
@@ -145,40 +145,40 @@ complete -f -c arc -n '__fish_arc_using_command land' -l onto -d 'Land feature b
 complete -f -c arc -n '__fish_arc_using_command land' -l revision -d 'Use the message from a specific revision'
 
 ### which
-complete -f -c arc -n '__fish_arc_needs_command' -a which -d 'Show which commits will be selected'
+complete -f -c arc -n __fish_arc_needs_command -a which -d 'Show which commits will be selected'
 complete -f -c arc -n '__fish_arc_using_command which' -l show-base -d 'Print base commit only and exit'
 complete -f -c arc -n '__fish_arc_using_command which' -l base -d 'Additional rules for determining base revision'
 complete -f -c arc -n '__fish_arc_using_command which' -l head -d 'Specify the end of the commit range to select'
 complete -f -c arc -n '__fish_arc_using_command which' -l any-status -d 'Show committed and abandoned revisions'
 
 ### bookmark
-complete -f -c arc -n '__fish_arc_needs_command' -a bookmark -d 'Alias for arc feature'
+complete -f -c arc -n __fish_arc_needs_command -a bookmark -d 'Alias for arc feature'
 
 ### amend
-complete -f -c arc -n '__fish_arc_needs_command' -a amend -d 'Amend the working copy'
+complete -f -c arc -n __fish_arc_needs_command -a amend -d 'Amend the working copy'
 complete -f -c arc -n '__fish_arc_using_command amend' -l revision -d 'Use the message from a specific revision'
 complete -f -c arc -n '__fish_arc_using_command amend' -l show -d 'Show the amended commit message'
 
 ### upgrade
-complete -f -c arc -n '__fish_arc_needs_command' -a upgrade -d 'Upgrade arcanist and libphutil to the latest versions'
+complete -f -c arc -n __fish_arc_needs_command -a upgrade -d 'Upgrade arcanist and libphutil to the latest versions'
 
 ### help
-complete -f -c arc -n '__fish_arc_needs_command' -a help -d 'Shows the help'
+complete -f -c arc -n __fish_arc_needs_command -a help -d 'Shows the help'
 complete -f -c arc -n '__fish_arc_using_command help' -l full -d 'Print detailed information about each command'
 
 ### paste
-complete -f -c arc -n '__fish_arc_needs_command' -a paste -d 'Share and grab text using the Paste application'
+complete -f -c arc -n __fish_arc_needs_command -a paste -d 'Share and grab text using the Paste application'
 complete -f -c arc -n '__fish_arc_using_command paste' -l lang -d 'Language for syntax highlighting'
 complete -f -c arc -n '__fish_arc_using_command paste' -l json -d 'Output in JSON format'
 complete -f -c arc -n '__fish_arc_using_command paste' -l title -d 'Title for the paste'
 
 ### commit
-complete -f -c arc -n '__fish_arc_needs_command' -a commit -d 'Commit a revision which has been accepted by a reviewer'
+complete -f -c arc -n __fish_arc_needs_command -a commit -d 'Commit a revision which has been accepted by a reviewer'
 complete -f -c arc -n '__fish_arc_using_command commit' -l revision -d 'Commit a specific revision'
 complete -f -c arc -n '__fish_arc_using_command commit' -l show -d 'Show the command which would be issued'
 
 ### patch
-complete -f -c arc -n '__fish_arc_needs_command' -a patch -d 'Apply changes to the working copy'
+complete -f -c arc -n __fish_arc_needs_command -a patch -d 'Apply changes to the working copy'
 complete -f -c arc -n '__fish_arc_using_command patch' -l force -d 'Do not run any sanity checks'
 complete -f -c arc -n '__fish_arc_using_command patch' -l encoding -d 'Attempt to convert non UTF-8 patch into specified encoding'
 complete -f -c arc -n '__fish_arc_using_command patch' -l nocommit -d 'Do not commit the changes'
@@ -191,33 +191,33 @@ complete -f -c arc -n '__fish_arc_using_command patch' -l nobranch -d 'Do not cr
 complete -f -c arc -n '__fish_arc_using_command patch' -l revision -d 'Apply changes from a Differential revision'
 
 ### install-certificate
-complete -f -c arc -n '__fish_arc_needs_command' -a install-certificate -d 'Installs Conduit credentials into your ~/.arcc'
+complete -f -c arc -n __fish_arc_needs_command -a install-certificate -d 'Installs Conduit credentials into your ~/.arcc'
 
 ### revert
-complete -f -c arc -n '__fish_arc_needs_command' -a revert -d 'Please use backout instead'
+complete -f -c arc -n __fish_arc_needs_command -a revert -d 'Please use backout instead'
 
 ### upload
-complete -c arc -n '__fish_arc_needs_command' -a upload -d 'Upload a file from local disk'
+complete -c arc -n __fish_arc_needs_command -a upload -d 'Upload a file from local disk'
 complete -f -c arc -n '__fish_arc_using_command upload' -l json -d 'Output upload information in JSON format'
 complete -f -c arc -n '__fish_arc_using_command upload' -l temporary -d 'Mark the file as temporary'
 
 ### branch
-complete -f -c arc -n '__fish_arc_needs_command' -a branch -d 'Alias for arc feature'
+complete -f -c arc -n __fish_arc_needs_command -a branch -d 'Alias for arc feature'
 
 ### anoid
-complete -f -c arc -n '__fish_arc_needs_command' -a anoid -d 'There\'s only one way to find out'
+complete -f -c arc -n __fish_arc_needs_command -a anoid -d 'There\'s only one way to find out'
 
 ### cover
-complete -f -c arc -n '__fish_arc_needs_command' -a cover -d 'Show blame for the lines you changed'
+complete -f -c arc -n __fish_arc_needs_command -a cover -d 'Show blame for the lines you changed'
 complete -f -c arc -n '__fish_arc_using_command cover' -l rev -d 'Cover changes since a specific revision'
 
 ### close-revision
-complete -f -c arc -n '__fish_arc_needs_command' -a close-revision -d 'Close a revision'
+complete -f -c arc -n __fish_arc_needs_command -a close-revision -d 'Close a revision'
 complete -f -c arc -n '__fish_arc_using_command close-revision' -l quiet -d 'Do not print a success message'
 complete -f -c arc -n '__fish_arc_using_command close-revision' -l finalize -d 'Close only if the repository is untracked and the revision is accepted'
 
 ### tasks
-complete -f -c arc -n '__fish_arc_needs_command' -a tasks -d 'View all assigned tasks'
+complete -f -c arc -n __fish_arc_needs_command -a tasks -d 'View all assigned tasks'
 complete -f -c arc -n '__fish_arc_using_command tasks' -l status -d 'Show tasks that are open or closed, default is open'
 complete -f -c arc -n '__fish_arc_using_command tasks' -l owner -d 'Only show tasks assigned to the given username,'
 complete -f -c arc -n '__fish_arc_using_command tasks' -l unassigned -d 'Only show tasks that are not assigned'
@@ -225,13 +225,13 @@ complete -f -c arc -n '__fish_arc_using_command tasks' -l limit -d 'Limit the am
 complete -f -c arc -n '__fish_arc_using_command tasks' -l order -d 'Arrange tasks based on priority, created, or modified,'
 
 ### feature
-complete -f -c arc -n '__fish_arc_needs_command' -a feature -d 'A wrapper on \'git branch\' or \'hg bookmark'
+complete -f -c arc -n __fish_arc_needs_command -a feature -d 'A wrapper on \'git branch\' or \'hg bookmark'
 complete -f -c arc -n '__fish_arc_using_command feature' -l output -d 'Specify the output format'
 complete -f -c arc -n '__fish_arc_using_command feature' -l view-all -d 'Include closed and abandoned revisions'
 complete -f -c arc -n '__fish_arc_using_command feature' -l by-status -d 'Sort branches by status instead of time'
 
 ### unit
-complete -f -c arc -n '__fish_arc_needs_command' -a unit -d 'Run unit tests that cover specified paths'
+complete -f -c arc -n __fish_arc_needs_command -a unit -d 'Run unit tests that cover specified paths'
 complete -f -c arc -n '__fish_arc_using_command unit' -l engine -d 'Override configured unit engine for this project'
 complete -f -c arc -n '__fish_arc_using_command unit' -l detailed-coverage -d 'Show a detailed coverage report on the CLI'
 complete -f -c arc -n '__fish_arc_using_command unit' -l target -d 'Record a copy of the test results on the specified build target'
@@ -244,13 +244,13 @@ complete -f -c arc -n '__fish_arc_using_command unit' -l output -d 'Specify the
 complete -f -c arc -n '__fish_arc_using_command unit' -l no-coverage -d 'Always disable coverage information'
 
 ### backout
-complete -f -c arc -n '__fish_arc_needs_command' -a backout -d 'Backouts on a previous commit'
+complete -f -c arc -n __fish_arc_needs_command -a backout -d 'Backouts on a previous commit'
 
 ### call-conduit
-complete -f -c arc -n '__fish_arc_needs_command' -a call-conduit -d 'Make a raw Conduit method call'
+complete -f -c arc -n __fish_arc_needs_command -a call-conduit -d 'Make a raw Conduit method call'
 
 ### diff
-complete -f -c arc -n '__fish_arc_needs_command' -a diff -d 'Generate a Differential diff or revision from local changes'
+complete -f -c arc -n __fish_arc_needs_command -a diff -d 'Generate a Differential diff or revision from local changes'
 complete -f -c arc -n '__fish_arc_using_command diff' -l raw-command -d 'Generate diff by executing a specified command'
 complete -f -c arc -n '__fish_arc_using_command diff' -l encoding -d 'Attempt to convert non UTF-8 hunks into specified encoding'
 complete -f -c arc -n '__fish_arc_using_command diff' -l cc -d 'When creating a revision, add CCs'
@@ -293,7 +293,7 @@ complete -f -c arc -n '__fish_arc_using_command diff' -l only-new -d 'Display on
 complete -f -c arc -n '__fish_arc_using_command diff' -l no-coverage -d 'Always disable coverage information'
 
 ### liberate
-complete -f -c arc -n '__fish_arc_needs_command' -a liberate -d 'Create or update a libphutil library'
+complete -f -c arc -n __fish_arc_needs_command -a liberate -d 'Create or update a libphutil library'
 complete -f -c arc -n '__fish_arc_using_command liberate' -l remap -d 'Run the remap step of liberation'
 complete -f -c arc -n '__fish_arc_using_command liberate' -l upgrade -d 'Upgrade library to v2'
 complete -f -c arc -n '__fish_arc_using_command liberate' -l verify -d 'Run the verify step of liberation'
@@ -302,5 +302,5 @@ complete -f -c arc -n '__fish_arc_using_command liberate' -l force-update -d 'Fo
 complete -f -c arc -n '__fish_arc_using_command liberate' -l library-name -d 'Set the library name'
 
 ### version
-complete -f -c arc -n '__fish_arc_needs_command' -a version -d 'Shows the current version of arcanist'
+complete -f -c arc -n __fish_arc_needs_command -a version -d 'Shows the current version of arcanist'
 
diff --git a/share/completions/aws.fish b/share/completions/aws.fish
index 5bee05b19..7aa8bf0ba 100644
--- a/share/completions/aws.fish
+++ b/share/completions/aws.fish
@@ -37,7 +37,7 @@ function __s3_cmd_in
 
         # Check if `aws` command is `s3`
         if test $is_s3 -eq 0
-            if string match -q -- "s3" $token
+            if string match -q -- s3 $token
                 set is_s3 1
                 continue
             else
@@ -74,21 +74,21 @@ function __aws_cmd_in
 end
 
 # S3 completions
-complete -c 'aws' -n "__fish_prev_arg_in s3" -xa "cp mv rm help sync ls mb mv presign rb website"
+complete -c aws -n "__fish_prev_arg_in s3" -xa "cp mv rm help sync ls mb mv presign rb website"
 
 # When completing a remote path, complete the bucket name first, then based off
 # the bucket name, we can complete the path itself.
 
 # Commands that take only remote parameters (cannot operate on local files).
-complete -c 'aws' -n "__s3_is_maybe_bucket && __s3_cmd_in ls rb rm" -xa "(__s3_ls_buckets)"
+complete -c aws -n "__s3_is_maybe_bucket && __s3_cmd_in ls rb rm" -xa "(__s3_ls_buckets)"
 # Commands that can operate on local or remote files. To prevent the shell
 # locking up unnecessarily, only complete if no argument was specified or if the
 # argument being specified could be an S3 path.
-complete -c 'aws' -n "__s3_is_maybe_bucket && __s3_cmd_in mv cp presign mb sync" -a "(__s3_ls_buckets)"
+complete -c aws -n "__s3_is_maybe_bucket && __s3_cmd_in mv cp presign mb sync" -a "(__s3_ls_buckets)"
 
 # Complete the paths themselves
-complete -c 'aws' -n "__s3_is_remote_path" -xa "(__s3_ls_dir)"
-complete -c 'aws' -n "__s3_is_bucket" -xa "(__s3_ls_buckets)"
+complete -c aws -n __s3_is_remote_path -xa "(__s3_ls_dir)"
+complete -c aws -n __s3_is_bucket -xa "(__s3_ls_buckets)"
 
 # This list is extracted from the output of `aws help`, which can't be ingested directly,
 # as it emits considerable ANSI output and other terminal control characters.
@@ -270,4 +270,4 @@ set -l aws_services \
     workspaces \
     xray
 
-complete -c aws -n '__fish_is_first_token' -xa "$aws_services"
+complete -c aws -n __fish_is_first_token -xa "$aws_services"
diff --git a/share/completions/bd.fish b/share/completions/bd.fish
index 0ee395c6d..e1077d129 100644
--- a/share/completions/bd.fish
+++ b/share/completions/bd.fish
@@ -12,7 +12,7 @@ complete -c bd -s i -d "Case insensitive move (implies seems mode)"
 complete -c bd -s h -x -d "Display help and exit"
 
 function __fish_bd_complete_dirs
-    string split "/" -- $PWD
+    string split / -- $PWD
 end
 
 complete -c bd -a '(__fish_bd_complete_dirs)'
diff --git a/share/completions/bosh.fish b/share/completions/bosh.fish
index a3b771162..3b08fd146 100644
--- a/share/completions/bosh.fish
+++ b/share/completions/bosh.fish
@@ -12,81 +12,81 @@ set -l subcommands add-blob alias-env attach-disk blobs cancel-task clean-up \
     update-runtime-config upload-blobs upload-release upload-stemcell variables \
     vendor-package vms
 
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'add-blob' --description "Add blob"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'alias-env' --description "Alias environment to save URL and CA certificate"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'attach-disk' --description "Attaches disk to an instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'blobs' --description "List blobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cancel-task' --description "Cancel task at its next checkpoint"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'clean-up' --description "Clean up releases, stemcells, disks, etc."
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cloud-check' --description "Cloud consistency check and interactive repair"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cloud-config' --description "Show current cloud config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'config' --description "Show current config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'configs' --description "List configs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cpi-config' --description "Show current CPI config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'create-env' --description "Create or update BOSH environment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'create-release' --description "Create release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-config' --description "Delete config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-deployment' --description "Delete deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-disk' --description "Delete disk"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-env' --description "Delete BOSH environment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-release' --description "Delete release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-snapshot' --description "Delete snapshot"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-snapshots' --description "Delete all snapshots in a deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-stemcell' --description "Delete stemcell"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-vm' --description "Delete VM"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deploy' --description "Update deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deployment' --description "Show deployment information"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deployments' --description "List deployments"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'diff-config' --description "Diff two configs by ID"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'disks' --description "List disks"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'environment' --description "Show environment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'environments' --description "List environments"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'errands' --description "List errands"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'event' --description "Show event details"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'events' --description "List events"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'export-release' --description "Export the compiled release to a tarball"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'finalize-release' --description "Create final release from dev release tarball"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'generate-job' --description "Generate job"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'generate-package' --description "Generate package"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'help' --description "Show this help message"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'ignore' --description "Ignore an instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'init-release' --description "Initialize release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'inspect-release' --description "List release contents such as jobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'instances' --description "List all instances in a deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'interpolate' --description "Interpolates variables into a manifest"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'locks' --description "List current locks"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'log-in' --description "Log in"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'log-out' --description "Log out"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'logs' --description "Fetch logs from instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'manifest' --description "Show deployment manifest"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'orphan-disk' --description "Orphan disk"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'recreate' --description "Recreate instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'releases' --description "List releases"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'remove-blob' --description "Remove blob"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'repack-stemcell' --description "Repack stemcell"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'reset-release' --description "Reset release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'restart' --description "Restart instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'run-errand' --description "Run errand"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'runtime-config' --description "Show current runtime config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'scp' --description "SCP to/from instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'snapshots' --description "List snapshots"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'ssh' --description "SSH into instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'start' --description "Start instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'stemcells' --description "List stemcells"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'stop' --description "Stop instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'sync-blobs' --description "Sync blobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'take-snapshot' --description "Take snapshot"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'task' --description "Show task status and start tracking its output"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'tasks' --description "List running or recent tasks"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'unignore' --description "Unignore an instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-cloud-config' --description "Update current cloud config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-config' --description "Update config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-cpi-config' --description "Update current CPI config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-resurrection' --description "Enable/disable resurrection"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-runtime-config' --description "Update current runtime config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-blobs' --description "Upload blobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-release' --description "Upload release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-stemcell' --description "Upload stemcell"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'variables' --description "List variables"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'vendor-package' --description "Vendor package"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'vms' --description "List all VMs in all deployments"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a add-blob --description "Add blob"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a alias-env --description "Alias environment to save URL and CA certificate"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a attach-disk --description "Attaches disk to an instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a blobs --description "List blobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a cancel-task --description "Cancel task at its next checkpoint"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a clean-up --description "Clean up releases, stemcells, disks, etc."
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a cloud-check --description "Cloud consistency check and interactive repair"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a cloud-config --description "Show current cloud config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a config --description "Show current config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a configs --description "List configs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a cpi-config --description "Show current CPI config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a create-env --description "Create or update BOSH environment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a create-release --description "Create release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a delete-config --description "Delete config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a delete-deployment --description "Delete deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a delete-disk --description "Delete disk"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a delete-env --description "Delete BOSH environment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a delete-release --description "Delete release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a delete-snapshot --description "Delete snapshot"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a delete-snapshots --description "Delete all snapshots in a deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a delete-stemcell --description "Delete stemcell"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a delete-vm --description "Delete VM"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a deploy --description "Update deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a deployment --description "Show deployment information"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a deployments --description "List deployments"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a diff-config --description "Diff two configs by ID"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a disks --description "List disks"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a environment --description "Show environment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a environments --description "List environments"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a errands --description "List errands"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a event --description "Show event details"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a events --description "List events"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a export-release --description "Export the compiled release to a tarball"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a finalize-release --description "Create final release from dev release tarball"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a generate-job --description "Generate job"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a generate-package --description "Generate package"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a help --description "Show this help message"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a ignore --description "Ignore an instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a init-release --description "Initialize release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a inspect-release --description "List release contents such as jobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a instances --description "List all instances in a deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a interpolate --description "Interpolates variables into a manifest"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a locks --description "List current locks"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a log-in --description "Log in"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a log-out --description "Log out"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a logs --description "Fetch logs from instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a manifest --description "Show deployment manifest"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a orphan-disk --description "Orphan disk"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a recreate --description "Recreate instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a releases --description "List releases"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a remove-blob --description "Remove blob"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a repack-stemcell --description "Repack stemcell"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a reset-release --description "Reset release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a restart --description "Restart instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a run-errand --description "Run errand"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a runtime-config --description "Show current runtime config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a scp --description "SCP to/from instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a snapshots --description "List snapshots"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a ssh --description "SSH into instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a start --description "Start instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a stemcells --description "List stemcells"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a stop --description "Stop instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a sync-blobs --description "Sync blobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a take-snapshot --description "Take snapshot"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a task --description "Show task status and start tracking its output"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a tasks --description "List running or recent tasks"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a unignore --description "Unignore an instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a update-cloud-config --description "Update current cloud config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a update-config --description "Update config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a update-cpi-config --description "Update current CPI config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a update-resurrection --description "Enable/disable resurrection"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a update-runtime-config --description "Update current runtime config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a upload-blobs --description "Upload blobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a upload-release --description "Upload release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a upload-stemcell --description "Upload stemcell"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a variables --description "List variables"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a vendor-package --description "Vendor package"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a vms --description "List all VMs in all deployments"
diff --git a/share/completions/bower.fish b/share/completions/bower.fish
index b3d4743c9..e4f370ec2 100644
--- a/share/completions/bower.fish
+++ b/share/completions/bower.fish
@@ -41,7 +41,7 @@ function __bower_args
 end
 
 function __bower_matching_pkgs
-    bower search (commandline -ct) | string match -r "\S+[^\s]" | string match -v "Search"
+    bower search (commandline -ct) | string match -r "\S+[^\s]" | string match -v Search
 end
 
 # Output of `bower list` is a) slow, b) convoluted. Use `python` or `jq` instead.
@@ -64,7 +64,7 @@ for k,v in data["dependencies"].items(): print(k + "\t" + v[:18])' <bower.json 2
     jq -r '.dependencies | to_entries[] | .key' bower.json
 end
 
-complete -c bower -n "__fish_is_first_token" -x -a '(__bower_cmds)'
-complete -c bower -n "__fish_should_complete_switches" -x -a '(__bower_args)'
+complete -c bower -n __fish_is_first_token -x -a '(__bower_cmds)'
+complete -c bower -n __fish_should_complete_switches -x -a '(__bower_args)'
 complete -c bower -n "__fish_seen_subcommand_from install" -x -a '(__bower_matching_pkgs)'
 complete -c bower -n "__fish_seen_subcommand_from uninstall" -x -a '(__bower_list_installed)'
diff --git a/share/completions/btrfs.fish b/share/completions/btrfs.fish
index 9db3c5712..15fac9ac3 100644
--- a/share/completions/btrfs.fish
+++ b/share/completions/btrfs.fish
@@ -57,25 +57,25 @@ set -l replace '__btrfs_command_groups replace'
 complete -f -c btrfs -l help -d 'Display help information'
 
 # Primary command
-complete -f -c btrfs -n '__fish_is_first_arg' -a check -d 'Check structural integrity of a filesystem (unmounted).'
-complete -f -c btrfs -n '__fish_is_first_arg' -a restore -d 'Try to restore files from a damaged filesystem (unmounted)'
-complete -f -c btrfs -n '__fish_is_first_arg' -a send -d 'Send the subvolume(s) to stdout.'
-complete -f -c btrfs -n '__fish_is_first_arg' -a receive -d 'Receive subvolumes from a stream'
-complete -f -c btrfs -n '__fish_is_first_arg' -a help -d 'Display help information'
-complete -f -c btrfs -n '__fish_is_first_arg' -a version -d 'Display btrfs-progs version'
+complete -f -c btrfs -n __fish_is_first_arg -a check -d 'Check structural integrity of a filesystem (unmounted).'
+complete -f -c btrfs -n __fish_is_first_arg -a restore -d 'Try to restore files from a damaged filesystem (unmounted)'
+complete -f -c btrfs -n __fish_is_first_arg -a send -d 'Send the subvolume(s) to stdout.'
+complete -f -c btrfs -n __fish_is_first_arg -a receive -d 'Receive subvolumes from a stream'
+complete -f -c btrfs -n __fish_is_first_arg -a help -d 'Display help information'
+complete -f -c btrfs -n __fish_is_first_arg -a version -d 'Display btrfs-progs version'
 
 # Primary command groups
-complete -f -c btrfs -n '__fish_is_first_arg' -a subvolume -d 'manage subvolumes: create, delete, list, etc'
-complete -f -c btrfs -n '__fish_is_first_arg' -a filesystem -d 'overall filesystem tasks and information'
-complete -f -c btrfs -n '__fish_is_first_arg' -a balance -d 'balance data across devices, or change block groups using filters'
-complete -f -c btrfs -n '__fish_is_first_arg' -a device -d 'manage and query devices in the filesystem'
-complete -f -c btrfs -n '__fish_is_first_arg' -a scrub -d 'verify checksums of data and metadata'
-complete -f -c btrfs -n '__fish_is_first_arg' -a rescue -d 'toolbox for specific rescue operations'
-complete -f -c btrfs -n '__fish_is_first_arg' -a inspect-internal -d 'query various internal information'
-complete -f -c btrfs -n '__fish_is_first_arg' -a property -d 'modify properties of filesystem objects'
-complete -f -c btrfs -n '__fish_is_first_arg' -a quota -d 'manage filesystem quota settings'
-complete -f -c btrfs -n '__fish_is_first_arg' -a qgroup -d 'manage quota groups'
-complete -f -c btrfs -n '__fish_is_first_arg' -a replace -d 'replace a device in the filesystem'
+complete -f -c btrfs -n __fish_is_first_arg -a subvolume -d 'manage subvolumes: create, delete, list, etc'
+complete -f -c btrfs -n __fish_is_first_arg -a filesystem -d 'overall filesystem tasks and information'
+complete -f -c btrfs -n __fish_is_first_arg -a balance -d 'balance data across devices, or change block groups using filters'
+complete -f -c btrfs -n __fish_is_first_arg -a device -d 'manage and query devices in the filesystem'
+complete -f -c btrfs -n __fish_is_first_arg -a scrub -d 'verify checksums of data and metadata'
+complete -f -c btrfs -n __fish_is_first_arg -a rescue -d 'toolbox for specific rescue operations'
+complete -f -c btrfs -n __fish_is_first_arg -a inspect-internal -d 'query various internal information'
+complete -f -c btrfs -n __fish_is_first_arg -a property -d 'modify properties of filesystem objects'
+complete -f -c btrfs -n __fish_is_first_arg -a quota -d 'manage filesystem quota settings'
+complete -f -c btrfs -n __fish_is_first_arg -a qgroup -d 'manage quota groups'
+complete -f -c btrfs -n __fish_is_first_arg -a replace -d 'replace a device in the filesystem'
 
 # btrfs check
 complete -f -c btrfs -n $check -s s -l super -d 'Use this SUPERBLOCK copy'
@@ -99,9 +99,9 @@ complete -f -c btrfs -n $restore -s s -l snapshots -d 'Get snapshots'
 complete -f -c btrfs -n $restore -s x -l xattr -d 'Restore extended attributes'
 complete -f -c btrfs -n $restore -s m -l metadata -d 'Restore owner, mode and times'
 complete -f -c btrfs -n $restore -s S -l symlink -d 'Restore symbolic links'
-complete -f -c btrfs -n $restore -s v -l verbose -d 'Verbose'
+complete -f -c btrfs -n $restore -s v -l verbose -d Verbose
 complete -f -c btrfs -n $restore -s i -l ignore-errors -d 'Ignore errors'
-complete -f -c btrfs -n $restore -s o -l overwrite -d 'Overwrite'
+complete -f -c btrfs -n $restore -s o -l overwrite -d Overwrite
 complete -f -c btrfs -n $restore -s t -d 'Tree location'
 complete -f -c btrfs -n $restore -s f -d 'Filesystem location'
 complete -f -c btrfs -n $restore -s u -l super -d 'Super mirror'
diff --git a/share/completions/bundle.fish b/share/completions/bundle.fish
index d61b304d7..c0f76685c 100644
--- a/share/completions/bundle.fish
+++ b/share/completions/bundle.fish
@@ -28,7 +28,7 @@ complete -c bundle -l no-color -d 'Disable colorization in output'
 complete -c bundle -s V -l verbose -d 'Enable verbose output mode'
 
 # No command
-complete -f -n '__fish_bundle_no_command' -c bundle -l help -d 'Display a help page'
+complete -f -n __fish_bundle_no_command -c bundle -l help -d 'Display a help page'
 complete -c bundle -s v -l version -d 'Prints version information'
 
 ##
@@ -36,7 +36,7 @@ complete -c bundle -s v -l version -d 'Prints version information'
 ##
 
 # Install
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'install' -d 'Install the gems specified by the Gemfile or Gemfile.lock'
+complete -f -n __fish_bundle_no_command -c bundle -a install -d 'Install the gems specified by the Gemfile or Gemfile.lock'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l gemfile -d 'The location of the Gemfile bundler should use'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l path -d 'The location to install the gems in the bundle to'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l system -d 'Installs the gems in the bundle to the system location'
@@ -56,7 +56,7 @@ complete -f -n '__fish_bundle_using_command install' -c bundle -l no-prune -d 'D
 complete -f -n '__fish_bundle_using_command install' -c bundle -l frozen -d 'Do not allow the Gemfile.lock to be updated after this install'
 
 # Update
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'update' -d 'Update dependencies to their latest versions'
+complete -f -n __fish_bundle_no_command -c bundle -a update -d 'Update dependencies to their latest versions'
 complete -f -n '__fish_bundle_using_command update' -c bundle -l source -d 'The name of a :git or :path source used in the Gemfile'
 complete -f -n '__fish_bundle_using_command update' -c bundle -l local -d 'Do not attempt to fetch gems remotely and use the gem cache instead'
 complete -f -n '__fish_bundle_using_command update' -c bundle -l quiet -d 'Only output warnings and errors'
@@ -66,59 +66,59 @@ complete -f -n '__fish_bundle_using_command update' -c bundle -s g -l group -d '
 complete -f -n '__fish_bundle_using_command update' -c bundle -a '(__fish_bundled_gems)'
 
 # Package
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'package' -d 'Package the .gem files required by your application into the vendor/cache directory'
+complete -f -n __fish_bundle_no_command -c bundle -a package -d 'Package the .gem files required by your application into the vendor/cache directory'
 
 # Binstubs
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'binstubs' -d 'Install the binstubs of the listed gem'
+complete -f -n __fish_bundle_no_command -c bundle -a binstubs -d 'Install the binstubs of the listed gem'
 complete -f -n '__fish_bundle_using_command binstubs' -c bundle -l path -d 'Binstub destination directory (default bin)'
 complete -f -n '__fish_bundle_using_command binstubs' -c bundle -l force -d 'Overwrite existing binstubs if they exist'
 complete -f -n '__fish_bundle_using_command binstubs' -c bundle -a '(__fish_bundled_gems)'
 
 # Exec
-complete -f -n '__fish_bundle_no_command' -c bundle -a exec -d 'Execute a script in the context of the current bundle'
+complete -f -n __fish_bundle_no_command -c bundle -a exec -d 'Execute a script in the context of the current bundle'
 complete -f -n '__fish_bundle_using_command exec' -c bundle -l keep-file-descriptors -d 'Exec runs a command, providing it access to the gems in the bundle'
 
 # Help
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'help' -d 'Describe available tasks or one specific task'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'install' -d 'Install the gems specified by the Gemfile or Gemfile.lock'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'update' -d 'Update dependencies to their latest versions'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'package' -d 'Package .gem files into the vendor/cache directory'
+complete -f -n __fish_bundle_no_command -c bundle -a help -d 'Describe available tasks or one specific task'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a install -d 'Install the gems specified by the Gemfile or Gemfile.lock'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a update -d 'Update dependencies to their latest versions'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a package -d 'Package .gem files into the vendor/cache directory'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a exec -d 'Execute a script in the context of the current bundle'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'config' -d 'Specify and read configuration options for bundler'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'check' -d 'Check bundler requirements for your application'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'list' -d 'Show all of the gems in the current bundle'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'show' -d 'Show the source location of a particular gem in the bundle'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'outdated' -d 'Show all of the outdated gems in the current bundle'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'console' -d 'Start an IRB session in the context of the current bundle'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'open' -d 'Open an installed gem in your $EDITOR'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'viz' -d 'Generate a visual representation of your dependencies'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'init' -d 'Generate a simple Gemfile'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'gem' -d 'Create a simple gem, suitable for development with bundler'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'platform' -d 'Displays platform compatibility information'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'cleanup' -d 'Cleans up unused gems in your bundler directory'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a config -d 'Specify and read configuration options for bundler'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a check -d 'Check bundler requirements for your application'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a list -d 'Show all of the gems in the current bundle'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a show -d 'Show the source location of a particular gem in the bundle'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a outdated -d 'Show all of the outdated gems in the current bundle'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a console -d 'Start an IRB session in the context of the current bundle'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a open -d 'Open an installed gem in your $EDITOR'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a viz -d 'Generate a visual representation of your dependencies'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a init -d 'Generate a simple Gemfile'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a gem -d 'Create a simple gem, suitable for development with bundler'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a platform -d 'Displays platform compatibility information'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a cleanup -d 'Cleans up unused gems in your bundler directory'
 
 ##
 # Utilities
 ##
 
 # Check
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'check' -d 'Determine whether the requirements for your application are installed and available to bundler'
+complete -f -n __fish_bundle_no_command -c bundle -a check -d 'Determine whether the requirements for your application are installed and available to bundler'
 complete -f -n '__fish_bundle_using_command check' -c bundle -l gemfile -d 'The location of the Gemfile bundler should use'
 complete -f -n '__fish_bundle_using_command check' -c bundle -l path -d 'Specify a path other than the system default (BUNDLE_PATH or GEM_HOME)'
 complete -f -n '__fish_bundle_using_command check' -c bundle -l dry-run -d 'Lock the Gemfile'
 
 # List
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'list' -d 'Show lists the names and versions of all gems that are required by your Gemfile'
+complete -f -n __fish_bundle_no_command -c bundle -a list -d 'Show lists the names and versions of all gems that are required by your Gemfile'
 complete -f -n '__fish_bundle_using_command list' -c bundle -l paths -d 'List the paths of all gems required by your Gemfile'
 complete -f -n '__fish_bundle_using_command list' -c bundle -a '(__fish_bundled_gems)'
 
 # Show
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'show' -d 'Show lists the names and versions of all gems that are required by your Gemfile'
+complete -f -n __fish_bundle_no_command -c bundle -a show -d 'Show lists the names and versions of all gems that are required by your Gemfile'
 complete -f -n '__fish_bundle_using_command show' -c bundle -l paths -d 'List the paths of all gems required by your Gemfile'
 complete -f -n '__fish_bundle_using_command show' -c bundle -a '(__fish_bundled_gems)'
 
 # Outdated
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'outdated' -d 'Show all of the outdated gems in the current bundle'
+complete -f -n __fish_bundle_no_command -c bundle -a outdated -d 'Show all of the outdated gems in the current bundle'
 complete -f -n '__fish_bundle_using_command outdated' -c bundle -l pre -d 'Check for newer pre-release gems'
 complete -f -n '__fish_bundle_using_command outdated' -c bundle -l source -d 'Check against a specific source'
 complete -f -n '__fish_bundle_using_command outdated' -c bundle -l local -d 'Use cached gems instead of attempting to fetch gems remotely'
@@ -126,46 +126,46 @@ complete -f -n '__fish_bundle_using_command outdated' -c bundle -l strict -d 'On
 complete -f -n '__fish_bundle_using_command outdated' -c bundle -a '(__fish_bundled_gems)'
 
 # Console
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'console' -d 'Start an IRB session in the context of the current bundle'
+complete -f -n __fish_bundle_no_command -c bundle -a console -d 'Start an IRB session in the context of the current bundle'
 
 # Open
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'open' -d 'Open an installed gem in your $EDITOR'
+complete -f -n __fish_bundle_no_command -c bundle -a open -d 'Open an installed gem in your $EDITOR'
 complete -f -n '__fish_bundle_using_command open' -c bundle -a '(__fish_bundled_gems)'
 
 # Viz
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'viz' -d 'Generate a visual representation of your dependencies'
+complete -f -n __fish_bundle_no_command -c bundle -a viz -d 'Generate a visual representation of your dependencies'
 complete -f -n '__fish_bundle_using_command viz' -c bundle -s f -l file -d 'The name to use for the generated file (see format option)'
 complete -f -n '__fish_bundle_using_command viz' -c bundle -s v -l version -d 'Show each gem version'
 complete -f -n '__fish_bundle_using_command viz' -c bundle -s r -l requirements -d 'Show the version of each required dependency'
 complete -f -n '__fish_bundle_using_command viz' -c bundle -s F -l format -d 'Output a specific format (png, jpg, svg, dot, …)'
 
 # Init
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'init' -d 'Generate a simple Gemfile, placed in the current directory'
+complete -f -n __fish_bundle_no_command -c bundle -a init -d 'Generate a simple Gemfile, placed in the current directory'
 complete -f -n '__fish_bundle_using_command init' -c bundle -l gemspec -d 'Use a specified .gemspec to create the Gemfile'
 
 # Gem
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'gem' -d 'Create a simple gem, suitable for development with bundler'
+complete -f -n __fish_bundle_no_command -c bundle -a gem -d 'Create a simple gem, suitable for development with bundler'
 complete -f -n '__fish_bundle_using_command gem' -c bundle -s b -l bin -d 'Generate a binary for your library'
 complete -f -n '__fish_bundle_using_command gem' -c bundle -s t -l test -d 'Generate a test directory for your library (rspec or minitest)'
 complete -f -n '__fish_bundle_using_command gem' -c bundle -s e -l edit -d 'Path to your editor'
 complete -f -n '__fish_bundle_using_command gem' -c bundle -l ext -d 'Generate the boilerplate for C extension code'
 
 # Platform
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'platform' -d 'Displays platform compatibility information'
+complete -f -n __fish_bundle_no_command -c bundle -a platform -d 'Displays platform compatibility information'
 complete -f -n '__fish_bundle_using_command platform' -c bundle -l ruby -d 'Only display Ruby directive information'
 
 # Clean
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'clean' -d 'Cleans up unused gems in your bundler directory'
+complete -f -n __fish_bundle_no_command -c bundle -a clean -d 'Cleans up unused gems in your bundler directory'
 complete -f -n '__fish_bundle_using_command clean' -c bundle -l dry-run -d 'Only print out changes, do not actually clean gems'
 complete -f -n '__fish_bundle_using_command clean' -c bundle -l force -d 'Forces clean even if --path is not set'
 
 # Cache
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'cache' -d 'Cache all the gems to vendor/cache'
+complete -f -n __fish_bundle_no_command -c bundle -a cache -d 'Cache all the gems to vendor/cache'
 complete -f -n '__fish_bundle_using_command cache' -c bundle -l no-prune -d 'Do not remove stale gems from the cache'
 complete -f -n '__fish_bundle_using_command cache' -c bundle -l all -d 'Include all sources (including path and git)'
 
 # Licenses
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'licenses' -d 'Prints the license of all gems in the bundle'
+complete -f -n __fish_bundle_no_command -c bundle -a licenses -d 'Prints the license of all gems in the bundle'
 
 # Env
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'env' -d 'Print information about the environment Bundler is running under'
+complete -f -n __fish_bundle_no_command -c bundle -a env -d 'Print information about the environment Bundler is running under'
diff --git a/share/completions/bunzip2.fish b/share/completions/bunzip2.fish
index 5e0a9d351..9700d7f0b 100644
--- a/share/completions/bunzip2.fish
+++ b/share/completions/bunzip2.fish
@@ -11,7 +11,7 @@ complete -c bunzip2 -x -a "(
 "
 
 complete -c bunzip2 -s c -l stdout -d "Decompress to stdout"
-complete -c bunzip2 -s f -l force -d "Overwrite"
+complete -c bunzip2 -s f -l force -d Overwrite
 complete -c bunzip2 -s k -l keep -d "Do not overwrite"
 complete -c bunzip2 -s s -l small -d "Reduce memory usage"
 complete -c bunzip2 -s v -l verbose -d "Print compression ratios"
diff --git a/share/completions/busctl.fish b/share/completions/busctl.fish
index 29d3d2bc6..77d384c57 100644
--- a/share/completions/busctl.fish
+++ b/share/completions/busctl.fish
@@ -11,9 +11,9 @@ function __fish_busctl
     # We also need to pass the _last_ of these (`busctl --user --system` operates on the system bus)
     set -l mode
     if __fish_contains_opt user
-        set mode "--user"
+        set mode --user
     else
-        set mode "--system"
+        set mode --system
     end
     command busctl $mode $argv --no-legend --no-pager 2>/dev/null
 end
diff --git a/share/completions/bzip2.fish b/share/completions/bzip2.fish
index 01199d2b5..f9d33b294 100644
--- a/share/completions/bzip2.fish
+++ b/share/completions/bzip2.fish
@@ -13,7 +13,7 @@ complete -c bzip2 -s d -l decompress -x -a "(
 
 complete -c bzip2 -s z -l compress -d "Compress file"
 complete -c bzip2 -s t -l test -d "Check integrity"
-complete -c bzip2 -s f -l force -d "Overwrite"
+complete -c bzip2 -s f -l force -d Overwrite
 complete -c bzip2 -s k -l keep -d "Do not overwrite"
 complete -c bzip2 -s s -l small -d "Reduce memory usage"
 complete -c bzip2 -s q -l quiet -d "Suppress errors"
diff --git a/share/completions/bzr.fish b/share/completions/bzr.fish
index 21805d647..ef842427e 100644
--- a/share/completions/bzr.fish
+++ b/share/completions/bzr.fish
@@ -4,7 +4,7 @@
 
 
 # help commands
-complete -f -c bzr -n '__fish_use_subcommand' -a help -d 'Show help'
+complete -f -c bzr -n __fish_use_subcommand -a help -d 'Show help'
 complete -f -c bzr -n '__fish_seen_subcommand_from help' -a topics -d 'List all help topics'
 complete -f -c bzr -n '__fish_seen_subcommand_from help' -a commands -d 'List all commands'
 complete -f -c bzr -n '__fish_seen_subcommand_from help' -a formats -d 'Help about supported formats'
@@ -14,14 +14,14 @@ complete -f -c bzr -n '__fish_seen_subcommand_from help' -a bugs -d 'Show bug tr
 # TODO: Add help about specific commands generating the output
 
 # init command
-complete -f -c bzr -n '__fish_use_subcommand' -a init -d 'Makes this directory a versioned branch'
+complete -f -c bzr -n __fish_use_subcommand -a init -d 'Makes this directory a versioned branch'
 complete -f -c bzr -n '__fish_seen_subcommand_from init' -l create-prefix -d 'Create the path leading up to the branch if it does not already exists'
 complete -f -c bzr -n '__fish_seen_subcommand_from init' -l no-tree -d 'Create a branch without a working tree'
 complete -f -c bzr -n '__fish_seen_subcommand_from init' -l append-revisions-only -d 'Never change revnos or the existing log. Append revisions to it only'
 # TODO: Add init using path directory
 
 # branch command
-complete -f -c bzr -n '__fish_use_subcommand' -a branch -d 'Make a copy of another branch'
+complete -f -c bzr -n __fish_use_subcommand -a branch -d 'Make a copy of another branch'
 complete -f -c bzr -n '__fish_seen_subcommand_from branch' -l use-existing-dir -d 'Proceed even if directory exits'
 complete -f -c bzr -n '__fish_seen_subcommand_from branch' -l stacked -d 'Create a stacked branch referring to the source branch'
 complete -f -c bzr -n '__fish_seen_subcommand_from branch' -l standalone -d 'Do not use a shared repository, even if available'
@@ -32,20 +32,20 @@ complete -f -c bzr -n '__fish_seen_subcommand_from branch' -l no-tree -d 'Create
 # TODO: Add source/destination branch or directory
 
 # add command
-complete -f -c bzr -n '__fish_use_subcommand' -a add -d 'Make files or directories versioned'
+complete -f -c bzr -n __fish_use_subcommand -a add -d 'Make files or directories versioned'
 complete -f -c bzr -n '__fish_seen_subcommand_from add' -l no-recurse -s N -d 'Don\'t recursively add the contents of directories'
 
 # ignore command
-complete -f -c bzr -n '__fish_use_subcommand' -a ignore -d 'Ignore a file or pattern'
+complete -f -c bzr -n __fish_use_subcommand -a ignore -d 'Ignore a file or pattern'
 complete -f -c bzr -n '__fish_seen_subcommand_from ignore' -l default-rules -d 'Display the default ignore rules that bzr uses'
 
 # mv command
-complete -f -c bzr -n '__fish_use_subcommand' -a mv -d 'Move or rename a versioned file'
+complete -f -c bzr -n __fish_use_subcommand -a mv -d 'Move or rename a versioned file'
 complete -f -c bzr -n '__fish_seen_subcommand_from mv' -l auto -d 'Automatically guess renames'
 complete -f -c bzr -n '__fish_seen_subcommand_from mv' -l after -d 'Move only the bzr identifier of the file, because the file has already been moved'
 
 # status command
-complete -f -c bzr -n '__fish_use_subcommand' -a status -d 'Summarize changes in working copy'
+complete -f -c bzr -n __fish_use_subcommand -a status -d 'Summarize changes in working copy'
 complete -f -c bzr -n '__fish_seen_subcommand_from status' -l short -s S -d 'Use short status indicators'
 complete -f -c bzr -n '__fish_seen_subcommand_from status' -l versioned -s V -d 'Only show versioned files'
 complete -f -c bzr -n '__fish_seen_subcommand_from status' -l no-pending -d 'Don\'t show pending merges'
@@ -53,11 +53,11 @@ complete -f -c bzr -n '__fish_seen_subcommand_from status' -l no-classify -d 'Do
 complete -f -c bzr -n '__fish_seen_subcommand_from status' -l show-ids -d 'Show internal object ids'
 
 # diff command
-complete -f -c bzr -n '__fish_use_subcommand' -a diff -d 'Show detailed diffs'
+complete -f -c bzr -n __fish_use_subcommand -a diff -d 'Show detailed diffs'
 # TODO: Add file diff options
 
 # merge command
-complete -f -c bzr -n '__fish_use_subcommand' -a merge -d 'Pull in changes from another branch'
+complete -f -c bzr -n __fish_use_subcommand -a merge -d 'Pull in changes from another branch'
 complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l pull -d 'If the destination is already completely merged into the source, pull from the source rather than merging'
 complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l remember -d 'Remember the specified location as a default'
 complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l force -d 'Merge even if the destination tree has uncommitted changes'
@@ -71,7 +71,7 @@ complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l change -s c -d 'Sel
 complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l revision -s r -d 'Select changes introduced by the specified revision'
 
 # commit command
-complete -f -c bzr -n '__fish_use_subcommand' -a commit -d 'Save some or all changes'
+complete -f -c bzr -n __fish_use_subcommand -a commit -d 'Save some or all changes'
 complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l show-diff -s p -d 'When no message is supplied, show the diff along with the status summary in the message editor'
 complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l file -s F -d 'Take commit message from this file'
 complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l exclude -s x -d 'Do not consider changes made to a given path'
@@ -85,7 +85,7 @@ complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l lossy -d 'When com
 complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l local -d 'Perform a local commit in a bound branch.  Local commits are not pushed to the master branch until a normal commit is performed'
 
 # send command
-complete -f -c bzr -n '__fish_use_subcommand' -a send -d 'Send changes via email'
+complete -f -c bzr -n __fish_use_subcommand -a send -d 'Send changes via email'
 complete -f -c bzr -n '__fish_seen_subcommand_from send' -l body -d 'Body for the email'
 complete -f -c bzr -n '__fish_seen_subcommand_from send' -l remember -d 'Remember submit and public branch'
 complete -f -c bzr -n '__fish_seen_subcommand_from send' -l mail-to -d 'Mail the request to this address'
@@ -95,10 +95,10 @@ complete -f -c bzr -n '__fish_seen_subcommand_from send' -l strict -d 'Refuse to
 complete -f -c bzr -n '__fish_seen_subcommand_from send' -l no-patch -d 'Do not include a preview patch in the merge directive'
 
 # log command
-complete -f -c bzr -n '__fish_use_subcommand' -a log -d 'Show history of changes'
+complete -f -c bzr -n __fish_use_subcommand -a log -d 'Show history of changes'
 
 # check command
-complete -f -c bzr -n '__fish_use_subcommand' -a check -d 'Validate storage'
+complete -f -c bzr -n __fish_use_subcommand -a check -d 'Validate storage'
 complete -f -c bzr -n '__fish_seen_subcommand_from check' -l tree -d 'Check the working tree related to the current directory'
 complete -f -c bzr -n '__fish_seen_subcommand_from check' -l repo -d 'Check the repository related to the current directory'
 complete -f -c bzr -n '__fish_seen_subcommand_from check' -l branch -d 'Check the branch related to the current directory'
diff --git a/share/completions/camcontrol.fish b/share/completions/camcontrol.fish
index bac58bcde..8c6c5d25e 100644
--- a/share/completions/camcontrol.fish
+++ b/share/completions/camcontrol.fish
@@ -2,4 +2,4 @@
 
 set -l commands aam apm attrib cmd debug defects devlist eject epc format fwdownload help hpa identify idle inquiry load modepage negotiate opcodes periphlist persist readcap reportluns reprobe rescan reset sanitize security sleep smpcmd smpmaninfo smppc smpphylist smprg standby start stop tags timestamp tur zone
 
-complete -c camcontrol -n '__fish_is_first_token' -xa "$commands"
+complete -c camcontrol -n __fish_is_first_token -xa "$commands"
diff --git a/share/completions/canto.fish b/share/completions/canto.fish
index 98008712e..b64fdb5f4 100644
--- a/share/completions/canto.fish
+++ b/share/completions/canto.fish
@@ -22,7 +22,7 @@ complete -f -c canto -s l -l list -d 'List feeds'
 complete -f -c canto -s a -l checkall -d 'Show number of new items'
 
 complete -f -c canto -s n -l checknew -d 'Show number of new items for feed'
-complete -f -c canto -n '__fish_canto_using_command -l --checknew' -d 'Feed' -a '(command canto -l)'
+complete -f -c canto -n '__fish_canto_using_command -l --checknew' -d Feed -a '(command canto -l)'
 
 complete -c canto -s o -l opml -d 'Print conf as OPML'
 complete -c canto -s i -l import -d 'Import from OPML'
diff --git a/share/completions/cargo.fish b/share/completions/cargo.fish
index e07fc0846..b9f5e9596 100644
--- a/share/completions/cargo.fish
+++ b/share/completions/cargo.fish
@@ -7,7 +7,7 @@ complete -c cargo -s q -l quiet -d 'No output printed to stdout'
 
 set -lx __fish_cargo_subcommands (cargo --list 2>&1 | string replace -rf '^\s+([^\s]+)\s+(.*)' '$1\t$2' | string escape)
 
-complete -c cargo -f -c cargo -n '__fish_use_subcommand' -a "$__fish_cargo_subcommands"
+complete -c cargo -f -c cargo -n __fish_use_subcommand -a "$__fish_cargo_subcommands"
 complete -c cargo -x -c cargo -n '__fish_seen_subcommand_from help' -a "$__fish_cargo_subcommands"
 
 for x in bench build clean doc fetch generate-lockfile \
diff --git a/share/completions/cf.fish b/share/completions/cf.fish
index 5b1bebb23..f6c4a8902 100644
--- a/share/completions/cf.fish
+++ b/share/completions/cf.fish
@@ -38,171 +38,171 @@ set -l subcommands help version login logout passwd target api auth apps app \
     remove-plugin-repo list-plugin-repos repo-plugins plugins install-plugin \
     uninstall-plugin
 
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'help' --description "Show help"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'version' --description "Print the version"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'login' --description "Log user in"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'logout' --description "Log user out"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'passwd' --description "Change user password"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'target' --description "Set or view the targeted org or space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'api' --description "Set or view target api url"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'auth' --description "Authenticate user non-interactively"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'apps' --description "List all apps in the target space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'app' --description "Display health and status for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'push' --description "Push a new app or sync changes to an existing app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'scale' --description "Change or view the instance count, disk space limit, and memory limit for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete' --description "Delete an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename' --description "Rename an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'start' --description "Start an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stop' --description "Stop an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restart' --description "Stop all instances of the app, then start them again. This causes downtime."
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restage' --description "Recreate the app's executable artifact using the latest pushed app files and the latest environment (variables, service bindings, buildpack, stack, etc.)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restart-app-instance' --description "Terminate, then restart an app instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'run-task' --description "Run a one-off task on an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'tasks' --description "List tasks of an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'terminate-task' --description "Terminate a running task of an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'events' --description "Show recent app events"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'files' --description "Print out a list of files in a directory or the contents of a specific file of an app running on the DEA backend"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'logs' --description "Tail or show recent logs for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'env' --description "Show all env variables for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-env' --description "Set an env variable for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-env' --description "Remove an env variable"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stacks' --description "List all stacks (a stack is a pre-built file system, including an operating system, that can run apps)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stack' --description "Show information for a stack (a stack is a pre-built file system, including an operating system, that can run apps)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'copy-source' --description "Copies the source code of an application to another existing application (and restarts that application)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-app-manifest' --description "Create an app manifest for an app that has been pushed successfully"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'get-health-check' --description "Show the type of health check performed on an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-health-check' --description "Change type of health check performed on an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-ssh' --description "Enable ssh for the application"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-ssh' --description "Disable ssh for the application"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh-enabled' --description "Reports whether SSH is enabled on an application container instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh' --description "SSH to an application container instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'marketplace' --description "List available offerings in the marketplace"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'services' --description "List all service instances in the target space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service' --description "Show service instance info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service' --description "Create a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service' --description "Update a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service' --description "Delete a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-service' --description "Rename a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-key' --description "Create key for a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-keys' --description "List keys for a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-key' --description "Show service key info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-key' --description "Delete a service key"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-service' --description "Bind a service instance to an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-service' --description "Unbind a service instance from an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-route-service' --description "Bind a service instance to an HTTP route"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-route-service' --description "Unbind a service instance from an HTTP route"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-user-provided-service' --description "Make a user-provided service instance available to CF apps"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-user-provided-service' --description "Update user-provided service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'orgs' --description "List all orgs"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'org' --description "Show org info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-org' --description "Create an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-org' --description "Delete an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-org' --description "Rename an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'spaces' --description "List all spaces in an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space' --description "Show space info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-space' --description "Create a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-space' --description "Delete a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-space' --description "Rename a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'allow-space-ssh' --description "Allow SSH access for the space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disallow-space-ssh' --description "Disallow SSH access for the space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-ssh-allowed' --description "Reports whether SSH is allowed in a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'domains' --description "List domains in the target org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-domain' --description "Create a domain in an org for later use"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-domain' --description "Delete a domain"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-shared-domain' --description "Create a domain that can be used by all orgs (admin-only)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-shared-domain' --description "Delete a shared domain"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'router-groups' --description "List router groups"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'routes' --description "List all routes in the current space or the current organization"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-route' --description "Create a url route in a space for later use"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'check-route' --description "Perform a simple check to determine whether a route currently exists or not"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'map-route' --description "Add a url route to an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unmap-route' --description "Remove a url route from an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-route' --description "Delete a route"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-orphaned-routes' --description "Delete all orphaned routes (i.e. those that are not mapped to an app)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'network-policies' --description "List direct network traffic policies"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'add-network-policy' --description "Create policy to allow direct network traffic from one app to another"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'remove-network-policy' --description "Remove network traffic policy of an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'buildpacks' --description "List all buildpacks"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-buildpack' --description "Create a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-buildpack' --description "Update a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-buildpack' --description "Rename a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-buildpack' --description "Delete a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-user' --description "Create a new user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-user' --description "Delete a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'org-users' --description "Show org users by role"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-org-role' --description "Assign an org role to a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-org-role' --description "Remove an org role from a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-users' --description "Show space users by role"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-role' --description "Assign a space role to a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-space-role' --description "Remove a space role from a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'quotas' --description "List available usage quotas"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'quota' --description "Show quota info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-quota' --description "Assign a quota to an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-quota' --description "Define a new resource quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-quota' --description "Delete a quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-quota' --description "Update an existing resource quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'share-private-domain' --description "Share a private domain with an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unshare-private-domain' --description "Unshare a private domain with an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-quotas' --description "List available space resource quotas"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-quota' --description "Show space quota info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-space-quota' --description "Define a new space resource quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-space-quota' --description "Update an existing space quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-space-quota' --description "Delete a space quota definition and unassign the space quota from all spaces"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-quota' --description "Assign a space quota definition to a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-space-quota' --description "Unassign a quota from a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-auth-tokens' --description "List service auth tokens"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-auth-token' --description "Create a service auth token"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service-auth-token' --description "Update a service auth token"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-auth-token' --description "Delete a service auth token"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-brokers' --description "List service brokers"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-broker' --description "Create a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service-broker' --description "Update a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-broker' --description "Delete a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-service-broker' --description "Rename a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'migrate-service-instances' --description "Migrate service instances from one service plan to another"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'purge-service-offering' --description "Recursively remove a service and child objects from Cloud Foundry database without making requests to a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'purge-service-instance' --description "Recursively remove a service instance and child objects from Cloud Foundry database without making requests to a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-access' --description "List service access settings"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-service-access' --description "Enable access to a service or service plan for one or all orgs"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-service-access' --description "Disable access to a service or service plan for one or all orgs"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'security-group' --description "Show a single security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'security-groups' --description "List all security groups"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-security-group' --description "Create a security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-security-group' --description "Update a security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-security-group' --description "Deletes a security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-security-group' --description "Bind a security group to a particular space, or all existing spaces of an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-security-group' --description "Unbind a security group from a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-staging-security-group' --description "Bind a security group to the list of security groups to be used for staging applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'staging-security-groups' --description "List security groups in the staging set for applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-staging-security-group' --description "Unbind a security group from the set of security groups for staging applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-running-security-group' --description "Bind a security group to the list of security groups to be used for running applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'running-security-groups' --description "List security groups in the set of security groups for running applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-running-security-group' --description "Unbind a security group from the set of security groups for running applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'running-environment-variable-group' --description "Retrieve the contents of the running environment variable group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'staging-environment-variable-group' --description "Retrieve the contents of the staging environment variable group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-staging-environment-variable-group' --description "Pass parameters as JSON to create a staging environment variable group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-running-environment-variable-group' --description "Pass parameters as JSON to create a running environment variable group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'isolation-segments' --description "List all isolation segments"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-isolation-segment' --description "Create an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-isolation-segment' --description "Delete an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-org-isolation' --description "Entitle an organization to an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-org-isolation' --description "Revoke an organization's entitlement to an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-org-default-isolation-segment' --description "Set the default isolation segment used for apps in spaces in an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'reset-org-default-isolation-segment' --description "Reset the default isolation segment used for apps in spaces of an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-isolation-segment' --description "Assign the isolation segment for a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'reset-space-isolation-segment' --description "Reset the space's isolation segment to the org default"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'feature-flags' --description "Retrieve list of feature flags with status"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'feature-flag' --description "Retrieve an individual feature flag with status"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-feature-flag' --description "Allow use of a feature"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-feature-flag' --description "Prevent use of a feature"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'curl' --description "Executes a request to the targeted API endpoint"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'config' --description "Write default values to the config"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'oauth-token' --description "Retrieve and display the OAuth token for the current session"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh-code' --description "Get a one time password for ssh clients"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'add-plugin-repo' --description "Add a new plugin repository"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'remove-plugin-repo' --description "Remove a plugin repository"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'list-plugin-repos' --description "List all the added plugin repositories"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'repo-plugins' --description "List all available plugins in specified repository or in all added repositories"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'plugins' --description "List commands of installed plugins"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'install-plugin' --description "Install CLI plugin"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'uninstall-plugin' --description "Uninstall CLI plugin"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a help --description "Show help"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a version --description "Print the version"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a login --description "Log user in"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a logout --description "Log user out"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a passwd --description "Change user password"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a target --description "Set or view the targeted org or space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a api --description "Set or view target api url"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a auth --description "Authenticate user non-interactively"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a apps --description "List all apps in the target space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a app --description "Display health and status for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a push --description "Push a new app or sync changes to an existing app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a scale --description "Change or view the instance count, disk space limit, and memory limit for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete --description "Delete an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a rename --description "Rename an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a start --description "Start an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a stop --description "Stop an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a restart --description "Stop all instances of the app, then start them again. This causes downtime."
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a restage --description "Recreate the app's executable artifact using the latest pushed app files and the latest environment (variables, service bindings, buildpack, stack, etc.)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a restart-app-instance --description "Terminate, then restart an app instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a run-task --description "Run a one-off task on an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a tasks --description "List tasks of an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a terminate-task --description "Terminate a running task of an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a events --description "Show recent app events"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a files --description "Print out a list of files in a directory or the contents of a specific file of an app running on the DEA backend"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a logs --description "Tail or show recent logs for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a env --description "Show all env variables for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a set-env --description "Set an env variable for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unset-env --description "Remove an env variable"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a stacks --description "List all stacks (a stack is a pre-built file system, including an operating system, that can run apps)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a stack --description "Show information for a stack (a stack is a pre-built file system, including an operating system, that can run apps)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a copy-source --description "Copies the source code of an application to another existing application (and restarts that application)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-app-manifest --description "Create an app manifest for an app that has been pushed successfully"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a get-health-check --description "Show the type of health check performed on an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a set-health-check --description "Change type of health check performed on an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a enable-ssh --description "Enable ssh for the application"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a disable-ssh --description "Disable ssh for the application"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a ssh-enabled --description "Reports whether SSH is enabled on an application container instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a ssh --description "SSH to an application container instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a marketplace --description "List available offerings in the marketplace"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a services --description "List all service instances in the target space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a service --description "Show service instance info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-service --description "Create a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a update-service --description "Update a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-service --description "Delete a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a rename-service --description "Rename a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-service-key --description "Create key for a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a service-keys --description "List keys for a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a service-key --description "Show service key info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-service-key --description "Delete a service key"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a bind-service --description "Bind a service instance to an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unbind-service --description "Unbind a service instance from an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a bind-route-service --description "Bind a service instance to an HTTP route"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unbind-route-service --description "Unbind a service instance from an HTTP route"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-user-provided-service --description "Make a user-provided service instance available to CF apps"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a update-user-provided-service --description "Update user-provided service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a orgs --description "List all orgs"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a org --description "Show org info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-org --description "Create an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-org --description "Delete an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a rename-org --description "Rename an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a spaces --description "List all spaces in an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a space --description "Show space info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-space --description "Create a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-space --description "Delete a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a rename-space --description "Rename a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a allow-space-ssh --description "Allow SSH access for the space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a disallow-space-ssh --description "Disallow SSH access for the space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a space-ssh-allowed --description "Reports whether SSH is allowed in a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a domains --description "List domains in the target org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-domain --description "Create a domain in an org for later use"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-domain --description "Delete a domain"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-shared-domain --description "Create a domain that can be used by all orgs (admin-only)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-shared-domain --description "Delete a shared domain"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a router-groups --description "List router groups"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a routes --description "List all routes in the current space or the current organization"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-route --description "Create a url route in a space for later use"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a check-route --description "Perform a simple check to determine whether a route currently exists or not"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a map-route --description "Add a url route to an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unmap-route --description "Remove a url route from an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-route --description "Delete a route"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-orphaned-routes --description "Delete all orphaned routes (i.e. those that are not mapped to an app)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a network-policies --description "List direct network traffic policies"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a add-network-policy --description "Create policy to allow direct network traffic from one app to another"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a remove-network-policy --description "Remove network traffic policy of an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a buildpacks --description "List all buildpacks"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-buildpack --description "Create a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a update-buildpack --description "Update a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a rename-buildpack --description "Rename a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-buildpack --description "Delete a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-user --description "Create a new user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-user --description "Delete a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a org-users --description "Show org users by role"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a set-org-role --description "Assign an org role to a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unset-org-role --description "Remove an org role from a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a space-users --description "Show space users by role"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a set-space-role --description "Assign a space role to a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unset-space-role --description "Remove a space role from a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a quotas --description "List available usage quotas"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a quota --description "Show quota info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a set-quota --description "Assign a quota to an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-quota --description "Define a new resource quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-quota --description "Delete a quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a update-quota --description "Update an existing resource quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a share-private-domain --description "Share a private domain with an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unshare-private-domain --description "Unshare a private domain with an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a space-quotas --description "List available space resource quotas"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a space-quota --description "Show space quota info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-space-quota --description "Define a new space resource quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a update-space-quota --description "Update an existing space quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-space-quota --description "Delete a space quota definition and unassign the space quota from all spaces"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a set-space-quota --description "Assign a space quota definition to a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unset-space-quota --description "Unassign a quota from a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a service-auth-tokens --description "List service auth tokens"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-service-auth-token --description "Create a service auth token"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a update-service-auth-token --description "Update a service auth token"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-service-auth-token --description "Delete a service auth token"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a service-brokers --description "List service brokers"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-service-broker --description "Create a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a update-service-broker --description "Update a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-service-broker --description "Delete a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a rename-service-broker --description "Rename a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a migrate-service-instances --description "Migrate service instances from one service plan to another"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a purge-service-offering --description "Recursively remove a service and child objects from Cloud Foundry database without making requests to a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a purge-service-instance --description "Recursively remove a service instance and child objects from Cloud Foundry database without making requests to a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a service-access --description "List service access settings"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a enable-service-access --description "Enable access to a service or service plan for one or all orgs"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a disable-service-access --description "Disable access to a service or service plan for one or all orgs"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a security-group --description "Show a single security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a security-groups --description "List all security groups"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-security-group --description "Create a security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a update-security-group --description "Update a security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-security-group --description "Deletes a security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a bind-security-group --description "Bind a security group to a particular space, or all existing spaces of an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unbind-security-group --description "Unbind a security group from a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a bind-staging-security-group --description "Bind a security group to the list of security groups to be used for staging applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a staging-security-groups --description "List security groups in the staging set for applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unbind-staging-security-group --description "Unbind a security group from the set of security groups for staging applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a bind-running-security-group --description "Bind a security group to the list of security groups to be used for running applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a running-security-groups --description "List security groups in the set of security groups for running applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a unbind-running-security-group --description "Unbind a security group from the set of security groups for running applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a running-environment-variable-group --description "Retrieve the contents of the running environment variable group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a staging-environment-variable-group --description "Retrieve the contents of the staging environment variable group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a set-staging-environment-variable-group --description "Pass parameters as JSON to create a staging environment variable group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a set-running-environment-variable-group --description "Pass parameters as JSON to create a running environment variable group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a isolation-segments --description "List all isolation segments"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a create-isolation-segment --description "Create an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a delete-isolation-segment --description "Delete an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a enable-org-isolation --description "Entitle an organization to an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a disable-org-isolation --description "Revoke an organization's entitlement to an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a set-org-default-isolation-segment --description "Set the default isolation segment used for apps in spaces in an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a reset-org-default-isolation-segment --description "Reset the default isolation segment used for apps in spaces of an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a set-space-isolation-segment --description "Assign the isolation segment for a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a reset-space-isolation-segment --description "Reset the space's isolation segment to the org default"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a feature-flags --description "Retrieve list of feature flags with status"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a feature-flag --description "Retrieve an individual feature flag with status"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a enable-feature-flag --description "Allow use of a feature"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a disable-feature-flag --description "Prevent use of a feature"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a curl --description "Executes a request to the targeted API endpoint"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a config --description "Write default values to the config"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a oauth-token --description "Retrieve and display the OAuth token for the current session"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a ssh-code --description "Get a one time password for ssh clients"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a add-plugin-repo --description "Add a new plugin repository"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a remove-plugin-repo --description "Remove a plugin repository"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a list-plugin-repos --description "List all the added plugin repositories"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a repo-plugins --description "List all available plugins in specified repository or in all added repositories"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a plugins --description "List commands of installed plugins"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a install-plugin --description "Install CLI plugin"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a uninstall-plugin --description "Uninstall CLI plugin"
diff --git a/share/completions/chown.fish b/share/completions/chown.fish
index 5d72dfd24..922e9ee4a 100644
--- a/share/completions/chown.fish
+++ b/share/completions/chown.fish
@@ -8,5 +8,5 @@ complete -c chown -s R -l recursive -d "Operate recursively"
 complete -c chown -s v -l verbose -d "Output diagnostic for every file"
 complete -c chown -s h -l help -d "Display help and exit"
 complete -c chown -l version -d "Display version and exit"
-complete -c chown -d "Username" -a "(__fish_print_users):"
-complete -c chown -d "Username" -a "(string match -r -- '.*:' (commandline -ct))(__fish_complete_groups)"
+complete -c chown -d Username -a "(__fish_print_users):"
+complete -c chown -d Username -a "(string match -r -- '.*:' (commandline -ct))(__fish_complete_groups)"
diff --git a/share/completions/chronyc.fish b/share/completions/chronyc.fish
index cdc5496fc..7a5bc287a 100644
--- a/share/completions/chronyc.fish
+++ b/share/completions/chronyc.fish
@@ -15,85 +15,85 @@ complete -f -c chronyc -s v -d "Show version number"
 
 # Commands
 ## System clock
-complete -f -c chronyc -n "__fish_use_subcommand" -a tracking -d "Show system time info"
-complete -f -c chronyc -n "__fish_use_subcommand" -a makestep -d "Correct the clock by stepping"
-complete -f -c chronyc -n "__fish_use_subcommand" -a maxupdateskew -d "Modify max valid skew to update frequency"
-complete -f -c chronyc -n "__fish_use_subcommand" -a waitsync -d "Wait until synced in specified limits"
+complete -f -c chronyc -n __fish_use_subcommand -a tracking -d "Show system time info"
+complete -f -c chronyc -n __fish_use_subcommand -a makestep -d "Correct the clock by stepping"
+complete -f -c chronyc -n __fish_use_subcommand -a maxupdateskew -d "Modify max valid skew to update frequency"
+complete -f -c chronyc -n __fish_use_subcommand -a waitsync -d "Wait until synced in specified limits"
 
 ## Time sources
-complete -f -c chronyc -n "__fish_use_subcommand" -a sources -d "Show info about current sources"
+complete -f -c chronyc -n __fish_use_subcommand -a sources -d "Show info about current sources"
 complete -x -c chronyc -n "__fish_seen_subcommand_from sources" -s v -d "Be verbose"
-complete -f -c chronyc -n "__fish_use_subcommand" -a sourcestats -d "Show statistics about collected measurements"
+complete -f -c chronyc -n __fish_use_subcommand -a sourcestats -d "Show statistics about collected measurements"
 complete -x -c chronyc -n "__fish_seen_subcommand_from sourcestats" -s v -d "Be verbose"
-complete -f -c chronyc -n "__fish_use_subcommand" -a reselect -d "Force reselecting sync source"
-complete -f -c chronyc -n "__fish_use_subcommand" -a reselectdist -d "Modify reselection distance"
+complete -f -c chronyc -n __fish_use_subcommand -a reselect -d "Force reselecting sync source"
+complete -f -c chronyc -n __fish_use_subcommand -a reselectdist -d "Modify reselection distance"
 
 ## NTP sources
-complete -f -c chronyc -n "__fish_use_subcommand" -a activity -d "Check how many NTP sources are online/offline"
-complete -f -c chronyc -n "__fish_use_subcommand" -a ntpdata -d "Show info about last valid measurement"
-complete -f -c chronyc -n "__fish_use_subcommand" -a add
+complete -f -c chronyc -n __fish_use_subcommand -a activity -d "Check how many NTP sources are online/offline"
+complete -f -c chronyc -n __fish_use_subcommand -a ntpdata -d "Show info about last valid measurement"
+complete -f -c chronyc -n __fish_use_subcommand -a add
 complete -f -c chronyc -n "__fish_seen_subcommand_from add" -a peer -d "Add new NTP peer"
 complete -f -c chronyc -n "__fish_seen_subcommand_from add" -a server -d "Add new NTP server"
-complete -f -c chronyc -n "__fish_use_subcommand" -a delete -d "Remove server/peer"
-complete -f -c chronyc -n "__fish_use_subcommand" -a burst -d "Start rapid set of measurements"
-complete -f -c chronyc -n "__fish_use_subcommand" -a maxdelay -d "Modify max valid sample delay"
-complete -f -c chronyc -n "__fish_use_subcommand" -a maxdelaydevratio -d "Modify max valid delay/deviation ratio"
-complete -f -c chronyc -n "__fish_use_subcommand" -a maxdelayratio -d "Modify max valid delay/min ratio"
-complete -f -c chronyc -n "__fish_use_subcommand" -a maxpoll -d "Modify max polling interval"
-complete -f -c chronyc -n "__fish_use_subcommand" -a minpoll -d "Modify min polling interval"
-complete -f -c chronyc -n "__fish_use_subcommand" -a minstratum -d "Modify min stratum"
-complete -f -c chronyc -n "__fish_use_subcommand" -a offline -d "Set sources in subnet to offline status"
-complete -f -c chronyc -n "__fish_use_subcommand" -a online -d "Set sources in subnet to online status"
-complete -f -c chronyc -n "__fish_use_subcommand" -a onoffline -d "Set all sources to online/offline status according to network config"
-complete -f -c chronyc -n "__fish_use_subcommand" -a polltarget -d "Modify poll target"
-complete -f -c chronyc -n "__fish_use_subcommand" -a refresh -d "Refresh IP address"
+complete -f -c chronyc -n __fish_use_subcommand -a delete -d "Remove server/peer"
+complete -f -c chronyc -n __fish_use_subcommand -a burst -d "Start rapid set of measurements"
+complete -f -c chronyc -n __fish_use_subcommand -a maxdelay -d "Modify max valid sample delay"
+complete -f -c chronyc -n __fish_use_subcommand -a maxdelaydevratio -d "Modify max valid delay/deviation ratio"
+complete -f -c chronyc -n __fish_use_subcommand -a maxdelayratio -d "Modify max valid delay/min ratio"
+complete -f -c chronyc -n __fish_use_subcommand -a maxpoll -d "Modify max polling interval"
+complete -f -c chronyc -n __fish_use_subcommand -a minpoll -d "Modify min polling interval"
+complete -f -c chronyc -n __fish_use_subcommand -a minstratum -d "Modify min stratum"
+complete -f -c chronyc -n __fish_use_subcommand -a offline -d "Set sources in subnet to offline status"
+complete -f -c chronyc -n __fish_use_subcommand -a online -d "Set sources in subnet to online status"
+complete -f -c chronyc -n __fish_use_subcommand -a onoffline -d "Set all sources to online/offline status according to network config"
+complete -f -c chronyc -n __fish_use_subcommand -a polltarget -d "Modify poll target"
+complete -f -c chronyc -n __fish_use_subcommand -a refresh -d "Refresh IP address"
 
 ## Manual time input
-complete -f -c chronyc -n "__fish_use_subcommand" -a manual
+complete -f -c chronyc -n __fish_use_subcommand -a manual
 complete -f -c chronyc -n "__fish_seen_subcommand_from manual" -a on -d "Enable settime command"
 complete -f -c chronyc -n "__fish_seen_subcommand_from manual" -a off -d "Disable settime command"
 complete -f -c chronyc -n "__fish_seen_subcommand_from manual" -a delete -d "Delete previous settime entry"
 complete -f -c chronyc -n "__fish_seen_subcommand_from manual" -a list -d "Show previous settime entries"
 complete -f -c chronyc -n "__fish_seen_subcommand_from manual" -a reset -d "Reset settime command"
-complete -f -c chronyc -n "__fish_use_subcommand" -a settime -d "Set daemon time"
+complete -f -c chronyc -n __fish_use_subcommand -a settime -d "Set daemon time"
 
 ## NTP access
-complete -f -c chronyc -n "__fish_use_subcommand" -a accheck -d "Check whether address is allowed"
-complete -f -c chronyc -n "__fish_use_subcommand" -a clients -d "Report on clients that have accessed the server"
-complete -f -c chronyc -n "__fish_use_subcommand" -a serverstats -d "Show statistics of the server"
-complete -f -c chronyc -n "__fish_use_subcommand" -a allow -d "Allow access to subnet as a default"
+complete -f -c chronyc -n __fish_use_subcommand -a accheck -d "Check whether address is allowed"
+complete -f -c chronyc -n __fish_use_subcommand -a clients -d "Report on clients that have accessed the server"
+complete -f -c chronyc -n __fish_use_subcommand -a serverstats -d "Show statistics of the server"
+complete -f -c chronyc -n __fish_use_subcommand -a allow -d "Allow access to subnet as a default"
 complete -f -c chronyc -n "__fish_seen_subcommand_from allow" -a all -d "Allow access to subnet and all children"
-complete -f -c chronyc -n "__fish_use_subcommand" -a deny -d "Deny access to subnet as a default"
+complete -f -c chronyc -n __fish_use_subcommand -a deny -d "Deny access to subnet as a default"
 complete -f -c chronyc -n "__fish_seen_subcommand_from deny" -a all -d "Deny access to subnet and all children"
-complete -f -c chronyc -n "__fish_use_subcommand" -a local -d "Serve time even when not synced"
+complete -f -c chronyc -n __fish_use_subcommand -a local -d "Serve time even when not synced"
 complete -f -c chronyc -n "__fish_seen_subcommand_from local" -a off -d "Don't serve time when not synced"
-complete -f -c chronyc -n "__fish_use_subcommand" -a smoothing -d "Show current time smoothing state"
-complete -f -c chronyc -n "__fish_use_subcommand" -a smoothtime
+complete -f -c chronyc -n __fish_use_subcommand -a smoothing -d "Show current time smoothing state"
+complete -f -c chronyc -n __fish_use_subcommand -a smoothtime
 complete -f -c chronyc -n "__fish_seen_subcommand_from smoothtime" -a activate -d "Activate time smoothing"
 complete -f -c chronyc -n "__fish_seen_subcommand_from smoothtime" -a reset -d "Reset time smoothing"
 
 ## Monitoring access
-complete -f -c chronyc -n "__fish_use_subcommand" -a cmdaccheck -d "Check whether address is allowed"
-complete -f -c chronyc -n "__fish_use_subcommand" -a cmdallow -d "Allow access to subnet as a default"
+complete -f -c chronyc -n __fish_use_subcommand -a cmdaccheck -d "Check whether address is allowed"
+complete -f -c chronyc -n __fish_use_subcommand -a cmdallow -d "Allow access to subnet as a default"
 complete -f -c chronyc -n "__fish_seen_subcommand_from cmdallow" -a all -d "Allow access to subnet and all children"
-complete -f -c chronyc -n "__fish_use_subcommand" -a cmddeny -d "Deny access to subnet as a default"
+complete -f -c chronyc -n __fish_use_subcommand -a cmddeny -d "Deny access to subnet as a default"
 complete -f -c chronyc -n "__fish_seen_subcommand_from cmddeny" -a all -d "Deny access to subnet and all children"
 
 ## RTC
-complete -f -c chronyc -n "__fish_use_subcommand" -a rtcdata -d "Print current RTC performance parameters"
-complete -f -c chronyc -n "__fish_use_subcommand" -a trimrtc -d "Correct RTC relative to system clock"
-complete -f -c chronyc -n "__fish_use_subcommand" -a writertc -d "Save RTC performance parameters to file"
+complete -f -c chronyc -n __fish_use_subcommand -a rtcdata -d "Print current RTC performance parameters"
+complete -f -c chronyc -n __fish_use_subcommand -a trimrtc -d "Correct RTC relative to system clock"
+complete -f -c chronyc -n __fish_use_subcommand -a writertc -d "Save RTC performance parameters to file"
 
 ## Other daemon commands
-complete -f -c chronyc -n "__fish_use_subcommand" -a cyclelogs -d "Close and reopen log files"
-complete -f -c chronyc -n "__fish_use_subcommand" -a dump -d "Dump all measurements to save files"
-complete -f -c chronyc -n "__fish_use_subcommand" -a rekey -d "Reread keys from key file"
-complete -f -c chronyc -n "__fish_use_subcommand" -a shutdown -d "Stop daemon"
+complete -f -c chronyc -n __fish_use_subcommand -a cyclelogs -d "Close and reopen log files"
+complete -f -c chronyc -n __fish_use_subcommand -a dump -d "Dump all measurements to save files"
+complete -f -c chronyc -n __fish_use_subcommand -a rekey -d "Reread keys from key file"
+complete -f -c chronyc -n __fish_use_subcommand -a shutdown -d "Stop daemon"
 
 ## Client commands
-complete -f -c chronyc -n "__fish_use_subcommand" -a dns -d "Configure how hostname and IP address are resolved"
-complete -f -c chronyc -n "__fish_use_subcommand" -a timeout -d "Set initial response timeout"
-complete -f -c chronyc -n "__fish_use_subcommand" -a retries -d "Set max number of retries"
-complete -f -c chronyc -n "__fish_use_subcommand" -a keygen -d "Generate key for key file"
-complete -f -c chronyc -n "__fish_use_subcommand" -a "exit quit" -d "Leave the program"
-complete -f -c chronyc -n "__fish_use_subcommand" -a help -d "Show help message"
+complete -f -c chronyc -n __fish_use_subcommand -a dns -d "Configure how hostname and IP address are resolved"
+complete -f -c chronyc -n __fish_use_subcommand -a timeout -d "Set initial response timeout"
+complete -f -c chronyc -n __fish_use_subcommand -a retries -d "Set max number of retries"
+complete -f -c chronyc -n __fish_use_subcommand -a keygen -d "Generate key for key file"
+complete -f -c chronyc -n __fish_use_subcommand -a "exit quit" -d "Leave the program"
+complete -f -c chronyc -n __fish_use_subcommand -a help -d "Show help message"
diff --git a/share/completions/clang++.fish b/share/completions/clang++.fish
index 04af9dadf..b4c4572d7 100644
--- a/share/completions/clang++.fish
+++ b/share/completions/clang++.fish
@@ -2,6 +2,6 @@
 # They won't be autoloaded, but once clang++ is used once, they'll gain completions too.
 # This could potentially be moved to __fish_config_interactive.fish in the future.
 
-complete -p '*clang++*' -n '__fish_should_complete_switches' -xa '(__fish_complete_clang)'
+complete -p '*clang++*' -n __fish_should_complete_switches -xa '(__fish_complete_clang)'
 complete -p '*clang++*' -n 'not __fish_should_complete_switches' \
     -xa "(__fish_complete_suffix .o; __fish_complete_suffix .out; __fish_complete_suffix .c; __fish_complete_suffix .cpp; __fish_complete_suffix .so; __fish_complete_suffix .dylib)"
diff --git a/share/completions/clang.fish b/share/completions/clang.fish
index abc247082..3a18cc05d 100644
--- a/share/completions/clang.fish
+++ b/share/completions/clang.fish
@@ -3,8 +3,8 @@
 # This could potentially be moved to __fish_config_interactive.fish in the future.
 
 # This pattern unfortunately matches clang-format, etc. as well.
-complete -p '*clang*' -n '__fish_should_complete_switches' -xa '(__fish_complete_clang)'
-complete -c 'clang' -n 'not __fish_should_complete_switches' \
+complete -p '*clang*' -n __fish_should_complete_switches -xa '(__fish_complete_clang)'
+complete -c clang -n 'not __fish_should_complete_switches' \
     -xa "(__fish_complete_suffix .o; __fish_complete_suffix .out; __fish_complete_suffix .c; __fish_complete_suffix .cpp; __fish_complete_suffix .so; __fish_complete_suffix .dylib)"
 
 # again but without the -x this time for the pattern-matched completion
diff --git a/share/completions/climate.fish b/share/completions/climate.fish
index b088a3f55..bfac76ecb 100644
--- a/share/completions/climate.fish
+++ b/share/completions/climate.fish
@@ -8,55 +8,55 @@ function __fish_climate_has_no_argument
 end
 
 # Meta
-complete -f -n '__fish_climate_has_no_argument' -c climate -a help -d 'Show help'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a update -d 'Update your climate install'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a uninstall -d 'uninstall climate'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a version -d 'Show climate version'
+complete -f -n __fish_climate_has_no_argument -c climate -a help -d 'Show help'
+complete -f -n __fish_climate_has_no_argument -c climate -a update -d 'Update your climate install'
+complete -f -n __fish_climate_has_no_argument -c climate -a uninstall -d 'uninstall climate'
+complete -f -n __fish_climate_has_no_argument -c climate -a version -d 'Show climate version'
 
 # Info
-complete -f -n '__fish_climate_has_no_argument' -c climate -a weather -d 'Get the weather'
+complete -f -n __fish_climate_has_no_argument -c climate -a weather -d 'Get the weather'
 
 # General
-complete -f -n '__fish_climate_has_no_argument' -c climate -a battery -d 'Display remaining battery'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a sleep -d 'Display remaining battery'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a lock -d 'Lock computer'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a shutdown -d 'Shutdown the computer'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a restart -d 'Restart the computer'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a time -d 'Show the time'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a clock -d 'Put a console clock in the top right corner'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a countdown -d 'A countdown timer'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a stopwatch -d 'A stopwatch'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a ix -d 'Pipe output to ix.io'
+complete -f -n __fish_climate_has_no_argument -c climate -a battery -d 'Display remaining battery'
+complete -f -n __fish_climate_has_no_argument -c climate -a sleep -d 'Display remaining battery'
+complete -f -n __fish_climate_has_no_argument -c climate -a lock -d 'Lock computer'
+complete -f -n __fish_climate_has_no_argument -c climate -a shutdown -d 'Shutdown the computer'
+complete -f -n __fish_climate_has_no_argument -c climate -a restart -d 'Restart the computer'
+complete -f -n __fish_climate_has_no_argument -c climate -a time -d 'Show the time'
+complete -f -n __fish_climate_has_no_argument -c climate -a clock -d 'Put a console clock in the top right corner'
+complete -f -n __fish_climate_has_no_argument -c climate -a countdown -d 'A countdown timer'
+complete -f -n __fish_climate_has_no_argument -c climate -a stopwatch -d 'A stopwatch'
+complete -f -n __fish_climate_has_no_argument -c climate -a ix -d 'Pipe output to ix.io'
 
 # Files
-complete -n '__fish_climate_has_no_argument' -c climate -a biggest-files -d 'Find the biggest files recursively'
-complete -n '__fish_climate_has_no_argument' -c climate -a biggest-dirs -d 'Find the biggest directories'
-complete -n '__fish_climate_has_no_argument' -c climate -a dir-size -d 'Find directory size'
-complete -n '__fish_climate_has_no_argument' -c climate -a remove-empty-dirs -d 'Remove empty directories'
-complete -n '__fish_climate_has_no_argument' -c climate -a extract -d 'Extract any given archive'
-complete -n '__fish_climate_has_no_argument' -c climate -a find-duplicates -d 'Report duplicate files in a directory'
-complete -n '__fish_climate_has_no_argument' -c climate -a count -d 'Count the number of occurences'
-complete -n '__fish_climate_has_no_argument' -c climate -a monitor -d 'Monitor file for changes'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a grep -d 'Search for the given pattern recursively'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a replace -d 'Replace all occurences'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a ramfs -d 'Create a ramfs of size (in MB) at path'
+complete -n __fish_climate_has_no_argument -c climate -a biggest-files -d 'Find the biggest files recursively'
+complete -n __fish_climate_has_no_argument -c climate -a biggest-dirs -d 'Find the biggest directories'
+complete -n __fish_climate_has_no_argument -c climate -a dir-size -d 'Find directory size'
+complete -n __fish_climate_has_no_argument -c climate -a remove-empty-dirs -d 'Remove empty directories'
+complete -n __fish_climate_has_no_argument -c climate -a extract -d 'Extract any given archive'
+complete -n __fish_climate_has_no_argument -c climate -a find-duplicates -d 'Report duplicate files in a directory'
+complete -n __fish_climate_has_no_argument -c climate -a count -d 'Count the number of occurences'
+complete -n __fish_climate_has_no_argument -c climate -a monitor -d 'Monitor file for changes'
+complete -f -n __fish_climate_has_no_argument -c climate -a grep -d 'Search for the given pattern recursively'
+complete -f -n __fish_climate_has_no_argument -c climate -a replace -d 'Replace all occurences'
+complete -f -n __fish_climate_has_no_argument -c climate -a ramfs -d 'Create a ramfs of size (in MB) at path'
 
 # Network
-complete -f -n '__fish_climate_has_no_argument' -c climate -a speedtest -d 'Test your network speed'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a local-ip -d 'Retrieve your local ip address'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a is-online -d 'Verify if you\'re online'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a public-ip -d 'Retrieve your public ip address'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a ports -d 'List open ports'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a hosts -d 'Edit the hosts file'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a http-server -d 'http-server serving the current directory'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a is-up -d 'Determine if server is up'
+complete -f -n __fish_climate_has_no_argument -c climate -a speedtest -d 'Test your network speed'
+complete -f -n __fish_climate_has_no_argument -c climate -a local-ip -d 'Retrieve your local ip address'
+complete -f -n __fish_climate_has_no_argument -c climate -a is-online -d 'Verify if you\'re online'
+complete -f -n __fish_climate_has_no_argument -c climate -a public-ip -d 'Retrieve your public ip address'
+complete -f -n __fish_climate_has_no_argument -c climate -a ports -d 'List open ports'
+complete -f -n __fish_climate_has_no_argument -c climate -a hosts -d 'Edit the hosts file'
+complete -f -n __fish_climate_has_no_argument -c climate -a http-server -d 'http-server serving the current directory'
+complete -f -n __fish_climate_has_no_argument -c climate -a is-up -d 'Determine if server is up'
 
 # SSH
-complete -f -n '__fish_climate_has_no_argument' -c climate -a download-file -d 'Download file from server'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a download-dir -d 'Download dir from server'
-complete -n '__fish_climate_has_no_argument' -c climate -a upload -d 'Upload to server'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a ssh-mount -d 'Mount a remote path'
-complete -n '__fish_climate_has_no_argument' -c climate -a ssh-unmount -d 'Unmount a ssh mount'
+complete -f -n __fish_climate_has_no_argument -c climate -a download-file -d 'Download file from server'
+complete -f -n __fish_climate_has_no_argument -c climate -a download-dir -d 'Download dir from server'
+complete -n __fish_climate_has_no_argument -c climate -a upload -d 'Upload to server'
+complete -f -n __fish_climate_has_no_argument -c climate -a ssh-mount -d 'Mount a remote path'
+complete -n __fish_climate_has_no_argument -c climate -a ssh-unmount -d 'Unmount a ssh mount'
 
 # git
 complete -f -c climate -n '__fish_is_git_repository; and __fish_climate_has_no_argument' -a undo-commit -d 'Undo the latest commit'
@@ -67,10 +67,10 @@ complete -f -c climate -n '__fish_is_git_repository; and __fish_climate_has_no_a
 complete -f -c climate -n '__fish_is_git_repository; and __fish_climate_has_no_argument' -a user-stats -d 'Calculate total contribution for a user'
 
 # Performance
-complete -f -n '__fish_climate_has_no_argument' -c climate -a overview -d 'Display a performance overview'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a memory -d 'Find memory used'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a disk -d 'Find disk used'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a get-pids -d 'Get all PIDs for a process name'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a trash-size -d 'Find the trash size'
-complete -f -n '__fish_climate_has_no_argument' -c climate -a empty -d 'Empty the trash'
+complete -f -n __fish_climate_has_no_argument -c climate -a overview -d 'Display a performance overview'
+complete -f -n __fish_climate_has_no_argument -c climate -a memory -d 'Find memory used'
+complete -f -n __fish_climate_has_no_argument -c climate -a disk -d 'Find disk used'
+complete -f -n __fish_climate_has_no_argument -c climate -a get-pids -d 'Get all PIDs for a process name'
+complete -f -n __fish_climate_has_no_argument -c climate -a trash-size -d 'Find the trash size'
+complete -f -n __fish_climate_has_no_argument -c climate -a empty -d 'Empty the trash'
 
diff --git a/share/completions/composer.fish b/share/completions/composer.fish
index 7b7107e1a..ce9f1a780 100644
--- a/share/completions/composer.fish
+++ b/share/completions/composer.fish
@@ -65,261 +65,261 @@ if 'scripts' in data and data['scripts']:
 end
 
 # add cmds list
-set --local composer_cmds 'about' 'archive' 'browse' 'check-platform-reqs' 'clear-cache' 'config' 'create-project' 'depends' 'diagnose' 'dump-autoload' 'exec' 'global' 'help' 'home' 'init' 'install' 'licenses' 'list' 'outdated' 'prohibits' 'remove' 'require' 'run-script' 'search' 'self-update' 'show' 'suggests' 'status' 'update' 'validate' 'why' 'why-not'
+set --local composer_cmds about archive browse check-platform-reqs clear-cache config create-project depends diagnose dump-autoload exec global help home init install licenses list outdated prohibits remove require run-script search self-update show suggests status update validate why why-not
 
 # Custom scripts
-complete -f -c composer -n '__fish_composer_needs_command' -a '(__fish_composer_scripts)' -d 'User script'
+complete -f -c composer -n __fish_composer_needs_command -a '(__fish_composer_scripts)' -d 'User script'
 complete -f -c composer -n '__fish_composer_using_command run-script' -a "(__fish_composer_scripts)"
-complete -f -c composer -n '__fish_composer_using_command run-script' -l 'timeout' -d 'Sets script timeout in seconds, or 0 for never.'
-complete -f -c composer -n '__fish_composer_using_command run-script' -l 'dev' -d 'Sets the dev mode.'
-complete -f -c composer -n '__fish_composer_using_command run-script' -l 'no-dev' -d 'Disables the dev mode.'
-complete -f -c composer -n '__fish_composer_using_command run-script' -l 'list' -d 'List scripts.'
+complete -f -c composer -n '__fish_composer_using_command run-script' -l timeout -d 'Sets script timeout in seconds, or 0 for never.'
+complete -f -c composer -n '__fish_composer_using_command run-script' -l dev -d 'Sets the dev mode.'
+complete -f -c composer -n '__fish_composer_using_command run-script' -l no-dev -d 'Disables the dev mode.'
+complete -f -c composer -n '__fish_composer_using_command run-script' -l list -d 'List scripts.'
 
 # commands
-complete -f -c composer -n '__fish_composer_needs_command' -a 'about' -d 'Short information about Composer'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'archive' -d 'Create an archive of this composer package'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'browse' -d 'Opens the package\'s repository URL or homepage in your browser.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'check-platform-reqs' -d 'Check that platform requirements are satisfied.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'clear-cache' -d 'Clears composer\'s internal package cache.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'config' -d 'Set config options'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'create-project' -d 'Create new project from a package into given directory.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'depends' -d 'Shows which packages depend on the given package'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'diagnose' -d 'Diagnoses the system to identify common errors.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'dump-autoload' -d 'Dumps the autoloader'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'exec' -d 'Executes a vendored binary/script.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'global' -d 'Allows running commands in the global composer dir ($COMPOSER_HOME).'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'help' -d 'Displays help for a command'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'home' -d 'Opens the package\'s repository URL or homepage in your browser.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'init' -d 'Creates a basic composer.json file in current directory.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'install' -d 'Installs the project dependencies from the composer.lock file if present, or falls back on the composer.json.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'licenses' -d 'Show information about licenses of dependencies'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'list' -d 'Lists commands'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'outdated' -d 'Shows a list of installed packages that have updates available, including their latest version.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'prohibits' -d 'Shows which packages prevent the given package from being installed.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'remove' -d 'Removes a package from the require or require-dev'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'require' -d 'Adds required packages to your composer.json and installs them'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'run-script' -d 'Run the scripts defined in composer.json.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'search' -d 'Search for packages'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'self-update' -d 'Updates composer.phar to the latest version.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'show' -d 'Show information about packages'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'status' -d 'Show a list of locally modified packages'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'suggests' -d 'Shows package suggestions.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'update' -d 'Updates your dependencies to the latest version according to composer.json, and updates the composer.lock file.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'validate' -d 'Validates a composer.json'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'why' -d 'Shows which packages cause the given package to be installed'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'why-not' -d 'Shows which packages prevent the given package from being installed'
+complete -f -c composer -n __fish_composer_needs_command -a about -d 'Short information about Composer'
+complete -f -c composer -n __fish_composer_needs_command -a archive -d 'Create an archive of this composer package'
+complete -f -c composer -n __fish_composer_needs_command -a browse -d 'Opens the package\'s repository URL or homepage in your browser.'
+complete -f -c composer -n __fish_composer_needs_command -a check-platform-reqs -d 'Check that platform requirements are satisfied.'
+complete -f -c composer -n __fish_composer_needs_command -a clear-cache -d 'Clears composer\'s internal package cache.'
+complete -f -c composer -n __fish_composer_needs_command -a config -d 'Set config options'
+complete -f -c composer -n __fish_composer_needs_command -a create-project -d 'Create new project from a package into given directory.'
+complete -f -c composer -n __fish_composer_needs_command -a depends -d 'Shows which packages depend on the given package'
+complete -f -c composer -n __fish_composer_needs_command -a diagnose -d 'Diagnoses the system to identify common errors.'
+complete -f -c composer -n __fish_composer_needs_command -a dump-autoload -d 'Dumps the autoloader'
+complete -f -c composer -n __fish_composer_needs_command -a exec -d 'Executes a vendored binary/script.'
+complete -f -c composer -n __fish_composer_needs_command -a global -d 'Allows running commands in the global composer dir ($COMPOSER_HOME).'
+complete -f -c composer -n __fish_composer_needs_command -a help -d 'Displays help for a command'
+complete -f -c composer -n __fish_composer_needs_command -a home -d 'Opens the package\'s repository URL or homepage in your browser.'
+complete -f -c composer -n __fish_composer_needs_command -a init -d 'Creates a basic composer.json file in current directory.'
+complete -f -c composer -n __fish_composer_needs_command -a install -d 'Installs the project dependencies from the composer.lock file if present, or falls back on the composer.json.'
+complete -f -c composer -n __fish_composer_needs_command -a licenses -d 'Show information about licenses of dependencies'
+complete -f -c composer -n __fish_composer_needs_command -a list -d 'Lists commands'
+complete -f -c composer -n __fish_composer_needs_command -a outdated -d 'Shows a list of installed packages that have updates available, including their latest version.'
+complete -f -c composer -n __fish_composer_needs_command -a prohibits -d 'Shows which packages prevent the given package from being installed.'
+complete -f -c composer -n __fish_composer_needs_command -a remove -d 'Removes a package from the require or require-dev'
+complete -f -c composer -n __fish_composer_needs_command -a require -d 'Adds required packages to your composer.json and installs them'
+complete -f -c composer -n __fish_composer_needs_command -a run-script -d 'Run the scripts defined in composer.json.'
+complete -f -c composer -n __fish_composer_needs_command -a search -d 'Search for packages'
+complete -f -c composer -n __fish_composer_needs_command -a self-update -d 'Updates composer.phar to the latest version.'
+complete -f -c composer -n __fish_composer_needs_command -a show -d 'Show information about packages'
+complete -f -c composer -n __fish_composer_needs_command -a status -d 'Show a list of locally modified packages'
+complete -f -c composer -n __fish_composer_needs_command -a suggests -d 'Shows package suggestions.'
+complete -f -c composer -n __fish_composer_needs_command -a update -d 'Updates your dependencies to the latest version according to composer.json, and updates the composer.lock file.'
+complete -f -c composer -n __fish_composer_needs_command -a validate -d 'Validates a composer.json'
+complete -f -c composer -n __fish_composer_needs_command -a why -d 'Shows which packages cause the given package to be installed'
+complete -f -c composer -n __fish_composer_needs_command -a why-not -d 'Shows which packages prevent the given package from being installed'
 
 # archive
-complete -f -c composer -n '__fish_composer_using_command archive' -l 'format' -d 'Format of the resulting archive: tar or zip'
-complete -f -c composer -n '__fish_composer_using_command archive' -l 'dir' -d 'Write the archive to this directory'
-complete -f -c composer -n '__fish_composer_using_command archive' -l 'file' -d 'Write the archive with the given file name. Note that the format will be appended.'
-complete -f -c composer -n '__fish_composer_using_command archive' -l 'ignore-filters' -d 'Ignore filters when saving package'
+complete -f -c composer -n '__fish_composer_using_command archive' -l format -d 'Format of the resulting archive: tar or zip'
+complete -f -c composer -n '__fish_composer_using_command archive' -l dir -d 'Write the archive to this directory'
+complete -f -c composer -n '__fish_composer_using_command archive' -l file -d 'Write the archive with the given file name. Note that the format will be appended.'
+complete -f -c composer -n '__fish_composer_using_command archive' -l ignore-filters -d 'Ignore filters when saving package'
 
 # browse
-complete -f -c composer -n '__fish_composer_using_command browse' -l 'homepage' -d 'Open the homepage instead of the repository URL.'
-complete -f -c composer -n '__fish_composer_using_command browse' -l 'show' -d 'Only show the homepage or repository URL.'
+complete -f -c composer -n '__fish_composer_using_command browse' -l homepage -d 'Open the homepage instead of the repository URL.'
+complete -f -c composer -n '__fish_composer_using_command browse' -l show -d 'Only show the homepage or repository URL.'
 
 # check-platform-reqs
-complete -f -c composer -n '__fish_composer_using_command check-platform-reqs' -l 'no-dev' -d 'Disables checking of require-dev packages requirements.'
+complete -f -c composer -n '__fish_composer_using_command check-platform-reqs' -l no-dev -d 'Disables checking of require-dev packages requirements.'
 
 # config
-complete -f -c composer -n '__fish_composer_using_command config' -l 'global' -d 'Apply command to the global config file'
-complete -f -c composer -n '__fish_composer_using_command config' -l 'editor' -d 'Open editor'
-complete -f -c composer -n '__fish_composer_using_command config' -l 'auth' -d 'Affect auth config file (only used for --editor)'
-complete -f -c composer -n '__fish_composer_using_command config' -l 'unset' -d 'Unset the given setting-key'
-complete -f -c composer -n '__fish_composer_using_command config' -l 'list' -d 'List configuration settings'
-complete -f -c composer -n '__fish_composer_using_command config' -l 'file' -d 'If you want to choose a different composer.json or config.json'
-complete -f -c composer -n '__fish_composer_using_command config' -l 'absolute' -d 'Returns absolute paths when fetching *-dir config values instead of relative'
+complete -f -c composer -n '__fish_composer_using_command config' -l global -d 'Apply command to the global config file'
+complete -f -c composer -n '__fish_composer_using_command config' -l editor -d 'Open editor'
+complete -f -c composer -n '__fish_composer_using_command config' -l auth -d 'Affect auth config file (only used for --editor)'
+complete -f -c composer -n '__fish_composer_using_command config' -l unset -d 'Unset the given setting-key'
+complete -f -c composer -n '__fish_composer_using_command config' -l list -d 'List configuration settings'
+complete -f -c composer -n '__fish_composer_using_command config' -l file -d 'If you want to choose a different composer.json or config.json'
+complete -f -c composer -n '__fish_composer_using_command config' -l absolute -d 'Returns absolute paths when fetching *-dir config values instead of relative'
 
 # create-project
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'stability' -d 'Minimum-stability allowed (unless a version is specified).'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'prefer-source' -d 'Forces installation from package sources when possible, including VCS information.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'prefer-dist' -d 'Forces installation from package dist even for dev versions.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'repository' -d 'Pick a different repository (as url or json config) to look for the package.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'repository-url' -d 'DEPRECATED: Use --repository instead.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'dev' -d 'Enables installation of require-dev packages (enabled by default, only present for BC).'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-dev' -d 'Disables installation of require-dev packages.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-custom-installers' -d 'DEPRECATED: Use no-plugins instead.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-scripts' -d 'Whether to prevent execution of all defined scripts in the root package.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-progress' -d 'Do not output download progress.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-secure-http' -d 'Disable the secure-http config option temporarily while installing the root package. Use at your own risk. Using this flag is a bad idea.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'keep-vcs' -d 'Whether to prevent deleting the vcs folder.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'remove-vcs' -d 'Whether to force deletion of the vcs folder without prompting.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-install' -d 'Whether to skip installation of the package dependencies.'
-complete -f -c composer -n '__fish_composer_using_command create-project' -l 'ignore-platform-reqs' -d 'Ignore platform requirements (php & ext- packages).'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l stability -d 'Minimum-stability allowed (unless a version is specified).'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l prefer-source -d 'Forces installation from package sources when possible, including VCS information.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l prefer-dist -d 'Forces installation from package dist even for dev versions.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l repository -d 'Pick a different repository (as url or json config) to look for the package.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l repository-url -d 'DEPRECATED: Use --repository instead.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l dev -d 'Enables installation of require-dev packages (enabled by default, only present for BC).'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l no-dev -d 'Disables installation of require-dev packages.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l no-custom-installers -d 'DEPRECATED: Use no-plugins instead.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l no-scripts -d 'Whether to prevent execution of all defined scripts in the root package.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l no-progress -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l no-secure-http -d 'Disable the secure-http config option temporarily while installing the root package. Use at your own risk. Using this flag is a bad idea.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l keep-vcs -d 'Whether to prevent deleting the vcs folder.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l remove-vcs -d 'Whether to force deletion of the vcs folder without prompting.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l no-install -d 'Whether to skip installation of the package dependencies.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l ignore-platform-reqs -d 'Ignore platform requirements (php & ext- packages).'
 
 # depends
 complete -f -c composer -n '__fish_composer_using_command depends' -a "(__fish_composer_installed_packages)"
-complete -f -c composer -n '__fish_composer_using_command depends' -l 'recursive' -d 'Recursively resolves up to the root package'
-complete -f -c composer -n '__fish_composer_using_command depends' -l 'tree' -d 'Prints the results as a nested tree'
+complete -f -c composer -n '__fish_composer_using_command depends' -l recursive -d 'Recursively resolves up to the root package'
+complete -f -c composer -n '__fish_composer_using_command depends' -l tree -d 'Prints the results as a nested tree'
 
 # dump-autoload
-complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l 'no-scripts' -d 'Skips the execution of all scripts defined in composer.json file.'
-complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l 'optimize' -d 'Optimizes PSR0 and PSR4 packages to be loaded with classmaps too, good for production.'
-complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l 'classmap-authoritative' -d 'Autoload classes from the classmap only. Implicitly enables `--optimize`.'
-complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l 'apcu' -d 'Use APCu to cache found/not-found classes.'
-complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l 'no-dev' -d 'Disables autoload-dev rules.'
+complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l no-scripts -d 'Skips the execution of all scripts defined in composer.json file.'
+complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l optimize -d 'Optimizes PSR0 and PSR4 packages to be loaded with classmaps too, good for production.'
+complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l classmap-authoritative -d 'Autoload classes from the classmap only. Implicitly enables `--optimize`.'
+complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l apcu -d 'Use APCu to cache found/not-found classes.'
+complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l no-dev -d 'Disables autoload-dev rules.'
 
 # exec
-complete -f -c composer -n '__fish_composer_using_command exec' -l 'list'
+complete -f -c composer -n '__fish_composer_using_command exec' -l list
 
 # help
 complete -f -c composer -n '__fish_composer_using_command help' -a "$composer_cmds"
-complete -f -c composer -n '__fish_composer_using_command help' -l 'xml' -d 'To output help as XML'
-complete -f -c composer -n '__fish_composer_using_command help' -l 'format' -d 'The output format (txt, xml, json, or md)'
-complete -f -c composer -n '__fish_composer_using_command help' -l 'raw' -d 'To output raw command help'
+complete -f -c composer -n '__fish_composer_using_command help' -l xml -d 'To output help as XML'
+complete -f -c composer -n '__fish_composer_using_command help' -l format -d 'The output format (txt, xml, json, or md)'
+complete -f -c composer -n '__fish_composer_using_command help' -l raw -d 'To output raw command help'
 
 # init
-complete -f -c composer -n '__fish_composer_using_command init' -l 'name' -d 'Name of the package'
-complete -f -c composer -n '__fish_composer_using_command init' -l 'description' -d 'Description of package'
-complete -f -c composer -n '__fish_composer_using_command init' -l 'author' -d 'Author name of package'
-complete -f -c composer -n '__fish_composer_using_command init' -l 'type' -d 'Type of package (e.g. library, project, metapackage, composer-plugin)'
-complete -f -c composer -n '__fish_composer_using_command init' -l 'homepage' -d 'Homepage of package'
-complete -f -c composer -n '__fish_composer_using_command init' -l 'require' -d 'Package to require with a version constraint, e.g. foo/bar:1.0.0 or foo/bar=1.0.0 or "foo/bar 1.0.0"'
-complete -f -c composer -n '__fish_composer_using_command init' -l 'require-dev' -d 'Package to require for development with a version constraint, e.g. foo/bar:1.0.0 or foo/bar=1.0.0 or "foo/bar 1.0.0"'
-complete -f -c composer -n '__fish_composer_using_command init' -l 'stability' -d 'Minimum stability (empty or one of: stable, RC, beta, alpha, dev)'
-complete -f -c composer -n '__fish_composer_using_command init' -l 'license' -d 'License of package'
-complete -f -c composer -n '__fish_composer_using_command init' -l 'repository' -d 'Add custom repositories, either by URL or using JSON arrays'
+complete -f -c composer -n '__fish_composer_using_command init' -l name -d 'Name of the package'
+complete -f -c composer -n '__fish_composer_using_command init' -l description -d 'Description of package'
+complete -f -c composer -n '__fish_composer_using_command init' -l author -d 'Author name of package'
+complete -f -c composer -n '__fish_composer_using_command init' -l type -d 'Type of package (e.g. library, project, metapackage, composer-plugin)'
+complete -f -c composer -n '__fish_composer_using_command init' -l homepage -d 'Homepage of package'
+complete -f -c composer -n '__fish_composer_using_command init' -l require -d 'Package to require with a version constraint, e.g. foo/bar:1.0.0 or foo/bar=1.0.0 or "foo/bar 1.0.0"'
+complete -f -c composer -n '__fish_composer_using_command init' -l require-dev -d 'Package to require for development with a version constraint, e.g. foo/bar:1.0.0 or foo/bar=1.0.0 or "foo/bar 1.0.0"'
+complete -f -c composer -n '__fish_composer_using_command init' -l stability -d 'Minimum stability (empty or one of: stable, RC, beta, alpha, dev)'
+complete -f -c composer -n '__fish_composer_using_command init' -l license -d 'License of package'
+complete -f -c composer -n '__fish_composer_using_command init' -l repository -d 'Add custom repositories, either by URL or using JSON arrays'
 
 # install
-complete -f -c composer -n '__fish_composer_using_command install' -l 'prefer-source' -d 'Forces installation from package sources when possible, including VCS information.'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'prefer-dist' -d 'Forces installation from package dist even for dev versions.'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'dry-run' -d 'Outputs the operations but will not execute anything (implicitly enables --verbose).'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'dev' -d 'Enables installation of require-dev packages (enabled by default, only present for BC).'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'no-dev' -d 'Disables installation of require-dev packages.'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'no-custom-installers' -d 'DEPRECATED: Use no-plugins instead.'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'no-autoloader' -d 'Skips autoloader generation'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'no-scripts' -d 'Skips the execution of all scripts defined in composer.json file.'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'no-progress' -d 'Do not output download progress.'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'no-suggest' -d 'Do not show package suggestions.'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'optimize-autoloader' -d 'Optimize autoloader during autoloader dump'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'classmap-authoritative' -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'apcu-autoloader' -d 'Use APCu to cache found/not-found classes.'
-complete -f -c composer -n '__fish_composer_using_command install' -l 'ignore-platform-reqs' -d 'Ignore platform requirements (php & ext- packages).'
+complete -f -c composer -n '__fish_composer_using_command install' -l prefer-source -d 'Forces installation from package sources when possible, including VCS information.'
+complete -f -c composer -n '__fish_composer_using_command install' -l prefer-dist -d 'Forces installation from package dist even for dev versions.'
+complete -f -c composer -n '__fish_composer_using_command install' -l dry-run -d 'Outputs the operations but will not execute anything (implicitly enables --verbose).'
+complete -f -c composer -n '__fish_composer_using_command install' -l dev -d 'Enables installation of require-dev packages (enabled by default, only present for BC).'
+complete -f -c composer -n '__fish_composer_using_command install' -l no-dev -d 'Disables installation of require-dev packages.'
+complete -f -c composer -n '__fish_composer_using_command install' -l no-custom-installers -d 'DEPRECATED: Use no-plugins instead.'
+complete -f -c composer -n '__fish_composer_using_command install' -l no-autoloader -d 'Skips autoloader generation'
+complete -f -c composer -n '__fish_composer_using_command install' -l no-scripts -d 'Skips the execution of all scripts defined in composer.json file.'
+complete -f -c composer -n '__fish_composer_using_command install' -l no-progress -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command install' -l no-suggest -d 'Do not show package suggestions.'
+complete -f -c composer -n '__fish_composer_using_command install' -l optimize-autoloader -d 'Optimize autoloader during autoloader dump'
+complete -f -c composer -n '__fish_composer_using_command install' -l classmap-authoritative -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
+complete -f -c composer -n '__fish_composer_using_command install' -l apcu-autoloader -d 'Use APCu to cache found/not-found classes.'
+complete -f -c composer -n '__fish_composer_using_command install' -l ignore-platform-reqs -d 'Ignore platform requirements (php & ext- packages).'
 
 # licenses
-complete -f -c composer -n '__fish_composer_using_command licenses' -l 'format' -d 'Format of the output: text or json'
-complete -f -c composer -n '__fish_composer_using_command licenses' -l 'no-dev' -d 'Disables search in require-dev packages.'
+complete -f -c composer -n '__fish_composer_using_command licenses' -l format -d 'Format of the output: text or json'
+complete -f -c composer -n '__fish_composer_using_command licenses' -l no-dev -d 'Disables search in require-dev packages.'
 
 # list
-complete -f -c composer -n '__fish_composer_using_command list' -l 'xml' -d 'To output list as XML'
-complete -f -c composer -n '__fish_composer_using_command list' -l 'raw' -d 'To output raw command list'
-complete -f -c composer -n '__fish_composer_using_command list' -l 'format' -d 'The output format (txt, xml, json, or md)'
+complete -f -c composer -n '__fish_composer_using_command list' -l xml -d 'To output list as XML'
+complete -f -c composer -n '__fish_composer_using_command list' -l raw -d 'To output raw command list'
+complete -f -c composer -n '__fish_composer_using_command list' -l format -d 'The output format (txt, xml, json, or md)'
 
 # outdated
-complete -f -c composer -n '__fish_composer_using_command outdated' -l 'outdated' -d 'Show only packages that are outdated (this is the default, but present here for compat with `show`'
-complete -f -c composer -n '__fish_composer_using_command outdated' -l 'all' -d 'Show all installed packages with their latest versions'
-complete -f -c composer -n '__fish_composer_using_command outdated' -l 'direct' -d 'Shows only packages that are directly required by the root package'
-complete -f -c composer -n '__fish_composer_using_command outdated' -l 'strict' -d 'Return a non-zero exit code when there are outdated packages'
-complete -f -c composer -n '__fish_composer_using_command outdated' -l 'minor-only' -d 'Show only packages that have minor SemVer-compatible updates. Use with the --outdated option.'
-complete -f -c composer -n '__fish_composer_using_command outdated' -l 'format' -d 'Format of the output: text or json'
-complete -f -c composer -n '__fish_composer_using_command outdated' -l 'ignore' -d 'Ignore specified package(s). Use it with the --outdated option if you don\'t want to be informed about new versions of some packages.'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l outdated -d 'Show only packages that are outdated (this is the default, but present here for compat with `show`'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l all -d 'Show all installed packages with their latest versions'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l direct -d 'Shows only packages that are directly required by the root package'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l strict -d 'Return a non-zero exit code when there are outdated packages'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l minor-only -d 'Show only packages that have minor SemVer-compatible updates. Use with the --outdated option.'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l format -d 'Format of the output: text or json'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l ignore -d 'Ignore specified package(s). Use it with the --outdated option if you don\'t want to be informed about new versions of some packages.'
 
 # prohibits
-complete -f -c composer -n '__fish_composer_using_command prohibits' -l 'recursive' -d 'Recursively resolves up to the root package'
-complete -f -c composer -n '__fish_composer_using_command prohibits' -l 'tree' -d 'Prints the results as a nested tree'
+complete -f -c composer -n '__fish_composer_using_command prohibits' -l recursive -d 'Recursively resolves up to the root package'
+complete -f -c composer -n '__fish_composer_using_command prohibits' -l tree -d 'Prints the results as a nested tree'
 
 # remove
 complete -f -c composer -n '__fish_composer_using_command remove' -a "(__fish_composer_required_packages)"
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'dev' -d 'Removes a package from the require-dev section.'
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'no-progress' -d 'Do not output download progress.'
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'no-update' -d 'Disables the automatic update of the dependencies.'
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'no-scripts' -d 'Skips the execution of all scripts defined in composer.json file.'
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'update-no-dev' -d 'Run the dependency update with the --no-dev option.'
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'update-with-dependencies' -d 'Allows inherited dependencies to be updated with explicit dependencies. (Deprecrated, is now default behavior)'
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'no-update-with-dependencies' -d 'Does not allow inherited dependencies to be updated with explicit dependencies.'
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'ignore-platform-reqs' -d 'Ignore platform requirements (php & ext- packages).'
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'optimize-autoloader' -d 'Optimize autoloader during autoloader dump'
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'classmap-authoritative' -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
-complete -f -c composer -n '__fish_composer_using_command remove' -l 'apcu-autoloader' -d 'Use APCu to cache found/not-found classes.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l dev -d 'Removes a package from the require-dev section.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l no-progress -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l no-update -d 'Disables the automatic update of the dependencies.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l no-scripts -d 'Skips the execution of all scripts defined in composer.json file.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l update-no-dev -d 'Run the dependency update with the --no-dev option.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l update-with-dependencies -d 'Allows inherited dependencies to be updated with explicit dependencies. (Deprecrated, is now default behavior)'
+complete -f -c composer -n '__fish_composer_using_command remove' -l no-update-with-dependencies -d 'Does not allow inherited dependencies to be updated with explicit dependencies.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l ignore-platform-reqs -d 'Ignore platform requirements (php & ext- packages).'
+complete -f -c composer -n '__fish_composer_using_command remove' -l optimize-autoloader -d 'Optimize autoloader during autoloader dump'
+complete -f -c composer -n '__fish_composer_using_command remove' -l classmap-authoritative -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l apcu-autoloader -d 'Use APCu to cache found/not-found classes.'
 
 # require
-complete -f -c composer -n '__fish_composer_using_command require' -l 'dev' -d 'Add requirement to require-dev.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'prefer-source' -d 'Forces installation from package sources when possible, including VCS information.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'prefer-dist' -d 'Forces installation from package dist even for dev versions.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'no-progress' -d 'Do not output download progress.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'no-suggest' -d 'Do not show package suggestions.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'no-update' -d 'Disables the automatic update of the dependencies.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'no-scripts' -d 'Skips the execution of all scripts defined in composer.json file.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'update-no-dev' -d 'Run the dependency update with the --no-dev option.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'update-with-dependencies' -d 'Allows inherited dependencies to be updated, except those that are root requirements.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'update-with-all-dependencies' -d 'Allows all inherited dependencies to be updated, including those that are root requirements.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'ignore-platform-reqs' -d 'Ignore platform requirements (php & ext- packages).'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'prefer-stable' -d 'Prefer stable versions of dependencies.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'prefer-lowest' -d 'Prefer lowest versions of dependencies.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'sort-packages' -d 'Sorts packages when adding/updating a new dependency'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'optimize-autoloader' -d 'Optimize autoloader during autoloader dump'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'classmap-authoritative' -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
-complete -f -c composer -n '__fish_composer_using_command require' -l 'apcu-autoloader' -d 'Use APCu to cache found/not-found classes.'
+complete -f -c composer -n '__fish_composer_using_command require' -l dev -d 'Add requirement to require-dev.'
+complete -f -c composer -n '__fish_composer_using_command require' -l prefer-source -d 'Forces installation from package sources when possible, including VCS information.'
+complete -f -c composer -n '__fish_composer_using_command require' -l prefer-dist -d 'Forces installation from package dist even for dev versions.'
+complete -f -c composer -n '__fish_composer_using_command require' -l no-progress -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command require' -l no-suggest -d 'Do not show package suggestions.'
+complete -f -c composer -n '__fish_composer_using_command require' -l no-update -d 'Disables the automatic update of the dependencies.'
+complete -f -c composer -n '__fish_composer_using_command require' -l no-scripts -d 'Skips the execution of all scripts defined in composer.json file.'
+complete -f -c composer -n '__fish_composer_using_command require' -l update-no-dev -d 'Run the dependency update with the --no-dev option.'
+complete -f -c composer -n '__fish_composer_using_command require' -l update-with-dependencies -d 'Allows inherited dependencies to be updated, except those that are root requirements.'
+complete -f -c composer -n '__fish_composer_using_command require' -l update-with-all-dependencies -d 'Allows all inherited dependencies to be updated, including those that are root requirements.'
+complete -f -c composer -n '__fish_composer_using_command require' -l ignore-platform-reqs -d 'Ignore platform requirements (php & ext- packages).'
+complete -f -c composer -n '__fish_composer_using_command require' -l prefer-stable -d 'Prefer stable versions of dependencies.'
+complete -f -c composer -n '__fish_composer_using_command require' -l prefer-lowest -d 'Prefer lowest versions of dependencies.'
+complete -f -c composer -n '__fish_composer_using_command require' -l sort-packages -d 'Sorts packages when adding/updating a new dependency'
+complete -f -c composer -n '__fish_composer_using_command require' -l optimize-autoloader -d 'Optimize autoloader during autoloader dump'
+complete -f -c composer -n '__fish_composer_using_command require' -l classmap-authoritative -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
+complete -f -c composer -n '__fish_composer_using_command require' -l apcu-autoloader -d 'Use APCu to cache found/not-found classes.'
 
 # search
-complete -f -c composer -n '__fish_composer_using_command search' -l 'only-name' -d 'Search only in name'
-complete -f -c composer -n '__fish_composer_using_command search' -l 'type' -d 'Search for a specific package type'
+complete -f -c composer -n '__fish_composer_using_command search' -l only-name -d 'Search only in name'
+complete -f -c composer -n '__fish_composer_using_command search' -l type -d 'Search for a specific package type'
 
 # self-update
-complete -f -c composer -n '__fish_composer_using_command self-update' -l 'rollback' -d 'Revert to an older installation of composer'
-complete -f -c composer -n '__fish_composer_using_command self-update' -l 'clean-backups' -d 'Delete old backups during an update. This makes the current version of composer the only backup available after the update'
-complete -f -c composer -n '__fish_composer_using_command self-update' -l 'no-progress' -d 'Do not output download progress.'
-complete -f -c composer -n '__fish_composer_using_command self-update' -l 'update-keys' -d 'Prompt user for a key update'
-complete -f -c composer -n '__fish_composer_using_command self-update' -l 'stable' -d 'Force an update to the stable channel'
-complete -f -c composer -n '__fish_composer_using_command self-update' -l 'preview' -d 'Force an update to the preview channel'
-complete -f -c composer -n '__fish_composer_using_command self-update' -l 'snapshot' -d 'Force an update to the snapshot channel'
-complete -f -c composer -n '__fish_composer_using_command self-update' -l 'set-channel-only' -d 'Only store the channel as the default one and then exit'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l rollback -d 'Revert to an older installation of composer'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l clean-backups -d 'Delete old backups during an update. This makes the current version of composer the only backup available after the update'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l no-progress -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l update-keys -d 'Prompt user for a key update'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l stable -d 'Force an update to the stable channel'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l preview -d 'Force an update to the preview channel'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l snapshot -d 'Force an update to the snapshot channel'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l set-channel-only -d 'Only store the channel as the default one and then exit'
 
 # show
 complete -f -c composer -n '__fish_composer_using_command show' -a "(__fish_composer_installed_packages)"
-complete -f -c composer -n '__fish_composer_using_command show' -l 'all' -d 'List all packages'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'installed' -d 'List installed packages only (enabled by default, only present for BC).'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'platform' -d 'List platform packages only'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'available' -d 'List available packages only'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'self' -d 'Show the root package information'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'name-only' -d 'List package names only'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'path' -d 'Show package paths'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'tree' -d 'List the dependencies as a tree'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'latest' -d 'Show the latest version'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'outdated' -d 'Show the latest version but only for packages that are outdated'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'ignore' -d 'Ignore specified package(s). Use it with the --outdated option if you don\'t want to be informed about new versions of some packages.'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'minor-only' -d 'Show only packages that have minor SemVer-compatible updates. Use with the --outdated option.'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'direct' -d 'Shows only packages that are directly required by the root package'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'strict' -d 'Return a non-zero exit code when there are outdated packages'
-complete -f -c composer -n '__fish_composer_using_command show' -l 'format' -d 'Format of the output: text or json'
+complete -f -c composer -n '__fish_composer_using_command show' -l all -d 'List all packages'
+complete -f -c composer -n '__fish_composer_using_command show' -l installed -d 'List installed packages only (enabled by default, only present for BC).'
+complete -f -c composer -n '__fish_composer_using_command show' -l platform -d 'List platform packages only'
+complete -f -c composer -n '__fish_composer_using_command show' -l available -d 'List available packages only'
+complete -f -c composer -n '__fish_composer_using_command show' -l self -d 'Show the root package information'
+complete -f -c composer -n '__fish_composer_using_command show' -l name-only -d 'List package names only'
+complete -f -c composer -n '__fish_composer_using_command show' -l path -d 'Show package paths'
+complete -f -c composer -n '__fish_composer_using_command show' -l tree -d 'List the dependencies as a tree'
+complete -f -c composer -n '__fish_composer_using_command show' -l latest -d 'Show the latest version'
+complete -f -c composer -n '__fish_composer_using_command show' -l outdated -d 'Show the latest version but only for packages that are outdated'
+complete -f -c composer -n '__fish_composer_using_command show' -l ignore -d 'Ignore specified package(s). Use it with the --outdated option if you don\'t want to be informed about new versions of some packages.'
+complete -f -c composer -n '__fish_composer_using_command show' -l minor-only -d 'Show only packages that have minor SemVer-compatible updates. Use with the --outdated option.'
+complete -f -c composer -n '__fish_composer_using_command show' -l direct -d 'Shows only packages that are directly required by the root package'
+complete -f -c composer -n '__fish_composer_using_command show' -l strict -d 'Return a non-zero exit code when there are outdated packages'
+complete -f -c composer -n '__fish_composer_using_command show' -l format -d 'Format of the output: text or json'
 
 # suggests
-complete -f -c composer -n '__fish_composer_using_command suggests' -l 'by-package' -d 'Groups output by suggesting package'
-complete -f -c composer -n '__fish_composer_using_command suggests' -l 'by-suggestion' -d 'Groups output by suggested package'
-complete -f -c composer -n '__fish_composer_using_command suggests' -l 'no-dev' -d 'Exclude suggestions from require-dev packages'
+complete -f -c composer -n '__fish_composer_using_command suggests' -l by-package -d 'Groups output by suggesting package'
+complete -f -c composer -n '__fish_composer_using_command suggests' -l by-suggestion -d 'Groups output by suggested package'
+complete -f -c composer -n '__fish_composer_using_command suggests' -l no-dev -d 'Exclude suggestions from require-dev packages'
 
 # update
 complete -f -c composer -n '__fish_composer_using_command update' -a "(__fish_composer_required_packages)"
-complete -f -c composer -n '__fish_composer_using_command update' -l 'prefer-source' -d 'Forces installation from package sources when possible, including VCS information.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'prefer-dist' -d 'Forces installation from package dist even for dev versions.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'dry-run' -d 'Outputs the operations but will not execute anything (implicitly enables --verbose).'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'dev' -d 'Enables installation of require-dev packages (enabled by default, only present for BC).'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'no-dev' -d 'Disables installation of require-dev packages.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'lock' -d 'Only updates the lock file hash to suppress warning about the lock file being out of date.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'no-custom-installers' -d 'DEPRECATED: Use no-plugins instead.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'no-autoloader' -d 'Skips autoloader generation'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'no-scripts' -d 'Skips the execution of all scripts defined in composer.json file.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'no-progress' -d 'Do not output download progress.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'no-suggest' -d 'Do not show package suggestions.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'with-dependencies' -d 'Add also dependencies of whitelisted packages to the whitelist, except those defined in root package.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'with-all-dependencies' -d 'Add also all dependencies of whitelisted packages to the whitelist, including those defined in root package.'
-complete -f -c composer -n '__fish_composer_using_command update' -s 'v' -l 'verbose' -d 'Shows more details including new commits pulled in when updating packages.'
-complete -f -c composer -n '__fish_composer_using_command update' -s 'o' -l 'optimize-autoloader' -d 'Optimize autoloader during autoloader dump.'
-complete -f -c composer -n '__fish_composer_using_command update' -s 'a' -l 'classmap-authoritative' -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'apcu-autoloader' -d 'Use APCu to cache found/not-found classes.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'ignore-platform-reqs' -d 'Ignore platform requirements (php & ext- packages).'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'prefer-stable' -d 'Prefer stable versions of dependencies.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'prefer-lowest' -d 'Prefer lowest versions of dependencies.'
-complete -f -c composer -n '__fish_composer_using_command update' -s 'i' -l 'interactive' -d 'Interactive interface with autocompletion to select the packages to update.'
-complete -f -c composer -n '__fish_composer_using_command update' -l 'root-reqs' -d 'Restricts the update to your first degree dependencies.'
+complete -f -c composer -n '__fish_composer_using_command update' -l prefer-source -d 'Forces installation from package sources when possible, including VCS information.'
+complete -f -c composer -n '__fish_composer_using_command update' -l prefer-dist -d 'Forces installation from package dist even for dev versions.'
+complete -f -c composer -n '__fish_composer_using_command update' -l dry-run -d 'Outputs the operations but will not execute anything (implicitly enables --verbose).'
+complete -f -c composer -n '__fish_composer_using_command update' -l dev -d 'Enables installation of require-dev packages (enabled by default, only present for BC).'
+complete -f -c composer -n '__fish_composer_using_command update' -l no-dev -d 'Disables installation of require-dev packages.'
+complete -f -c composer -n '__fish_composer_using_command update' -l lock -d 'Only updates the lock file hash to suppress warning about the lock file being out of date.'
+complete -f -c composer -n '__fish_composer_using_command update' -l no-custom-installers -d 'DEPRECATED: Use no-plugins instead.'
+complete -f -c composer -n '__fish_composer_using_command update' -l no-autoloader -d 'Skips autoloader generation'
+complete -f -c composer -n '__fish_composer_using_command update' -l no-scripts -d 'Skips the execution of all scripts defined in composer.json file.'
+complete -f -c composer -n '__fish_composer_using_command update' -l no-progress -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command update' -l no-suggest -d 'Do not show package suggestions.'
+complete -f -c composer -n '__fish_composer_using_command update' -l with-dependencies -d 'Add also dependencies of whitelisted packages to the whitelist, except those defined in root package.'
+complete -f -c composer -n '__fish_composer_using_command update' -l with-all-dependencies -d 'Add also all dependencies of whitelisted packages to the whitelist, including those defined in root package.'
+complete -f -c composer -n '__fish_composer_using_command update' -s v -l verbose -d 'Shows more details including new commits pulled in when updating packages.'
+complete -f -c composer -n '__fish_composer_using_command update' -s o -l optimize-autoloader -d 'Optimize autoloader during autoloader dump.'
+complete -f -c composer -n '__fish_composer_using_command update' -s a -l classmap-authoritative -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
+complete -f -c composer -n '__fish_composer_using_command update' -l apcu-autoloader -d 'Use APCu to cache found/not-found classes.'
+complete -f -c composer -n '__fish_composer_using_command update' -l ignore-platform-reqs -d 'Ignore platform requirements (php & ext- packages).'
+complete -f -c composer -n '__fish_composer_using_command update' -l prefer-stable -d 'Prefer stable versions of dependencies.'
+complete -f -c composer -n '__fish_composer_using_command update' -l prefer-lowest -d 'Prefer lowest versions of dependencies.'
+complete -f -c composer -n '__fish_composer_using_command update' -s i -l interactive -d 'Interactive interface with autocompletion to select the packages to update.'
+complete -f -c composer -n '__fish_composer_using_command update' -l root-reqs -d 'Restricts the update to your first degree dependencies.'
 
 # validate
-complete -f -c composer -n '__fish_composer_using_command validate' -l 'no-check-all' -d 'Do not validate requires for overly strict/loose constraints'
-complete -f -c composer -n '__fish_composer_using_command validate' -l 'no-check-lock' -d 'Do not check if lock file is up to date'
-complete -f -c composer -n '__fish_composer_using_command validate' -l 'no-check-publish' -d 'Do not check for publish errors'
-complete -f -c composer -n '__fish_composer_using_command validate' -l 'with-dependencies' -d 'Also validate the composer.json of all installed dependencies'
-complete -f -c composer -n '__fish_composer_using_command validate' -l 'strict' -d 'Return a non-zero exit code for warnings as well as errors'
+complete -f -c composer -n '__fish_composer_using_command validate' -l no-check-all -d 'Do not validate requires for overly strict/loose constraints'
+complete -f -c composer -n '__fish_composer_using_command validate' -l no-check-lock -d 'Do not check if lock file is up to date'
+complete -f -c composer -n '__fish_composer_using_command validate' -l no-check-publish -d 'Do not check for publish errors'
+complete -f -c composer -n '__fish_composer_using_command validate' -l with-dependencies -d 'Also validate the composer.json of all installed dependencies'
+complete -f -c composer -n '__fish_composer_using_command validate' -l strict -d 'Return a non-zero exit code for warnings as well as errors'
 
 # why
 complete -f -c composer -n '__fish_composer_using_command why' -a "(__fish_composer_installed_packages)"
@@ -328,14 +328,14 @@ complete -f -c composer -n '__fish_composer_using_command why' -a "(__fish_compo
 complete -f -c composer -n '__fish_composer_using_command why-not' -a "(__fish_composer_installed_packages)"
 
 # global options
-complete -c composer -n '__fish_composer_needs_command' -s 'h' -l 'help' -d 'Displays composer\'s help.'
-complete -c composer -n '__fish_composer_needs_command' -s 'q' -l 'quiet' -d 'Do not output any message.'
-complete -c composer -n '__fish_composer_needs_command' -s 'v' -l 'verbose' -d 'Increase the verbosity of messages: 1 for normal output (-v), 2 for more verbose output (-vv) and 3 for debug (-vvv).'
-complete -c composer -n '__fish_composer_needs_command' -s 'V' -l 'version' -d 'Display composer\'s application version.'
-complete -c composer -n '__fish_composer_needs_command' -l 'ansi' -d 'Force ANSI output.'
-complete -c composer -n '__fish_composer_needs_command' -l 'no-ansi' -d 'Disable ANSI output.'
-complete -c composer -n '__fish_composer_needs_command' -s 'n' -l 'no-interaction' -d 'Do not ask any interactive question.'
-complete -c composer -n '__fish_composer_needs_command' -l 'profile' -d 'Display timing and memory usage information.'
-complete -c composer -n '__fish_composer_needs_command' -l 'no-plugins' -d 'Whether to disable plugins.'
-complete -c composer -n '__fish_composer_needs_command' -s 'd' -l 'working-dir' -d 'If specified, use the given directory as working directory.'
-complete -c composer -n '__fish_composer_needs_command' -l 'no-cache' -d 'Prevent use of the cache.'
+complete -c composer -n __fish_composer_needs_command -s h -l help -d 'Displays composer\'s help.'
+complete -c composer -n __fish_composer_needs_command -s q -l quiet -d 'Do not output any message.'
+complete -c composer -n __fish_composer_needs_command -s v -l verbose -d 'Increase the verbosity of messages: 1 for normal output (-v), 2 for more verbose output (-vv) and 3 for debug (-vvv).'
+complete -c composer -n __fish_composer_needs_command -s V -l version -d 'Display composer\'s application version.'
+complete -c composer -n __fish_composer_needs_command -l ansi -d 'Force ANSI output.'
+complete -c composer -n __fish_composer_needs_command -l no-ansi -d 'Disable ANSI output.'
+complete -c composer -n __fish_composer_needs_command -s n -l no-interaction -d 'Do not ask any interactive question.'
+complete -c composer -n __fish_composer_needs_command -l profile -d 'Display timing and memory usage information.'
+complete -c composer -n __fish_composer_needs_command -l no-plugins -d 'Whether to disable plugins.'
+complete -c composer -n __fish_composer_needs_command -s d -l working-dir -d 'If specified, use the given directory as working directory.'
+complete -c composer -n __fish_composer_needs_command -l no-cache -d 'Prevent use of the cache.'
diff --git a/share/completions/conda.fish b/share/completions/conda.fish
index c969233b7..d89e87a9c 100644
--- a/share/completions/conda.fish
+++ b/share/completions/conda.fish
@@ -102,8 +102,8 @@ __fish_conda config -l remove-key -x -a "(__fish_conda_config_keys)" -d "Remove
 __fish_conda config -l stdin -d "Apply configuration given in yaml format from stdin"
 
 # 'help' command
-__fish_conda "help" -d "Displays a list of available conda commands and their help strings"
-__fish_conda "help" -x -a "$__fish_conda_commands"
+__fish_conda help -d "Displays a list of available conda commands and their help strings"
+__fish_conda help -x -a "$__fish_conda_commands"
 
 # 'info' command
 __fish_conda info -l offline -d "Offline mode, don't connect to the Internet."
diff --git a/share/completions/configure.fish b/share/completions/configure.fish
index 017e7b3dd..00ca63fbe 100644
--- a/share/completions/configure.fish
+++ b/share/completions/configure.fish
@@ -85,7 +85,7 @@ complete -c configure -l host -d "Cross-compile to build programs to run on HOST
 complete -c configure -l target -d "Configure for building compilers for TARGET" -x
 
 # use autoconf's --help to generate completions:
-complete -c 'configure' -a '(for tok in (commandline -opc)
+complete -c configure -a '(for tok in (commandline -opc)
     if string match -q "*configure" -- $tok
         __fish_parse_configure $tok
         break
diff --git a/share/completions/connmanctl.fish b/share/completions/connmanctl.fish
index 197364fb4..1dd431661 100644
--- a/share/completions/connmanctl.fish
+++ b/share/completions/connmanctl.fish
@@ -19,31 +19,31 @@ function __fish_print_connman_vpnconnections
 end
 
 # connmanctl does not accept options before commands, so requiring the commands to be in second position is okay
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "state" -d "Shows if the system is online or offline"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "technologies" -d "Display technologies"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "clock" -d "Get System Clock Properties"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "enable" -d "Enables given technology or offline mode"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a state -d "Shows if the system is online or offline"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a technologies -d "Display technologies"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a clock -d "Get System Clock Properties"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a enable -d "Enables given technology or offline mode"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] enable" -a "(__fish_print_connman_technologies) offline"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "disable" -d "Disables given technology or offline mode"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a disable -d "Disables given technology or offline mode"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] disable" -a "(__fish_print_connman_technologies) offline"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "tether" -d "Enable, disable tethering, set SSID and passphrase for wifi"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a tether -d "Enable, disable tethering, set SSID and passphrase for wifi"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] tether" -a "(__fish_print_connman_technologies)"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 3; and contains -- (commandline -opc)[2] tether" -a "on off"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "services" -d "Display services"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a services -d "Display services"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] services" -a "(__fish_print_connman_services)"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "peers" -d "Display peers"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "scan" -d "Scans for new services for given technology"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a peers -d "Display peers"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a scan -d "Scans for new services for given technology"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] scan" -a "(__fish_print_connman_technologies)"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "connect" -d "Connect a given service or peer"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a connect -d "Connect a given service or peer"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] connect" -a "(__fish_print_connman_services)"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "disconnect" -d "Disconnect a given service or peer"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a disconnect -d "Disconnect a given service or peer"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] disconnect" -a "(__fish_print_connman_services)"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "config" -d "Set service configuration options"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a config -d "Set service configuration options"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] config" -a "(__fish_print_connman_services)"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "monitor" -d "Monitor signals from interfaces"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "vpnconnections" -d "Display VPN connections"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a monitor -d "Monitor signals from interfaces"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a vpnconnections -d "Display VPN connections"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] vpnconnections" -a "(__fish_print_connman_vpnconnections)"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "session" -d "Enable or disable a session"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a session -d "Enable or disable a session"
 complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] session" -a "on off connect disconnect config"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "peer_service" -d "(Un)Register a Peer Service"
-complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "help" -d "Show help"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a peer_service -d "(Un)Register a Peer Service"
+complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a help -d "Show help"
diff --git a/share/completions/csc.fish b/share/completions/csc.fish
index 669163e37..bca19722f 100644
--- a/share/completions/csc.fish
+++ b/share/completions/csc.fish
@@ -7,7 +7,7 @@ for bytes in 512 1024 2048 4096 8192
 end
 
 complete -c csc -s o -o "o+" -o optimize -o "optimize+" -d "Enable optimizations"
-complete -c csc -o "o-" -o "optimize-" -d "Disable optimizations"
+complete -c csc -o o- -o optimize- -d "Disable optimizations"
 
 # Output Files
 complete -c csc -o deterministic -d "Causes the compiler to output an assembly whose binary content is identical across compilations if inputs are identical"
@@ -36,12 +36,12 @@ complete -c csc -o "modulename:" -d "Specify the name of the source module"
 # .NET Framework Assemblies
 complete -c csc -o "addmodule:" -d "Specifies one or more modules to be part of this assembly"
 complete -c csc -o delaysign -o "delaysign+" -d "Instructs the compiler to add the public key but to leave the assembly unsigned"
-complete -c csc -o "delaysign-" -d "Disable -delaysign"
+complete -c csc -o delaysign- -d "Disable -delaysign"
 complete -c csc -o "keycontainer:" -d "Specifies the name of the cryptographic key container"
 complete -c csc -o "keyfile:" -d "Specifies the filename containing the cryptographic key"
 complete -c csc -o "lib:" -d "Specifies the location of assemblies referenced by means of -reference"
 complete -c csc -o nostdlib -o "nostdlib+" -d "Instructs the compiler not to import the standard library (mscorlib.dll)"
-complete -c csc -o "nostdlib-" -d "Disable -nostdlib"
+complete -c csc -o nostdlib- -d "Disable -nostdlib"
 complete -c csc -o publicsign -d "Apply a public key without signing the assembly, but set the bit in the assembly indicating the assembly is signed"
 complete -c csc -o "r:" -o "reference:" -d "Imports metadata from a file that contains an assembly"
 complete -c csc -o "a:" -o "analyzer:" -d "Run the analyzers from this assembly"
@@ -52,13 +52,13 @@ complete -c csc -o "embed:" -d "Embed specific files in the PDB"
 # Debugging/Error Checking
 complete -c csc -o "bugreport:" -d "Creates a file that contains information that makes it easy to report a bug"
 complete -c csc -o checked -o "checked+" -d "Specifies whether integer arithmetic that overflows the bounds of the data type will cause an exception at run time"
-complete -c csc -o "checked-" -d "Disable -checked"
+complete -c csc -o checked- -d "Disable -checked"
 
 complete -c csc -o debug -o "debug+" -d "Instruct the compiler to emit debugging information"
 for arguments in full pdbonly
     complete -c csc -o "debug:$arguments" -d "Instruct the compiler to emit debugging information"
 end
-complete -c csc -o "debug-" -d "Disable -debug"
+complete -c csc -o debug- -d "Disable -debug"
 
 for arguments in none prompt queue send
     complete -c csc -o "errorreport:$arguments" -d "Sets error reporting behavior"
@@ -76,7 +76,7 @@ for warning_level in (seq 0 4)
 end
 
 complete -c csc -o warnaserror -o "warnaserror+" -d "Promotes warnings to errors"
-complete -c csc -o "warnaserror-" -d "Disable -warnaserror"
+complete -c csc -o warnaserror- -d "Disable -warnaserror"
 complete -c csc -o "ruleset:" -d "Specify a ruleset file that disables specific diagnostics"
 
 # Preprocessor
@@ -94,7 +94,7 @@ complete -c csc -s "?" -o help -d "Lists compiler options to stdout"
 complete -c csc -o "baseaddress:" -d "Specifies the preferred base address at which to load a DLL"
 complete -c csc -o "codepage:" -d "Specifies the code page to use for all source code files in the compilation"
 complete -c csc -o highentropyva -o "highentropyva+" -d "Specifies that the executable file supports address space layout randomization (ASLR)"
-complete -c csc -o "highentropyva-" -d "Disable -highentropyva"
+complete -c csc -o highentropyva- -d "Disable -highentropyva"
 
 complete -c csc -o "langversion:?" -d "Display the allowed values for language version"
 complete -c csc -o "langversion:default" -d "Specify latest major version as language version"
@@ -125,6 +125,6 @@ complete -c csc -o "subsystemversion:" -d "Specifies the minimum version of the
 complete -c csc -o unsafe -d "Enables compilation of code that uses the unsafe keyword"
 complete -c csc -o utf8output -d "Displays compiler output using UTF-8 encoding"
 complete -c csc -o parallel -o "parallel+" -d "Specifies whether to use concurrent build"
-complete -c csc -o "parallel-" -d "Disable -parallel"
+complete -c csc -o parallel- -d "Disable -parallel"
 complete -c csc -o "checksumalgorithm:SHA1" -d "Specify SHA1 as the algorithm for calculating the source file checksum stored in PDB (default)"
 complete -c csc -o "checksumalgorithm:SHA256" -d "Specify SHA256 as the algorithm for calculating the source file checksum stored in PDB"
diff --git a/share/completions/cvs.fish b/share/completions/cvs.fish
index 3fbd14f3b..dc9873f3b 100644
--- a/share/completions/cvs.fish
+++ b/share/completions/cvs.fish
@@ -14,63 +14,63 @@
 # Global switches
 #
 
-complete -c cvs -n '__fish_use_subcommand' -s H -d 'Displays usage information for command.'
-complete -c cvs -n '__fish_use_subcommand' -s Q -d 'Cause CVS to be really quiet.'
-complete -c cvs -n '__fish_use_subcommand' -s q -d 'Cause CVS to be somewhat quiet.'
-complete -c cvs -n '__fish_use_subcommand' -s r -d 'Make checked-out files read-only.'
-complete -c cvs -n '__fish_use_subcommand' -s w -d 'Make checked-out files read-write (default).'
-complete -c cvs -n '__fish_use_subcommand' -s n -d 'Do not execute anything that will change the disk.'
-complete -c cvs -n '__fish_use_subcommand' -s t -d 'Show trace of program execution -- try with -n.'
-complete -c cvs -n '__fish_use_subcommand' -s R -d 'Assume repository is read-only, such as CDROM'
-complete -c cvs -n '__fish_use_subcommand' -s v -d 'CVS version and copyright.'
-complete -c cvs -n '__fish_use_subcommand' -s T -x -d 'Use \'tmpdir\' for temporary files.'
-complete -c cvs -n '__fish_use_subcommand' -s e -x -d 'Use \'editor\' for editing log information.'
-complete -c cvs -n '__fish_use_subcommand' -s d -x -d 'Overrides $CVSROOT as the root of the CVS tree.'
-complete -c cvs -n '__fish_use_subcommand' -s f -d 'Do not use the ~/.cvsrc file.'
-complete -c cvs -n '__fish_use_subcommand' -s z -x -d 'Request compression level \'#\' for net traffic.'
-complete -c cvs -n '__fish_use_subcommand' -s x -d 'Encrypt all net traffic.'
-complete -c cvs -n '__fish_use_subcommand' -s a -d 'Authenticate all net traffic.'
-complete -c cvs -n '__fish_use_subcommand' -s 4 -d 'Use IPv4 addresses only.'
-complete -c cvs -n '__fish_use_subcommand' -s 6 -d 'Use IPv6 addresses only.'
-complete -c cvs -n '__fish_use_subcommand' -s s -x -d 'Set CVS user variable.'
+complete -c cvs -n __fish_use_subcommand -s H -d 'Displays usage information for command.'
+complete -c cvs -n __fish_use_subcommand -s Q -d 'Cause CVS to be really quiet.'
+complete -c cvs -n __fish_use_subcommand -s q -d 'Cause CVS to be somewhat quiet.'
+complete -c cvs -n __fish_use_subcommand -s r -d 'Make checked-out files read-only.'
+complete -c cvs -n __fish_use_subcommand -s w -d 'Make checked-out files read-write (default).'
+complete -c cvs -n __fish_use_subcommand -s n -d 'Do not execute anything that will change the disk.'
+complete -c cvs -n __fish_use_subcommand -s t -d 'Show trace of program execution -- try with -n.'
+complete -c cvs -n __fish_use_subcommand -s R -d 'Assume repository is read-only, such as CDROM'
+complete -c cvs -n __fish_use_subcommand -s v -d 'CVS version and copyright.'
+complete -c cvs -n __fish_use_subcommand -s T -x -d 'Use \'tmpdir\' for temporary files.'
+complete -c cvs -n __fish_use_subcommand -s e -x -d 'Use \'editor\' for editing log information.'
+complete -c cvs -n __fish_use_subcommand -s d -x -d 'Overrides $CVSROOT as the root of the CVS tree.'
+complete -c cvs -n __fish_use_subcommand -s f -d 'Do not use the ~/.cvsrc file.'
+complete -c cvs -n __fish_use_subcommand -s z -x -d 'Request compression level \'#\' for net traffic.'
+complete -c cvs -n __fish_use_subcommand -s x -d 'Encrypt all net traffic.'
+complete -c cvs -n __fish_use_subcommand -s a -d 'Authenticate all net traffic.'
+complete -c cvs -n __fish_use_subcommand -s 4 -d 'Use IPv4 addresses only.'
+complete -c cvs -n __fish_use_subcommand -s 6 -d 'Use IPv6 addresses only.'
+complete -c cvs -n __fish_use_subcommand -s s -x -d 'Set CVS user variable.'
 
 #
 # subcommands
 #
 
-complete -c cvs -n '__fish_use_subcommand' -x -a add -d 'Add a new file/directory to the repository'
-complete -c cvs -n '__fish_use_subcommand' -x -a admin -d 'Administration front end for rcs'
-complete -c cvs -n '__fish_use_subcommand' -x -a annotate -d 'Show last revision where each line was modified'
-complete -c cvs -n '__fish_use_subcommand' -x -a checkout -d 'Checkout sources for editing'
-complete -c cvs -n '__fish_use_subcommand' -x -a commit -d 'Check files into the repository'
-complete -c cvs -n '__fish_use_subcommand' -x -a diff -d 'Show differences between revisions'
-complete -c cvs -n '__fish_use_subcommand' -x -a edit -d 'Get ready to edit a watched file'
-complete -c cvs -n '__fish_use_subcommand' -x -a editors -d 'See who is editing a watched file'
-complete -c cvs -n '__fish_use_subcommand' -x -a export -d 'Export sources from CVS, similar to checkout'
-complete -c cvs -n '__fish_use_subcommand' -x -a history -d 'Show repository access history'
-complete -c cvs -n '__fish_use_subcommand' -x -a import -d 'Import sources into CVS, using vendor branches'
-complete -c cvs -n '__fish_use_subcommand' -x -a init -d 'Create a CVS repository if it doesn\'t exist'
-complete -c cvs -n '__fish_use_subcommand' -x -a kserver -d 'Kerberos server mode'
-complete -c cvs -n '__fish_use_subcommand' -x -a log -d 'Print out history information for files'
-complete -c cvs -n '__fish_use_subcommand' -x -a login -d 'Prompt for password for authenticating server'
-complete -c cvs -n '__fish_use_subcommand' -x -a logout -d 'Removes entry in .cvspass for remote repository'
-complete -c cvs -n '__fish_use_subcommand' -x -a ls -d 'List files available from CVS'
-complete -c cvs -n '__fish_use_subcommand' -x -a pserver -d 'Password server mode'
-complete -c cvs -n '__fish_use_subcommand' -x -a rannotate -d 'Show last revision where each line of module was modified'
-complete -c cvs -n '__fish_use_subcommand' -x -a rdiff -d 'Create \'patch\' format diffs between releases'
-complete -c cvs -n '__fish_use_subcommand' -x -a release -d 'Indicate that a Module is no longer in use'
-complete -c cvs -n '__fish_use_subcommand' -x -a remove -d 'Remove an entry from the repository'
-complete -c cvs -n '__fish_use_subcommand' -x -a rlog -d 'Print out history information for a module'
-complete -c cvs -n '__fish_use_subcommand' -x -a rls -d 'List files in a module'
-complete -c cvs -n '__fish_use_subcommand' -x -a rtag -d 'Add a symbolic tag to a module'
-complete -c cvs -n '__fish_use_subcommand' -x -a server -d 'Server mode'
-complete -c cvs -n '__fish_use_subcommand' -x -a status -d 'Display status information on checked out files'
-complete -c cvs -n '__fish_use_subcommand' -x -a tag -d 'Add a symbolic tag to checked out version of files'
-complete -c cvs -n '__fish_use_subcommand' -x -a unedit -d 'Undo an edit command'
-complete -c cvs -n '__fish_use_subcommand' -x -a update -d 'Bring work tree in sync with repository'
-complete -c cvs -n '__fish_use_subcommand' -x -a version -d 'Show current CVS version(s)'
-complete -c cvs -n '__fish_use_subcommand' -x -a watch -d 'Set watches'
-complete -c cvs -n '__fish_use_subcommand' -x -a watchers -d 'See who is watching a file'
+complete -c cvs -n __fish_use_subcommand -x -a add -d 'Add a new file/directory to the repository'
+complete -c cvs -n __fish_use_subcommand -x -a admin -d 'Administration front end for rcs'
+complete -c cvs -n __fish_use_subcommand -x -a annotate -d 'Show last revision where each line was modified'
+complete -c cvs -n __fish_use_subcommand -x -a checkout -d 'Checkout sources for editing'
+complete -c cvs -n __fish_use_subcommand -x -a commit -d 'Check files into the repository'
+complete -c cvs -n __fish_use_subcommand -x -a diff -d 'Show differences between revisions'
+complete -c cvs -n __fish_use_subcommand -x -a edit -d 'Get ready to edit a watched file'
+complete -c cvs -n __fish_use_subcommand -x -a editors -d 'See who is editing a watched file'
+complete -c cvs -n __fish_use_subcommand -x -a export -d 'Export sources from CVS, similar to checkout'
+complete -c cvs -n __fish_use_subcommand -x -a history -d 'Show repository access history'
+complete -c cvs -n __fish_use_subcommand -x -a import -d 'Import sources into CVS, using vendor branches'
+complete -c cvs -n __fish_use_subcommand -x -a init -d 'Create a CVS repository if it doesn\'t exist'
+complete -c cvs -n __fish_use_subcommand -x -a kserver -d 'Kerberos server mode'
+complete -c cvs -n __fish_use_subcommand -x -a log -d 'Print out history information for files'
+complete -c cvs -n __fish_use_subcommand -x -a login -d 'Prompt for password for authenticating server'
+complete -c cvs -n __fish_use_subcommand -x -a logout -d 'Removes entry in .cvspass for remote repository'
+complete -c cvs -n __fish_use_subcommand -x -a ls -d 'List files available from CVS'
+complete -c cvs -n __fish_use_subcommand -x -a pserver -d 'Password server mode'
+complete -c cvs -n __fish_use_subcommand -x -a rannotate -d 'Show last revision where each line of module was modified'
+complete -c cvs -n __fish_use_subcommand -x -a rdiff -d 'Create \'patch\' format diffs between releases'
+complete -c cvs -n __fish_use_subcommand -x -a release -d 'Indicate that a Module is no longer in use'
+complete -c cvs -n __fish_use_subcommand -x -a remove -d 'Remove an entry from the repository'
+complete -c cvs -n __fish_use_subcommand -x -a rlog -d 'Print out history information for a module'
+complete -c cvs -n __fish_use_subcommand -x -a rls -d 'List files in a module'
+complete -c cvs -n __fish_use_subcommand -x -a rtag -d 'Add a symbolic tag to a module'
+complete -c cvs -n __fish_use_subcommand -x -a server -d 'Server mode'
+complete -c cvs -n __fish_use_subcommand -x -a status -d 'Display status information on checked out files'
+complete -c cvs -n __fish_use_subcommand -x -a tag -d 'Add a symbolic tag to checked out version of files'
+complete -c cvs -n __fish_use_subcommand -x -a unedit -d 'Undo an edit command'
+complete -c cvs -n __fish_use_subcommand -x -a update -d 'Bring work tree in sync with repository'
+complete -c cvs -n __fish_use_subcommand -x -a version -d 'Show current CVS version(s)'
+complete -c cvs -n __fish_use_subcommand -x -a watch -d 'Set watches'
+complete -c cvs -n __fish_use_subcommand -x -a watchers -d 'See who is watching a file'
 
 
 #
diff --git a/share/completions/cwebp.fish b/share/completions/cwebp.fish
index 3ce394730..9bd27896b 100644
--- a/share/completions/cwebp.fish
+++ b/share/completions/cwebp.fish
@@ -73,7 +73,7 @@ set -l metadata_opts '
     xmp\t
 '
 
-function __fish_cwebp_is_first_arg_or_its_value -a 'arg' -d 'Like __fish_is_first_arg, but also returns true for the second token after a given parameter'
+function __fish_cwebp_is_first_arg_or_its_value -a arg -d 'Like __fish_is_first_arg, but also returns true for the second token after a given parameter'
     set -l tokens (commandline -co)
 
     switch (count $tokens)
diff --git a/share/completions/cygport.fish b/share/completions/cygport.fish
index 9c993f414..6cba18e82 100644
--- a/share/completions/cygport.fish
+++ b/share/completions/cygport.fish
@@ -5,7 +5,7 @@ complete -c cygport -s 8 -l 64 -d "Build for 64-bit Cygwin"
 complete -c cygport -l debug -d "Enable debugging messages"
 
 # Cygport file
-complete -c cygport -n '__fish_is_first_token' -f -a '*.cygport' -d "Cygport file"
+complete -c cygport -n __fish_is_first_token -f -a '*.cygport' -d "Cygport file"
 
 # Commands
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'downloadall fetchall wgetall getall' -d "Download all sources"
@@ -14,19 +14,19 @@ complete -c cygport -n 'not __fish_is_first_token' -f -a 'prep unpack' -d "Prepa
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'compile build make' -d "Build software"
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'check test' -d "Run test suite"
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'inst install' -d "Install into DESTDIR and run post-installation steps"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'postinst' -d "Run post-installation steps"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'list' -d "List package files"
+complete -c cygport -n 'not __fish_is_first_token' -f -a postinst -d "Run post-installation steps"
+complete -c cygport -n 'not __fish_is_first_token' -f -a list -d "List package files"
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'listdebug listdbg' -d "List debug package files"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'dep' -d "Show dependencies"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'info' -d "Show packaging info"
+complete -c cygport -n 'not __fish_is_first_token' -f -a dep -d "Show dependencies"
+complete -c cygport -n 'not __fish_is_first_token' -f -a info -d "Show packaging info"
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'homepage web www' -d "Show project homepage URL"
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'package-test pkg-test' -d "Create packages, marked as test"
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'package pkg' -d "Create packages"
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'diff mkdiff mkpatch' -d "Create source patches"
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'upload up' -d "Upload finished packages"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'stage' -d "Upload packages without marking !ready"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'announce' -d "Send announcement email"
+complete -c cygport -n 'not __fish_is_first_token' -f -a stage -d "Upload packages without marking !ready"
+complete -c cygport -n 'not __fish_is_first_token' -f -a announce -d "Send announcement email"
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'clean finish' -d "Delete working directory"
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'almostall all' -d "Same as prep build inst pkg"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'help' -d "Show help"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'version' -d "Show version"
+complete -c cygport -n 'not __fish_is_first_token' -f -a help -d "Show help"
+complete -c cygport -n 'not __fish_is_first_token' -f -a version -d "Show version"
diff --git a/share/completions/darcs.fish b/share/completions/darcs.fish
index b5cabf362..8301bec01 100644
--- a/share/completions/darcs.fish
+++ b/share/completions/darcs.fish
@@ -9,42 +9,42 @@ complete -c darcs -a "test predist boringfile binariesfile" -n "contains setpref
 # subcommands
 #
 
-complete -c darcs -n '__fish_use_subcommand' -x -a help -d 'Display help about darcs and darcs commands'
-complete -c darcs -n '__fish_use_subcommand' -x -a add -d 'Add new files to version control'
-complete -c darcs -n '__fish_use_subcommand' -x -a remove -d 'Remove files from version control'
-complete -c darcs -n '__fish_use_subcommand' -x -a move -d 'Move or rename files'
-complete -c darcs -n '__fish_use_subcommand' -x -a replace -d 'Substitute one word for another'
-complete -c darcs -n '__fish_use_subcommand' -x -a revert -d 'Discard unrecorded changes'
-complete -c darcs -n '__fish_use_subcommand' -x -a unrevert -d 'Undo the last revert'
-complete -c darcs -n '__fish_use_subcommand' -x -a whatsnew -d 'List unrecorded changes in the working tree'
-complete -c darcs -n '__fish_use_subcommand' -x -a record -d 'Create a patch from unrecorded changes'
-complete -c darcs -n '__fish_use_subcommand' -x -a unrecord -d 'Remove recorded patches without changing the working tree'
-complete -c darcs -n '__fish_use_subcommand' -x -a amend -d 'Improve a patch before it leaves your repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a mark-conflicts -d 'Mark unresolved conflicts in working tree, for manual resolution'
-complete -c darcs -n '__fish_use_subcommand' -x -a tag -d 'Name the current repository state for future reference'
-complete -c darcs -n '__fish_use_subcommand' -x -a setpref -d 'Set a preference (test, predist, boringfile or binariesfile)'
-complete -c darcs -n '__fish_use_subcommand' -x -a diff -d 'Create a diff between two versions of the repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a log -d 'List patches in the repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a annotate -d 'Annotate lines of a file with the last patch that modified it'
-complete -c darcs -n '__fish_use_subcommand' -x -a dist -d 'Create a distribution archive'
-complete -c darcs -n '__fish_use_subcommand' -x -a show -d 'Show information about the given repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a pull -d 'Copy and apply patches from another repository to this one'
-complete -c darcs -n '__fish_use_subcommand' -x -a obliterate -d 'Delete selected patches from the repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a rollback -d 'Apply the inverse of recorded changes to the working tree'
-complete -c darcs -n '__fish_use_subcommand' -x -a push -d 'Copy and apply patches from this repository to another one'
-complete -c darcs -n '__fish_use_subcommand' -x -a send -d 'Prepare a bundle of patches to be applied to some target repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a apply -d 'Apply a patch bundle created by `darcs send\''
-complete -c darcs -n '__fish_use_subcommand' -x -a clone -d 'Make a copy of an existing repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a initialize -d 'Create an empty repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a optimize -d 'Optimize the repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a repair -d 'Repair a corrupted repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a convert -d 'Convert repositories between various formats'
+complete -c darcs -n __fish_use_subcommand -x -a help -d 'Display help about darcs and darcs commands'
+complete -c darcs -n __fish_use_subcommand -x -a add -d 'Add new files to version control'
+complete -c darcs -n __fish_use_subcommand -x -a remove -d 'Remove files from version control'
+complete -c darcs -n __fish_use_subcommand -x -a move -d 'Move or rename files'
+complete -c darcs -n __fish_use_subcommand -x -a replace -d 'Substitute one word for another'
+complete -c darcs -n __fish_use_subcommand -x -a revert -d 'Discard unrecorded changes'
+complete -c darcs -n __fish_use_subcommand -x -a unrevert -d 'Undo the last revert'
+complete -c darcs -n __fish_use_subcommand -x -a whatsnew -d 'List unrecorded changes in the working tree'
+complete -c darcs -n __fish_use_subcommand -x -a record -d 'Create a patch from unrecorded changes'
+complete -c darcs -n __fish_use_subcommand -x -a unrecord -d 'Remove recorded patches without changing the working tree'
+complete -c darcs -n __fish_use_subcommand -x -a amend -d 'Improve a patch before it leaves your repository'
+complete -c darcs -n __fish_use_subcommand -x -a mark-conflicts -d 'Mark unresolved conflicts in working tree, for manual resolution'
+complete -c darcs -n __fish_use_subcommand -x -a tag -d 'Name the current repository state for future reference'
+complete -c darcs -n __fish_use_subcommand -x -a setpref -d 'Set a preference (test, predist, boringfile or binariesfile)'
+complete -c darcs -n __fish_use_subcommand -x -a diff -d 'Create a diff between two versions of the repository'
+complete -c darcs -n __fish_use_subcommand -x -a log -d 'List patches in the repository'
+complete -c darcs -n __fish_use_subcommand -x -a annotate -d 'Annotate lines of a file with the last patch that modified it'
+complete -c darcs -n __fish_use_subcommand -x -a dist -d 'Create a distribution archive'
+complete -c darcs -n __fish_use_subcommand -x -a show -d 'Show information about the given repository'
+complete -c darcs -n __fish_use_subcommand -x -a pull -d 'Copy and apply patches from another repository to this one'
+complete -c darcs -n __fish_use_subcommand -x -a obliterate -d 'Delete selected patches from the repository'
+complete -c darcs -n __fish_use_subcommand -x -a rollback -d 'Apply the inverse of recorded changes to the working tree'
+complete -c darcs -n __fish_use_subcommand -x -a push -d 'Copy and apply patches from this repository to another one'
+complete -c darcs -n __fish_use_subcommand -x -a send -d 'Prepare a bundle of patches to be applied to some target repository'
+complete -c darcs -n __fish_use_subcommand -x -a apply -d 'Apply a patch bundle created by `darcs send\''
+complete -c darcs -n __fish_use_subcommand -x -a clone -d 'Make a copy of an existing repository'
+complete -c darcs -n __fish_use_subcommand -x -a initialize -d 'Create an empty repository'
+complete -c darcs -n __fish_use_subcommand -x -a optimize -d 'Optimize the repository'
+complete -c darcs -n __fish_use_subcommand -x -a repair -d 'Repair a corrupted repository'
+complete -c darcs -n __fish_use_subcommand -x -a convert -d 'Convert repositories between various formats'
 
 function __fish_darcs_use_show_command
     set -l cmd (commandline -poc)
     set -e cmd[1]
 
-    if contains 'show' $cmd
+    if contains show $cmd
         for i in $cmd
             switch $i
                 case contents
@@ -72,21 +72,21 @@ function __fish_darcs_use_show_command
     return 1
 end
 
-complete -c darcs -n '__fish_darcs_use_show_command' -x -a contents -d 'Outputs a specific version of a file'
-complete -c darcs -n '__fish_darcs_use_show_command' -x -a dependencies -d 'Generate the graph of dependencies'
-complete -c darcs -n '__fish_darcs_use_show_command' -x -a files -d 'Show version-controlled files in the working tree'
-complete -c darcs -n '__fish_darcs_use_show_command' -x -a index -d 'Dump contents of working tree index'
-complete -c darcs -n '__fish_darcs_use_show_command' -x -a pristine -d 'Dump contents of pristine cache'
-complete -c darcs -n '__fish_darcs_use_show_command' -x -a repo -d 'Show repository summary information'
-complete -c darcs -n '__fish_darcs_use_show_command' -x -a authors -d 'List authors by patch count'
-complete -c darcs -n '__fish_darcs_use_show_command' -x -a tags -d 'Show all tags in the repository'
-complete -c darcs -n '__fish_darcs_use_show_command' -x -a patch-index -d 'Check integrity of patch index'
+complete -c darcs -n __fish_darcs_use_show_command -x -a contents -d 'Outputs a specific version of a file'
+complete -c darcs -n __fish_darcs_use_show_command -x -a dependencies -d 'Generate the graph of dependencies'
+complete -c darcs -n __fish_darcs_use_show_command -x -a files -d 'Show version-controlled files in the working tree'
+complete -c darcs -n __fish_darcs_use_show_command -x -a index -d 'Dump contents of working tree index'
+complete -c darcs -n __fish_darcs_use_show_command -x -a pristine -d 'Dump contents of pristine cache'
+complete -c darcs -n __fish_darcs_use_show_command -x -a repo -d 'Show repository summary information'
+complete -c darcs -n __fish_darcs_use_show_command -x -a authors -d 'List authors by patch count'
+complete -c darcs -n __fish_darcs_use_show_command -x -a tags -d 'Show all tags in the repository'
+complete -c darcs -n __fish_darcs_use_show_command -x -a patch-index -d 'Check integrity of patch index'
 
 function __fish_darcs_use_optimize_command
     set -l cmd (commandline -poc)
     set -e cmd[1]
 
-    if contains 'optimize' $cmd
+    if contains optimize $cmd
         for i in $cmd
             switch $i
                 case clean
@@ -118,24 +118,24 @@ function __fish_darcs_use_optimize_command
     return 1
 end
 
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a clean -d 'Garbage collect pristine, inventories and patches'
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a http -d 'Optimize repository for getting over network'
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a reorder -d 'Reorder the patches in the repository'
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a enable-patch-index -d 'Enable patch index'
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a disable-patch-index -d 'Disable patch index'
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a compress -d 'Compress patches and inventories'
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a uncompress -d 'Uncompress patches and inventories'
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a relink -d 'Relink random internal data to a sibling'
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a pristine -d 'Optimize hashed pristine layout'
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a upgrade -d 'Upgrade repository to latest compatible format'
-complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a cache -d 'Garbage collect global cache'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a clean -d 'Garbage collect pristine, inventories and patches'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a http -d 'Optimize repository for getting over network'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a reorder -d 'Reorder the patches in the repository'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a enable-patch-index -d 'Enable patch index'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a disable-patch-index -d 'Disable patch index'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a compress -d 'Compress patches and inventories'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a uncompress -d 'Uncompress patches and inventories'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a relink -d 'Relink random internal data to a sibling'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a pristine -d 'Optimize hashed pristine layout'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a upgrade -d 'Upgrade repository to latest compatible format'
+complete -c darcs -n __fish_darcs_use_optimize_command -x -a cache -d 'Garbage collect global cache'
 
 
 function __fish_darcs_use_convert_command
     set -l cmd (commandline -poc)
     set -e cmd[1]
 
-    if contains 'convert' $cmd
+    if contains convert $cmd
         for i in $cmd
             switch $i
                 case darcs-2
@@ -151,866 +151,866 @@ function __fish_darcs_use_convert_command
     return 1
 end
 
-complete -c darcs -l 'help' -d 'Show a brief description of the command and its options'
-complete -c darcs -l 'list-options' -d 'Show plain list of available options and commands, for auto-completion'
-complete -c darcs -l 'run-posthook' -d 'Run posthook command without prompting [DEFAULT]'
-complete -c darcs -l 'prompt-posthook' -d 'Prompt before running posthook'
-complete -c darcs -l 'no-posthook' -d 'Don\'t run posthook command [DEFAULT]'
-complete -c darcs -l 'posthook' -x -a '(__fish_complete_command)' -d 'Specify command to run after this darcs command'
-complete -c darcs -l 'run-prehook' -d 'Run prehook command without prompting [DEFAULT]'
-complete -c darcs -l 'prompt-prehook' -d 'Prompt before running prehook'
-complete -c darcs -l 'no-prehook' -d 'Don\'t run prehook command [DEFAULT]'
-complete -c darcs -l 'prehook' -x -a '(__fish_complete_command)' -d 'Specify command to run before this darcs command'
-complete -c darcs -l 'disable' -d 'Disable this command'
-complete -c darcs -l 'debug' -d 'Give only debug output'
-complete -c darcs -l 'debug-http' -d 'Debug output from libcurl'
-complete -c darcs -l 'quiet' -s q -d 'Suppress informational output'
-complete -c darcs -l 'standard-verbosity' -d 'Neither verbose nor quiet output [DEFAULT]'
-complete -c darcs -l 'verbose' -s v -d 'Give verbose output'
-complete -c darcs -l 'timings' -d 'Provide debugging timings information'
-complete -c darcs -l 'no-cache' -d 'Don\'t use patch caches'
+complete -c darcs -l help -d 'Show a brief description of the command and its options'
+complete -c darcs -l list-options -d 'Show plain list of available options and commands, for auto-completion'
+complete -c darcs -l run-posthook -d 'Run posthook command without prompting [DEFAULT]'
+complete -c darcs -l prompt-posthook -d 'Prompt before running posthook'
+complete -c darcs -l no-posthook -d 'Don\'t run posthook command [DEFAULT]'
+complete -c darcs -l posthook -x -a '(__fish_complete_command)' -d 'Specify command to run after this darcs command'
+complete -c darcs -l run-prehook -d 'Run prehook command without prompting [DEFAULT]'
+complete -c darcs -l prompt-prehook -d 'Prompt before running prehook'
+complete -c darcs -l no-prehook -d 'Don\'t run prehook command [DEFAULT]'
+complete -c darcs -l prehook -x -a '(__fish_complete_command)' -d 'Specify command to run before this darcs command'
+complete -c darcs -l disable -d 'Disable this command'
+complete -c darcs -l debug -d 'Give only debug output'
+complete -c darcs -l debug-http -d 'Debug output from libcurl'
+complete -c darcs -l quiet -s q -d 'Suppress informational output'
+complete -c darcs -l standard-verbosity -d 'Neither verbose nor quiet output [DEFAULT]'
+complete -c darcs -l verbose -s v -d 'Give verbose output'
+complete -c darcs -l timings -d 'Provide debugging timings information'
+complete -c darcs -l no-cache -d 'Don\'t use patch caches'
 
 #
 # Completions for the 'add' subcommand
 #
 
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'boring' -d 'Don\'t skip boring files'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'no-boring' -d 'Skip boring files [DEFAULT]'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'case-ok' -d 'Don\'t refuse to add files differing only in case'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'no-case-ok' -d 'Refuse to add files whose name differ only in case [DEFAULT]'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'reserved-ok' -d 'Don\'t refuse to add files with Windows-reserved names'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'no-reserved-ok' -d 'Refuse to add files with Windows-reserved names [DEFAULT]'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'recursive' -s r -d 'Recurse into subdirectories'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'not-recursive' -d 'Don\'t recurse into subdirectories [DEFAULT]'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'no-recursive' -d 'Don\'t recurse into subdirectories [DEFAULT]'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'dry-run' -d 'Don\'t actually take the action'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l boring -d 'Don\'t skip boring files'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-boring -d 'Skip boring files [DEFAULT]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l case-ok -d 'Don\'t refuse to add files differing only in case'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-case-ok -d 'Refuse to add files whose name differ only in case [DEFAULT]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l reserved-ok -d 'Don\'t refuse to add files with Windows-reserved names'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-reserved-ok -d 'Refuse to add files with Windows-reserved names [DEFAULT]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l recursive -s r -d 'Recurse into subdirectories'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l not-recursive -d 'Don\'t recurse into subdirectories [DEFAULT]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-recursive -d 'Don\'t recurse into subdirectories [DEFAULT]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l dry-run -d 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'remove' subcommand
 #
 
-complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l 'recursive' -s r -d 'Recurse into subdirectories'
-complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l 'not-recursive' -d 'Don\'t recurse into subdirectories [DEFAULT]'
-complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l 'no-recursive' -d 'Don\'t recurse into subdirectories [DEFAULT]'
-complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l recursive -s r -d 'Recurse into subdirectories'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l not-recursive -d 'Don\'t recurse into subdirectories [DEFAULT]'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l no-recursive -d 'Don\'t recurse into subdirectories [DEFAULT]'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'move' subcommand
 #
 
-complete -c darcs -n 'contains \'move\' (commandline -poc)' -l 'case-ok' -d 'Don\'t refuse to add files differing only in case'
-complete -c darcs -n 'contains \'move\' (commandline -poc)' -l 'no-case-ok' -d 'Refuse to add files whose name differ only in case [DEFAULT]'
-complete -c darcs -n 'contains \'move\' (commandline -poc)' -l 'reserved-ok' -d 'Don\'t refuse to add files with Windows-reserved names'
-complete -c darcs -n 'contains \'move\' (commandline -poc)' -l 'no-reserved-ok' -d 'Refuse to add files with Windows-reserved names [DEFAULT]'
-complete -c darcs -n 'contains \'move\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'move\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l case-ok -d 'Don\'t refuse to add files differing only in case'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l no-case-ok -d 'Refuse to add files whose name differ only in case [DEFAULT]'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l reserved-ok -d 'Don\'t refuse to add files with Windows-reserved names'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l no-reserved-ok -d 'Refuse to add files with Windows-reserved names [DEFAULT]'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'replace' subcommand
 #
 
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l 'token-chars' -d 'Define token to contain these characters'
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l 'force' -s f -d 'Proceed with replace even if 'new' token already exists'
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l 'no-force' -d 'Don\'t force the replace if it looks scary [DEFAULT]'
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l token-chars -d 'Define token to contain these characters'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l force -s f -d 'Proceed with replace even if 'new' token already exists'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l no-force -d 'Don\'t force the replace if it looks scary [DEFAULT]'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'revert' subcommand
 #
 
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'unified' -s u -d 'Output changes in a darcs-specific format similar to diff -u'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'no-unified' -d 'Output changes in darcs\' usual format [DEFAULT]'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l unified -s u -d 'Output changes in a darcs-specific format similar to diff -u'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l no-unified -d 'Output changes in darcs\' usual format [DEFAULT]'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'unrevert' subcommand
 #
 
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'unified' -s u -d 'Output changes in a darcs-specific format similar to diff -u'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'no-unified' -d 'Output changes in darcs\' usual format [DEFAULT]'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l unified -s u -d 'Output changes in a darcs-specific format similar to diff -u'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l no-unified -d 'Output changes in darcs\' usual format [DEFAULT]'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'whatsnew' subcommand
 #
 
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'summary' -s s -d 'Summarize changes'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'no-summary' -d 'Don\'t summarize changes'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'unified' -s u -d 'Output changes in a darcs-specific format similar to diff -u'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'no-unified' -d 'Output changes in darcs\' usual format [DEFAULT]'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'human-readable' -d 'Give human-readable output [DEFAULT]'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'machine-readable' -d 'Give machine-readable output'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'look-for-adds' -s -l -d 'Look for (non-boring) files that could be added'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'dont-look-for-adds' -d 'Don\'t look for any files that could be added [DEFAULT]'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'no-look-for-adds' -d 'Don\'t look for any files that could be added [DEFAULT]'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'look-for-replaces' -d 'Look for replaces that could be marked'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'dont-look-for-replaces' -d 'Don\'t look for any replaces [DEFAULT]'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'no-look-for-replaces' -d 'Don\'t look for any replaces [DEFAULT]'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'look-for-moves' -d 'Look for files that may be moved/renamed'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'dont-look-for-moves' -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'no-look-for-moves' -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'boring' -d 'Don\'t skip boring files'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l 'no-boring' -d 'Skip boring files [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l summary -s s -d 'Summarize changes'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-summary -d 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l unified -s u -d 'Output changes in a darcs-specific format similar to diff -u'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-unified -d 'Output changes in darcs\' usual format [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l human-readable -d 'Give human-readable output [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l machine-readable -d 'Give machine-readable output'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l look-for-adds -s -l -d 'Look for (non-boring) files that could be added'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l dont-look-for-adds -d 'Don\'t look for any files that could be added [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-look-for-adds -d 'Don\'t look for any files that could be added [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l look-for-replaces -d 'Look for replaces that could be marked'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l dont-look-for-replaces -d 'Don\'t look for any replaces [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-look-for-replaces -d 'Don\'t look for any replaces [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l look-for-moves -d 'Look for files that may be moved/renamed'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l dont-look-for-moves -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-look-for-moves -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l boring -d 'Don\'t skip boring files'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-boring -d 'Skip boring files [DEFAULT]'
 
 #
 # Completions for the 'record' subcommand
 #
 
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'name' -s m -d 'Name of patch'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'author' -s A -d 'Specify author id'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'test' -d 'Run the test script'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-test' -d 'Don\'t run the test script [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'leave-test-directory' -d 'Don\'t remove the test directory [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'remove-test-directory' -d 'Remove the test directory'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'pipe' -d 'Ask user interactively for the patch metadata'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'ask-deps' -d 'Manually select dependencies'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-ask-deps' -d 'Automatically select dependencies [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'edit-long-comment' -d 'Edit the long comment by default'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'skip-long-comment' -d 'Don\'t give a long comment'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'prompt-long-comment' -d 'Prompt for whether to edit the long comment'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'look-for-adds' -s l -d 'Look for (non-boring) files that could be added'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'dont-look-for-adds' -d 'Don\'t look for any files that could be added [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-look-for-adds' -d 'Don\'t look for any files that could be added [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'look-for-replaces' -d 'Look for replaces that could be marked'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'dont-look-for-replaces' -d 'Don\'t look for any replaces [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-look-for-replaces' -d 'Don\'t look for any replaces [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'look-for-moves' -d 'Look for files that may be moved/renamed'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'dont-look-for-moves' -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-look-for-moves' -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'unified' -s u -d 'Output changes in a darcs-specific format similar to diff -u'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-unified' -d 'Output changes in darcs\' usual format [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'logfile' -d 'Give patch name and comment in file'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'delete-logfile' -d 'Delete the logfile when done'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-delete-logfile' -d 'Keep the logfile when done [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'compress' -d 'Compress patch data [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'dont-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'set-scripts-executable' -d 'Make scripts executable'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'dont-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'boring' -d 'Don\'t skip boring files'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l 'no-boring' -d 'Skip boring files [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l name -s m -d 'Name of patch'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l author -s A -d 'Specify author id'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l test -d 'Run the test script'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-test -d 'Don\'t run the test script [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l leave-test-directory -d 'Don\'t remove the test directory [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l remove-test-directory -d 'Remove the test directory'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l pipe -d 'Ask user interactively for the patch metadata'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l ask-deps -d 'Manually select dependencies'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-ask-deps -d 'Automatically select dependencies [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l edit-long-comment -d 'Edit the long comment by default'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l skip-long-comment -d 'Don\'t give a long comment'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l prompt-long-comment -d 'Prompt for whether to edit the long comment'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l look-for-adds -s l -d 'Look for (non-boring) files that could be added'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l dont-look-for-adds -d 'Don\'t look for any files that could be added [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-look-for-adds -d 'Don\'t look for any files that could be added [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l look-for-replaces -d 'Look for replaces that could be marked'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l dont-look-for-replaces -d 'Don\'t look for any replaces [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-look-for-replaces -d 'Don\'t look for any replaces [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l look-for-moves -d 'Look for files that may be moved/renamed'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l dont-look-for-moves -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-look-for-moves -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l unified -s u -d 'Output changes in a darcs-specific format similar to diff -u'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-unified -d 'Output changes in darcs\' usual format [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l logfile -d 'Give patch name and comment in file'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l delete-logfile -d 'Delete the logfile when done'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-delete-logfile -d 'Keep the logfile when done [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l compress -d 'Compress patch data [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l dont-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l set-scripts-executable -d 'Make scripts executable'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l dont-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l boring -d 'Don\'t skip boring files'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-boring -d 'Skip boring files [DEFAULT]'
 
 #
 # Completions for the 'unrecord' subcommand
 #
 
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'not-in-remote' -d 'Select all patches not in the default push/pull repository or at location URL/PATH'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'from-match' -d 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'from-patch' -d 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'from-hash' -d 'Select changes starting with a patch with HASH'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'from-tag' -d 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'last' -d 'Select the last NUMBER patches'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'matches' -d 'Select patches matching PATTERN'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'patches' -s p -d 'Select patches matching REGEXP'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'tags' -s t -d 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'no-deps' -d 'Don\'t automatically fulfill dependencies'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'auto-deps' -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'dont-prompt-for-dependencies' -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'prompt-deps' -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'prompt-for-dependencies' -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'compress' -d 'Compress patch data [DEFAULT]'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'dont-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'no-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'reverse' -d 'Show/consider changes in reverse order'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l 'no-reverse' -d 'Show/consider changes in the usual order [DEFAULT]'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l not-in-remote -d 'Select all patches not in the default push/pull repository or at location URL/PATH'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l from-match -d 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l from-patch -d 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l from-hash -d 'Select changes starting with a patch with HASH'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l from-tag -d 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l last -d 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l matches -d 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l patches -s p -d 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l tags -s t -d 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l no-deps -d 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l auto-deps -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l dont-prompt-for-dependencies -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l prompt-deps -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l prompt-for-dependencies -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l compress -d 'Compress patch data [DEFAULT]'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l dont-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l no-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l reverse -d 'Show/consider changes in reverse order'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l no-reverse -d 'Show/consider changes in the usual order [DEFAULT]'
 
 #
 # Completions for the 'amend' subcommand
 #
 
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'unrecord' -d 'Remove changes from the patch'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'record' -d 'Add more changes to the patch [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'match' -d 'Select a single patch matching PATTERN'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'patch' -s p -d 'Select a single patch matching REGEXP'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'test' -d 'Run the test script'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-test' -d 'Don\'t run the test script [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'leave-test-directory' -d 'Don\'t remove the test directory [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'remove-test-directory' -d 'Remove the test directory'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'author' -s A -d 'Specify author id'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'select-author' -d 'Select author id from a menu'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'name' -s m -d 'Name of patch'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'ask-deps' -d 'Manually select dependencies'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-ask-deps' -d 'Automatically select dependencies [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'edit-long-comment' -d 'Edit the long comment by default'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'skip-long-comment' -d 'Don\'t give a long comment'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'prompt-long-comment' -d 'Prompt for whether to edit the long comment'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'keep-date' -d 'Keep the date of the original patch'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-keep-date' -d 'Use the current date for the amended patch [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'look-for-adds' -s l -d 'Look for (non-boring) files that could be added'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'dont-look-for-adds' -d 'Don\'t look for any files that could be added [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-look-for-adds' -d 'Don\'t look for any files that could be added [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'look-for-replaces' -d 'Look for replaces that could be marked'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'dont-look-for-replaces' -d 'Don\'t look for any replaces [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-look-for-replaces' -d 'Don\'t look for any replaces [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'look-for-moves' -d 'Look for files that may be moved/renamed'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'dont-look-for-moves' -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-look-for-moves' -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'unified' -s u -d 'Output changes in a darcs-specific format similar to diff -u'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-unified' -d 'Output changes in darcs\' usual format [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'compress' -d 'Compress patch data [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'dont-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'set-scripts-executable' -d 'Make scripts executable'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'dont-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l 'no-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l unrecord -d 'Remove changes from the patch'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l record -d 'Add more changes to the patch [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l match -d 'Select a single patch matching PATTERN'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l patch -s p -d 'Select a single patch matching REGEXP'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l test -d 'Run the test script'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-test -d 'Don\'t run the test script [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l leave-test-directory -d 'Don\'t remove the test directory [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l remove-test-directory -d 'Remove the test directory'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l author -s A -d 'Specify author id'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l select-author -d 'Select author id from a menu'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l name -s m -d 'Name of patch'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l ask-deps -d 'Manually select dependencies'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-ask-deps -d 'Automatically select dependencies [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l edit-long-comment -d 'Edit the long comment by default'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l skip-long-comment -d 'Don\'t give a long comment'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l prompt-long-comment -d 'Prompt for whether to edit the long comment'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l keep-date -d 'Keep the date of the original patch'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-keep-date -d 'Use the current date for the amended patch [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l look-for-adds -s l -d 'Look for (non-boring) files that could be added'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l dont-look-for-adds -d 'Don\'t look for any files that could be added [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-look-for-adds -d 'Don\'t look for any files that could be added [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l look-for-replaces -d 'Look for replaces that could be marked'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l dont-look-for-replaces -d 'Don\'t look for any replaces [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-look-for-replaces -d 'Don\'t look for any replaces [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l look-for-moves -d 'Look for files that may be moved/renamed'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l dont-look-for-moves -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-look-for-moves -d 'Don\'t look for any files that could be moved/renamed [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l unified -s u -d 'Output changes in a darcs-specific format similar to diff -u'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-unified -d 'Output changes in darcs\' usual format [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l compress -d 'Compress patch data [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l dont-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l set-scripts-executable -d 'Make scripts executable'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l dont-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'amend\' (commandline -poc)' -l no-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
 
 #
 # Completions for the 'mark-conflicts' subcommand
 #
 
-complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l 'dry-run' -d 'Don\'t actually take the action'
-complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l 'xml-output' -d 'Generate XML formatted output'
-complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l dry-run -d 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l xml-output -d 'Generate XML formatted output'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'tag' subcommand
 #
 
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'name' -s m -d 'Name of patch'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'author' -s A -d 'Specify author id'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'pipe' -d 'Ask user interactively for the patch metadata'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'edit-long-comment' -d 'Edit the long comment by default'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'skip-long-comment' -d 'Don\'t give a long comment'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'prompt-long-comment' -d 'Prompt for whether to edit the long comment'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'ask-deps' -d 'Manually select dependencies'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'no-ask-deps' -d 'Automatically select dependencies [DEFAULT]'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'compress' -d 'Compress patch data [DEFAULT]'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'dont-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'no-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l name -s m -d 'Name of patch'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l author -s A -d 'Specify author id'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l pipe -d 'Ask user interactively for the patch metadata'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l edit-long-comment -d 'Edit the long comment by default'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l skip-long-comment -d 'Don\'t give a long comment'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l prompt-long-comment -d 'Prompt for whether to edit the long comment'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l ask-deps -d 'Manually select dependencies'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l no-ask-deps -d 'Automatically select dependencies [DEFAULT]'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l compress -d 'Compress patch data [DEFAULT]'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l dont-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l no-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'setpref' subcommand
 #
 
-complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'diff' subcommand
 #
 
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'to-match' -d 'Select changes up to a patch matching PATTERN'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'to-patch' -d 'Select changes up to a patch matching REGEXP'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'to-hash' -d 'Select changes up to a patch with HASH'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'to-tag' -d 'Select changes up to a tag matching REGEXP'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'from-match' -d 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'from-patch' -d 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'from-hash' -d 'Select changes starting with a patch with HASH'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'from-tag' -d 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'match' -d 'Select a single patch matching PATTERN'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'patch' -s p -d 'Select a single patch matching REGEXP'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'last' -d 'Select the last NUMBER patches'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'index' -s n -d 'Select a range of patches'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'diff-command' -d 'Specify diff command (ignores --diff-opts)'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'diff-opts' -d 'Options to pass to diff'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'unified' -s u -d 'Pass -u option to diff [DEFAULT]'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'no-unified' -d 'Output patch in diff\'s dumb format'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'store-in-memory' -d 'Do patch application in memory rather than on disk'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'no-store-in-memory' -d 'Do patch application on disk [DEFAULT]'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'pause-for-gui' -d 'Pause for an external diff or merge command to finish [DEFAULT]'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l 'no-pause-for-gui' -d 'Return immediately after external diff or merge command finishes'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l to-match -d 'Select changes up to a patch matching PATTERN'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l to-patch -d 'Select changes up to a patch matching REGEXP'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l to-hash -d 'Select changes up to a patch with HASH'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l to-tag -d 'Select changes up to a tag matching REGEXP'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l from-match -d 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l from-patch -d 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l from-hash -d 'Select changes starting with a patch with HASH'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l from-tag -d 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l match -d 'Select a single patch matching PATTERN'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l patch -s p -d 'Select a single patch matching REGEXP'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l last -d 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l index -s n -d 'Select a range of patches'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l diff-command -d 'Specify diff command (ignores --diff-opts)'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l diff-opts -d 'Options to pass to diff'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l unified -s u -d 'Pass -u option to diff [DEFAULT]'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l no-unified -d 'Output patch in diff\'s dumb format'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l store-in-memory -d 'Do patch application in memory rather than on disk'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l no-store-in-memory -d 'Do patch application on disk [DEFAULT]'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l pause-for-gui -d 'Pause for an external diff or merge command to finish [DEFAULT]'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l no-pause-for-gui -d 'Return immediately after external diff or merge command finishes'
 
 #
 # Completions for the 'log' subcommand
 #
 
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'to-match' -d 'Select changes up to a patch matching PATTERN'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'to-patch' -d 'Select changes up to a patch matching REGEXP'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'to-hash' -d 'Select changes up to a patch with HASH'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'to-tag' -d 'Select changes up to a tag matching REGEXP'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'from-match' -d 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'from-patch' -d 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'from-hash' -d 'Select changes starting with a patch with HASH'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'from-tag' -d 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'last' -d 'Select the last NUMBER patches'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'index' -s n -d 'Select a range of patches'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'matches' -d 'Select patches matching PATTERN'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'patches' -s p -d 'Select patches matching REGEXP'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'tags' -s t -d 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'max-count' -d 'Return only NUMBER results'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'only-to-files' -d 'Show only changes to specified files'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'no-only-to-files' -d 'Show changes to all files [DEFAULT]'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'context' -d 'Give output suitable for clone --context'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'xml-output' -d 'Generate XML formatted output'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'human-readable' -d 'Give human-readable output'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'machine-readable' -d 'Give machine-readable output'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'number' -d 'Number the changes'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'count' -d 'Output count of changes'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'summary' -s s -d 'Summarize changes'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'no-summary' -d 'Don\'t summarize changes'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'reverse' -d 'Show/consider changes in reverse order'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'no-reverse' -d 'Show/consider changes in the usual order [DEFAULT]'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'repo' -d 'Specify the repository URL'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'no-http-pipelining' -d 'Disable HTTP pipelining'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'remote-darcs' -d 'Name of the darcs executable on the remote server'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'with-patch-index' -d 'Build patch index [DEFAULT]'
-complete -c darcs -n 'contains \'log\' (commandline -poc)' -l 'no-patch-index' -d 'Don\'t build patch index'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l to-match -d 'Select changes up to a patch matching PATTERN'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l to-patch -d 'Select changes up to a patch matching REGEXP'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l to-hash -d 'Select changes up to a patch with HASH'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l to-tag -d 'Select changes up to a tag matching REGEXP'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l from-match -d 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l from-patch -d 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l from-hash -d 'Select changes starting with a patch with HASH'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l from-tag -d 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l last -d 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l index -s n -d 'Select a range of patches'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l matches -d 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l patches -s p -d 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l tags -s t -d 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l max-count -d 'Return only NUMBER results'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l only-to-files -d 'Show only changes to specified files'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l no-only-to-files -d 'Show changes to all files [DEFAULT]'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l context -d 'Give output suitable for clone --context'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l xml-output -d 'Generate XML formatted output'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l human-readable -d 'Give human-readable output'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l machine-readable -d 'Give machine-readable output'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l number -d 'Number the changes'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l count -d 'Output count of changes'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l summary -s s -d 'Summarize changes'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l no-summary -d 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l reverse -d 'Show/consider changes in reverse order'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l no-reverse -d 'Show/consider changes in the usual order [DEFAULT]'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l repo -d 'Specify the repository URL'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l no-http-pipelining -d 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l remote-darcs -d 'Name of the darcs executable on the remote server'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l with-patch-index -d 'Build patch index [DEFAULT]'
+complete -c darcs -n 'contains \'log\' (commandline -poc)' -l no-patch-index -d 'Don\'t build patch index'
 
 #
 # Completions for the 'annotate' subcommand
 #
 
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l 'human-readable' -d 'Give human-readable output [DEFAULT]'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l 'machine-readable' -d 'Give machine-readable output'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l 'match' -d 'Select a single patch matching PATTERN'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l 'patch' -s p -d 'Select a single patch matching REGEXP'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l 'tag' -s t -d 'Select tag matching REGEXP'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l 'index' -s n -d 'Select one patch'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l 'with-patch-index' -d 'Build patch index [DEFAULT]'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l 'no-patch-index' -d 'Don\'t build patch index'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l human-readable -d 'Give human-readable output [DEFAULT]'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l machine-readable -d 'Give machine-readable output'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l match -d 'Select a single patch matching PATTERN'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l patch -s p -d 'Select a single patch matching REGEXP'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l tag -s t -d 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l index -s n -d 'Select one patch'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l with-patch-index -d 'Build patch index [DEFAULT]'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l no-patch-index -d 'Don\'t build patch index'
 
 #
 # Completions for the 'dist' subcommand
 #
 
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'dist-name' -s d -d 'Name of version'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'zip' -d 'Generate zip archive instead of gzip\'ed tar'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'match' -d 'Select a single patch matching PATTERN'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'patch' -s p -d 'Select a single patch matching REGEXP'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'tag' -s t -d 'Select tag matching REGEXP'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'index' -s n -d 'Select one patch'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'set-scripts-executable' -d 'Make scripts executable'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'dont-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'no-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'store-in-memory' -d 'Do patch application in memory rather than on disk'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l 'no-store-in-memory' -d 'Do patch application on disk [DEFAULT]'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l dist-name -s d -d 'Name of version'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l zip -d 'Generate zip archive instead of gzip\'ed tar'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l match -d 'Select a single patch matching PATTERN'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l patch -s p -d 'Select a single patch matching REGEXP'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l tag -s t -d 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l index -s n -d 'Select one patch'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l set-scripts-executable -d 'Make scripts executable'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l dont-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l no-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l store-in-memory -d 'Do patch application in memory rather than on disk'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l no-store-in-memory -d 'Do patch application on disk [DEFAULT]'
 
 #
 # Completions for the 'show contents' subcommand
 #
 
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l 'match' -d 'Select a single patch matching PATTERN'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l 'patch' -s p -d 'Select a single patch matching REGEXP'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l 'tag' -s t -d 'Select tag matching REGEXP'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l 'index' -s n -d 'Select one patch'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l match -d 'Select a single patch matching PATTERN'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l patch -s p -d 'Select a single patch matching REGEXP'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l tag -s t -d 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l index -s n -d 'Select one patch'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'contents\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
 
 #
 # Completions for the 'show dependencies' subcommand
 #
 
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l 'from-match' -d 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l 'from-patch' -d 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l 'from-hash' -d 'Select changes starting with a patch with HASH'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l 'from-tag' -d 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l 'last' -d 'Select the last NUMBER patches'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l 'matches' -d 'Select patches matching PATTERN'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l 'patches' -s p -d 'Select patches matching REGEXP'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l 'tags' -s t -d 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l from-match -d 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l from-patch -d 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l from-hash -d 'Select changes starting with a patch with HASH'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l from-tag -d 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l last -d 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l matches -d 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l patches -s p -d 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l tags -s t -d 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'dependencies\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
 
 #
 # Completions for the 'show files' subcommand
 #
 
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'files' -d 'Include files in output [DEFAULT]'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'no-files' -d 'Don\'t include files in output'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'directories' -d 'Include directories in output [DEFAULT]'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'no-directories' -d 'Don\'t include directories in output'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'pending' -d 'Reflect pending patches in output [DEFAULT]'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'no-pending' -d 'Only include recorded patches in output'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'null' -s 0 -d 'Separate file names by NUL characters'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'match' -d 'Select a single patch matching PATTERN'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'patch' -s p -d 'Select a single patch matching REGEXP'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'tag' -s t -d 'Select tag matching REGEXP'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'index' -s n -d 'Select one patch'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l files -d 'Include files in output [DEFAULT]'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l no-files -d 'Don\'t include files in output'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l directories -d 'Include directories in output [DEFAULT]'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l no-directories -d 'Don\'t include directories in output'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l pending -d 'Reflect pending patches in output [DEFAULT]'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l no-pending -d 'Only include recorded patches in output'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l null -s 0 -d 'Separate file names by NUL characters'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l match -d 'Select a single patch matching PATTERN'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l patch -s p -d 'Select a single patch matching REGEXP'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l tag -s t -d 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l index -s n -d 'Select one patch'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'files\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
 
 #
 # Completions for the 'show index' subcommand
 #
 
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'index\' (commandline -poc)' -l 'null' -s 0 -d 'Separate file names by NUL characters'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'index\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'index\' (commandline -poc)' -l null -s 0 -d 'Separate file names by NUL characters'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'index\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
 
 #
 # Completions for the 'show pristine' subcommand
 #
 
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'pristine\' (commandline -poc)' -l 'null' -s 0 -d 'Separate file names by NUL characters'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'pristine\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'pristine\' (commandline -poc)' -l null -s 0 -d 'Separate file names by NUL characters'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'pristine\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
 
 #
 # Completions for the 'show repo' subcommand
 #
 
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'repo\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'repo\' (commandline -poc)' -l 'xml-output' -d 'Generate XML formatted output'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'repo\' (commandline -poc)' -l 'enum-patches' -d 'Include statistics requiring enumeration of patches [DEFAULT]'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'repo\' (commandline -poc)' -l 'no-enum-patches' -d 'Don\'t include statistics requiring enumeration of patches'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'repo\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'repo\' (commandline -poc)' -l xml-output -d 'Generate XML formatted output'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'repo\' (commandline -poc)' -l enum-patches -d 'Include statistics requiring enumeration of patches [DEFAULT]'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'repo\' (commandline -poc)' -l no-enum-patches -d 'Don\'t include statistics requiring enumeration of patches'
 
 #
 # Completions for the 'show authors' subcommand
 #
 
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'authors\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'authors\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
 
 #
 # Completions for the 'show tags' subcommand
 #
 
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'tags\' (commandline -poc)' -l 'repo' -d 'Specify the repository URL'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'tags\' (commandline -poc)' -l repo -d 'Specify the repository URL'
 
 #
 # Completions for the 'show patch-index' subcommand
 #
 
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'patch-index\' (commandline -poc)' -l 'null' -s 0 -d 'Separate file names by NUL characters'
-complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'patch-index\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'patch-index\' (commandline -poc)' -l null -s 0 -d 'Separate file names by NUL characters'
+complete -c darcs -n 'contains \'show\' (commandline -poc) && contains \'patch-index\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
 
 #
 # Completions for the 'pull' subcommand
 #
 
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'matches' -d 'Select patches matching PATTERN'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'patches' -s p -d 'Select patches matching REGEXP'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'tags' -s t -d 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'reorder-patches' -d 'Reorder the patches in the repository'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-reorder-patches' -d 'Don\'t reorder the patches in the repository [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'mark-conflicts' -d 'Mark conflicts [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'allow-conflicts' -d 'Allow conflicts, but don\'t mark them'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'dont-allow-conflicts' -d 'Fail if there are patches that would create conflicts'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-allow-conflicts' -d 'Fail if there are patches that would create conflicts'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-resolve-conflicts' -d 'Fail if there are patches that would create conflicts'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'skip-conflicts' -d 'Filter out any patches that would create conflicts'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'external-merge' -d 'Use external tool to merge conflicts'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'test' -d 'Run the test script'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-test' -d 'Don\'t run the test script [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'dry-run' -d 'Don\'t actually take the action'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'xml-output' -d 'Generate XML formatted output'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'summary' -s s -d 'Summarize changes'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-summary' -d 'Don\'t summarize changes'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-deps' -d 'Don\'t automatically fulfill dependencies'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'auto-deps' -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'dont-prompt-for-dependencies' -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'prompt-deps' -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'prompt-for-dependencies' -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'set-default' -d 'Set default repository'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-set-default' -d 'Don\'t set default repository'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'ignore-unrelated-repos' -d 'Do not check if repositories are unrelated'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'intersection' -d 'Take intersection of all repositories'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'union' -d 'Take union of all repositories [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'complement' -d 'Take complement of repositories (in order listed)'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'compress' -d 'Compress patch data [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'dont-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'remote-repo' -d 'Specify the remote repository URL to work with'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'set-scripts-executable' -d 'Make scripts executable'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'dont-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'restrict-paths' -d 'Don\'t allow darcs to touch external files or repo metadata [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'dont-restrict-paths' -d 'Allow darcs to modify any file or directory (unsafe)'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-restrict-paths' -d 'Allow darcs to modify any file or directory (unsafe)'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'reverse' -d 'Show/consider changes in reverse order'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-reverse' -d 'Show/consider changes in the usual order [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'pause-for-gui' -d 'Pause for an external diff or merge command to finish [DEFAULT]'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-pause-for-gui' -d 'Return immediately after external diff or merge command finishes'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'no-http-pipelining' -d 'Disable HTTP pipelining'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l 'remote-darcs' -d 'Name of the darcs executable on the remote server'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l matches -d 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l patches -s p -d 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l tags -s t -d 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l reorder-patches -d 'Reorder the patches in the repository'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-reorder-patches -d 'Don\'t reorder the patches in the repository [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l mark-conflicts -d 'Mark conflicts [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l allow-conflicts -d 'Allow conflicts, but don\'t mark them'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dont-allow-conflicts -d 'Fail if there are patches that would create conflicts'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-allow-conflicts -d 'Fail if there are patches that would create conflicts'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-resolve-conflicts -d 'Fail if there are patches that would create conflicts'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l skip-conflicts -d 'Filter out any patches that would create conflicts'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l external-merge -d 'Use external tool to merge conflicts'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l test -d 'Run the test script'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-test -d 'Don\'t run the test script [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dry-run -d 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l xml-output -d 'Generate XML formatted output'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l summary -s s -d 'Summarize changes'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-summary -d 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-deps -d 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l auto-deps -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dont-prompt-for-dependencies -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l prompt-deps -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l prompt-for-dependencies -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l set-default -d 'Set default repository'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-set-default -d 'Don\'t set default repository'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l ignore-unrelated-repos -d 'Do not check if repositories are unrelated'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l intersection -d 'Take intersection of all repositories'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l union -d 'Take union of all repositories [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l complement -d 'Take complement of repositories (in order listed)'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l compress -d 'Compress patch data [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dont-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l remote-repo -d 'Specify the remote repository URL to work with'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l set-scripts-executable -d 'Make scripts executable'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dont-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l restrict-paths -d 'Don\'t allow darcs to touch external files or repo metadata [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dont-restrict-paths -d 'Allow darcs to modify any file or directory (unsafe)'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-restrict-paths -d 'Allow darcs to modify any file or directory (unsafe)'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l reverse -d 'Show/consider changes in reverse order'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-reverse -d 'Show/consider changes in the usual order [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l pause-for-gui -d 'Pause for an external diff or merge command to finish [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-pause-for-gui -d 'Return immediately after external diff or merge command finishes'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-http-pipelining -d 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l remote-darcs -d 'Name of the darcs executable on the remote server'
 
 #
 # Completions for the 'obliterate' subcommand
 #
 
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'not-in-remote' -d 'Select all patches not in the default push/pull repository or at location URL/PATH'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'from-match' -d 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'from-patch' -d 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'from-hash' -d 'Select changes starting with a patch with HASH'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'from-tag' -d 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'last' -d 'Select the last NUMBER patches'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'matches' -d 'Select patches matching PATTERN'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'patches' -s p -d 'Select patches matching REGEXP'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'tags' -s t -d 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'no-deps' -d 'Don\'t automatically fulfill dependencies'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'auto-deps' -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'dont-prompt-for-dependencies' -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'prompt-deps' -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'prompt-for-dependencies' -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'summary' -s s -d 'Summarize changes'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'no-summary' -d 'Don\'t summarize changes'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'output' -s o -d 'Specify output filename'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'output-auto-name' -s O -d 'Output to automatically named file in DIRECTORY, default: current directory'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'minimize' -d 'Minimize context of patch bundle [DEFAULT]'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'no-minimize' -d 'Don\'t minimize context of patch bundle'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'dry-run' -d 'Don\'t actually take the action'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'xml-output' -d 'Generate XML formatted output'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'compress' -d 'Compress patch data [DEFAULT]'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'dont-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'no-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'reverse' -d 'Show/consider changes in reverse order'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l 'no-reverse' -d 'Show/consider changes in the usual order [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l not-in-remote -d 'Select all patches not in the default push/pull repository or at location URL/PATH'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l from-match -d 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l from-patch -d 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l from-hash -d 'Select changes starting with a patch with HASH'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l from-tag -d 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l last -d 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l matches -d 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l patches -s p -d 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l tags -s t -d 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-deps -d 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l auto-deps -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l dont-prompt-for-dependencies -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l prompt-deps -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l prompt-for-dependencies -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l summary -s s -d 'Summarize changes'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-summary -d 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l output -s o -d 'Specify output filename'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l output-auto-name -s O -d 'Output to automatically named file in DIRECTORY, default: current directory'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l minimize -d 'Minimize context of patch bundle [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-minimize -d 'Don\'t minimize context of patch bundle'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l dry-run -d 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l xml-output -d 'Generate XML formatted output'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l compress -d 'Compress patch data [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l dont-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l reverse -d 'Show/consider changes in reverse order'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-reverse -d 'Show/consider changes in the usual order [DEFAULT]'
 
 #
 # Completions for the 'rollback' subcommand
 #
 
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'from-match' -d 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'from-patch' -d 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'from-hash' -d 'Select changes starting with a patch with HASH'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'from-tag' -d 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'last' -d 'Select the last NUMBER patches'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'matches' -d 'Select patches matching PATTERN'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'patches' -s p -d 'Select patches matching REGEXP'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'tags' -s t -d 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l from-match -d 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l from-patch -d 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l from-hash -d 'Select changes starting with a patch with HASH'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l from-tag -d 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l last -d 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l matches -d 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l patches -s p -d 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l tags -s t -d 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'push' subcommand
 #
 
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'matches' -d 'Select patches matching PATTERN'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'patches' -s p -d 'Select patches matching REGEXP'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'tags' -s t -d 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'no-deps' -d 'Don\'t automatically fulfill dependencies'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'auto-deps' -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'dont-prompt-for-dependencies' -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'prompt-deps' -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'prompt-for-dependencies' -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'sign' -d 'Sign the patch with your gpg key'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'sign-as' -d 'Sign the patch with a given keyid'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'sign-ssl' -d 'Sign the patch using openssl with a given private key'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'dont-sign' -d 'Don\'t sign the patch [DEFAULT]'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'no-sign' -d 'Don\'t sign the patch [DEFAULT]'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'dry-run' -d 'Don\'t actually take the action'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'xml-output' -d 'Generate XML formatted output'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'summary' -s s -d 'Summarize changes'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'no-summary' -d 'Don\'t summarize changes'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'set-default' -d 'Set default repository'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'no-set-default' -d 'Don\'t set default repository'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'ignore-unrelated-repos' -d 'Do not check if repositories are unrelated'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'apply-as' -d 'Apply patch as another user using sudo'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'no-apply-as' -d 'Don\'t use sudo to apply as another user [DEFAULT]'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'remote-repo' -d 'Specify the remote repository URL to work with'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'reverse' -d 'Show/consider changes in reverse order'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'no-reverse' -d 'Show/consider changes in the usual order [DEFAULT]'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'compress' -d 'Compress patch data [DEFAULT]'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'dont-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'no-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'no-http-pipelining' -d 'Disable HTTP pipelining'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l 'remote-darcs' -d 'Name of the darcs executable on the remote server'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l matches -d 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l patches -s p -d 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l tags -s t -d 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-deps -d 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l auto-deps -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l dont-prompt-for-dependencies -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l prompt-deps -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l prompt-for-dependencies -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l sign -d 'Sign the patch with your gpg key'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l sign-as -d 'Sign the patch with a given keyid'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l sign-ssl -d 'Sign the patch using openssl with a given private key'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l dont-sign -d 'Don\'t sign the patch [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-sign -d 'Don\'t sign the patch [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l dry-run -d 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l xml-output -d 'Generate XML formatted output'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l summary -s s -d 'Summarize changes'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-summary -d 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l set-default -d 'Set default repository'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-set-default -d 'Don\'t set default repository'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l ignore-unrelated-repos -d 'Do not check if repositories are unrelated'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l apply-as -d 'Apply patch as another user using sudo'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-apply-as -d 'Don\'t use sudo to apply as another user [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l remote-repo -d 'Specify the remote repository URL to work with'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l reverse -d 'Show/consider changes in reverse order'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-reverse -d 'Show/consider changes in the usual order [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l compress -d 'Compress patch data [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l dont-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-http-pipelining -d 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l remote-darcs -d 'Name of the darcs executable on the remote server'
 
 #
 # Completions for the 'send' subcommand
 #
 
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'matches' -d 'Select patches matching PATTERN'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'patches' -s p -d 'Select patches matching REGEXP'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'tags' -s t -d 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'no-deps' -d 'Don\'t automatically fulfill dependencies'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'auto-deps' -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'dont-prompt-for-dependencies' -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'prompt-deps' -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'prompt-for-dependencies' -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'to' -d 'Specify destination email'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'cc' -d 'Mail results to additional EMAIL(s)'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'from' -d 'Specify email address'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'subject' -d 'Specify mail subject'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'in-reply-to' -d 'Specify in-reply-to header'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'author' -s A -d 'Specify author id'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'charset' -d 'Specify mail charset'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'mail' -d 'Send patch using sendmail'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'sendmail-command' -d 'Specify sendmail command'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'output' -s o -d 'Specify output filename'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'output-auto-name' -s O -d 'Output to automatically named file in DIRECTORY, default: current directory'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'sign' -d 'Sign the patch with your gpg key'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'sign-as' -d 'Sign the patch with a given keyid'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'sign-ssl' -d 'Sign the patch using openssl with a given private key'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'dont-sign' -d 'Don\'t sign the patch [DEFAULT]'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'no-sign' -d 'Don\'t sign the patch [DEFAULT]'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'dry-run' -d 'Don\'t actually take the action'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'xml-output' -d 'Generate XML formatted output'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'summary' -s s -d 'Summarize changes'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'no-summary' -d 'Don\'t summarize changes'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'edit-description' -d 'Edit the patch bundle description [DEFAULT]'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'dont-edit-description' -d 'Don\'t edit the patch bundle description'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'no-edit-description' -d 'Don\'t edit the patch bundle description'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'set-default' -d 'Set default repository'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'no-set-default' -d 'Don\'t set default repository'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'minimize' -d 'Minimize context of patch bundle [DEFAULT]'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'no-minimize' -d 'Don\'t minimize context of patch bundle'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'ignore-unrelated-repos' -d 'Do not check if repositories are unrelated'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'logfile' -d 'Give patch name and comment in file'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'delete-logfile' -d 'Delete the logfile when done'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'no-delete-logfile' -d 'Keep the logfile when done [DEFAULT]'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'remote-repo' -d 'Specify the remote repository URL to work with'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'context' -d 'Send to context stored in FILENAME'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'reverse' -d 'Show/consider changes in reverse order'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'no-reverse' -d 'Show/consider changes in the usual order [DEFAULT]'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'no-http-pipelining' -d 'Disable HTTP pipelining'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l 'remote-darcs' -d 'Name of the darcs executable on the remote server'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l matches -d 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l patches -s p -d 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l tags -s t -d 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-deps -d 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l auto-deps -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dont-prompt-for-dependencies -d 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l prompt-deps -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l prompt-for-dependencies -d 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l to -d 'Specify destination email'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l cc -d 'Mail results to additional EMAIL(s)'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l from -d 'Specify email address'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l subject -d 'Specify mail subject'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l in-reply-to -d 'Specify in-reply-to header'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l author -s A -d 'Specify author id'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l charset -d 'Specify mail charset'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l mail -d 'Send patch using sendmail'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sendmail-command -d 'Specify sendmail command'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l output -s o -d 'Specify output filename'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l output-auto-name -s O -d 'Output to automatically named file in DIRECTORY, default: current directory'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sign -d 'Sign the patch with your gpg key'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sign-as -d 'Sign the patch with a given keyid'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sign-ssl -d 'Sign the patch using openssl with a given private key'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dont-sign -d 'Don\'t sign the patch [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-sign -d 'Don\'t sign the patch [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dry-run -d 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l xml-output -d 'Generate XML formatted output'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l summary -s s -d 'Summarize changes'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-summary -d 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l edit-description -d 'Edit the patch bundle description [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dont-edit-description -d 'Don\'t edit the patch bundle description'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-edit-description -d 'Don\'t edit the patch bundle description'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l set-default -d 'Set default repository'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-set-default -d 'Don\'t set default repository'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l minimize -d 'Minimize context of patch bundle [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-minimize -d 'Don\'t minimize context of patch bundle'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l ignore-unrelated-repos -d 'Do not check if repositories are unrelated'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l logfile -d 'Give patch name and comment in file'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l delete-logfile -d 'Delete the logfile when done'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-delete-logfile -d 'Keep the logfile when done [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l remote-repo -d 'Specify the remote repository URL to work with'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l context -d 'Send to context stored in FILENAME'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l reverse -d 'Show/consider changes in reverse order'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-reverse -d 'Show/consider changes in the usual order [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-http-pipelining -d 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l remote-darcs -d 'Name of the darcs executable on the remote server'
 
 #
 # Completions for the 'apply' subcommand
 #
 
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'verify' -d 'Verify that the patch was signed by a key in PUBRING'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'verify-ssl' -d 'Verify using openSSL with authorized keys from file KEYS'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-verify' -d 'Don\'t verify patch signature [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'reorder-patches' -d 'Reorder the patches in the repository'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-reorder-patches' -d 'Don\'t reorder the patches in the repository [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'all' -s a -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-interactive' -d 'Answer yes to all patches'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'interactive' -s i -d 'Prompt user interactively'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'dry-run' -d 'Don\'t actually take the action'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'xml-output' -d 'Generate XML formatted output'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'matches' -d 'Select patches matching PATTERN'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'patches' -s p -d 'Select patches matching REGEXP'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'tags' -s t -d 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'hash' -s h -d 'Select a single patch with HASH'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'mark-conflicts' -d 'Mark conflicts'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'allow-conflicts' -d 'Allow conflicts, but don\'t mark them'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'dont-allow-conflicts' -d 'Fail if there are patches that would create conflicts [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-allow-conflicts' -d 'Fail if there are patches that would create conflicts [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-resolve-conflicts' -d 'Fail if there are patches that would create conflicts [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'skip-conflicts' -d 'Filter out any patches that would create conflicts'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'external-merge' -d 'Use external tool to merge conflicts'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'test' -d 'Run the test script'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-test' -d 'Don\'t run the test script [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'leave-test-directory' -d 'Don\'t remove the test directory [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'remove-test-directory' -d 'Remove the test directory'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'repodir' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'reply' -d 'Reply to email-based patch using FROM address'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'cc' -d 'Mail results to additional EMAIL(s). Requires --reply'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'happy-forwarding' -d 'Forward unsigned messages without extra header'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-happy-forwarding' -d 'Don\'t forward unsigned messages without extra header [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'mail' -d 'Send patch using sendmail'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'sendmail-command' -d 'Specify sendmail command'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'compress' -d 'Compress patch data [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'dont-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-compress' -d 'Don\'t compress patch data'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'set-scripts-executable' -d 'Make scripts executable'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'dont-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'restrict-paths' -d 'Don\'t allow darcs to touch external files or repo metadata [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'dont-restrict-paths' -d 'Allow darcs to modify any file or directory (unsafe)'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-restrict-paths' -d 'Allow darcs to modify any file or directory (unsafe)'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'reverse' -d 'Show/consider changes in reverse order'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-reverse' -d 'Show/consider changes in the usual order [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'pause-for-gui' -d 'Pause for an external diff or merge command to finish [DEFAULT]'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l 'no-pause-for-gui' -d 'Return immediately after external diff or merge command finishes'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l verify -d 'Verify that the patch was signed by a key in PUBRING'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l verify-ssl -d 'Verify using openSSL with authorized keys from file KEYS'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-verify -d 'Don\'t verify patch signature [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l reorder-patches -d 'Reorder the patches in the repository'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-reorder-patches -d 'Don\'t reorder the patches in the repository [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l all -s a -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-interactive -d 'Answer yes to all patches'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l interactive -s i -d 'Prompt user interactively'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dry-run -d 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l xml-output -d 'Generate XML formatted output'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l matches -d 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l patches -s p -d 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l tags -s t -d 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l hash -s h -d 'Select a single patch with HASH'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l mark-conflicts -d 'Mark conflicts'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l allow-conflicts -d 'Allow conflicts, but don\'t mark them'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dont-allow-conflicts -d 'Fail if there are patches that would create conflicts [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-allow-conflicts -d 'Fail if there are patches that would create conflicts [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-resolve-conflicts -d 'Fail if there are patches that would create conflicts [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l skip-conflicts -d 'Filter out any patches that would create conflicts'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l external-merge -d 'Use external tool to merge conflicts'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l test -d 'Run the test script'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-test -d 'Don\'t run the test script [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l leave-test-directory -d 'Don\'t remove the test directory [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l remove-test-directory -d 'Remove the test directory'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l repodir -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l reply -d 'Reply to email-based patch using FROM address'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l cc -d 'Mail results to additional EMAIL(s). Requires --reply'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l happy-forwarding -d 'Forward unsigned messages without extra header'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-happy-forwarding -d 'Don\'t forward unsigned messages without extra header [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l mail -d 'Send patch using sendmail'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l sendmail-command -d 'Specify sendmail command'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l compress -d 'Compress patch data [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dont-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-compress -d 'Don\'t compress patch data'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l set-scripts-executable -d 'Make scripts executable'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dont-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l restrict-paths -d 'Don\'t allow darcs to touch external files or repo metadata [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dont-restrict-paths -d 'Allow darcs to modify any file or directory (unsafe)'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-restrict-paths -d 'Allow darcs to modify any file or directory (unsafe)'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l reverse -d 'Show/consider changes in reverse order'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-reverse -d 'Show/consider changes in the usual order [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l pause-for-gui -d 'Pause for an external diff or merge command to finish [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-pause-for-gui -d 'Return immediately after external diff or merge command finishes'
 
 #
 # Completions for the 'clone' subcommand
 #
 
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'repo-name' -d 'Path of output directory'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Path of output directory'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'lazy' -d 'Get patch files only as needed'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'complete' -d 'Get a complete copy of the repository'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'to-match' -d 'Select changes up to a patch matching PATTERN'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'to-patch' -d 'Select changes up to a patch matching REGEXP'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'to-hash' -d 'Select changes up to a patch with HASH'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'tag' -s t -d 'Select tag matching REGEXP'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'context' -d 'Version specified by the context in FILENAME'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'set-default' -d 'Set default repository'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'no-set-default' -d 'Don\'t set default repository'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'set-scripts-executable' -d 'Make scripts executable'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'dont-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'no-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'with-working-dir' -d 'Create a working tree (normal repository) [DEFAULT]'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'no-working-dir' -d 'Do not create a working tree (bare repository)'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'packs' -d 'Use repository packs [DEFAULT]'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'no-packs' -d 'Don\'t use repository packs'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'with-patch-index' -d 'Build patch index'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'no-patch-index' -d 'Don\'t build patch index [DEFAULT]'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'no-http-pipelining' -d 'Disable HTTP pipelining'
-complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l 'remote-darcs' -d 'Name of the darcs executable on the remote server'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l repo-name -d 'Path of output directory'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Path of output directory'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l lazy -d 'Get patch files only as needed'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l complete -d 'Get a complete copy of the repository'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l to-match -d 'Select changes up to a patch matching PATTERN'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l to-patch -d 'Select changes up to a patch matching REGEXP'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l to-hash -d 'Select changes up to a patch with HASH'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l tag -s t -d 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l context -d 'Version specified by the context in FILENAME'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l set-default -d 'Set default repository'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l no-set-default -d 'Don\'t set default repository'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l set-scripts-executable -d 'Make scripts executable'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l dont-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l no-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l with-working-dir -d 'Create a working tree (normal repository) [DEFAULT]'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l no-working-dir -d 'Do not create a working tree (bare repository)'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l packs -d 'Use repository packs [DEFAULT]'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l no-packs -d 'Don\'t use repository packs'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l with-patch-index -d 'Build patch index'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l no-patch-index -d 'Don\'t build patch index [DEFAULT]'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l no-http-pipelining -d 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'clone\' (commandline -poc)' -l remote-darcs -d 'Name of the darcs executable on the remote server'
 
 #
 # Completions for the 'initialize' subcommand
 #
 
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l 'darcs-2' -d 'Standard darcs patch format [DEFAULT]'
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l 'darcs-1' -d 'Older patch format (for compatibility)'
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l 'with-working-dir' -d 'Create a working tree (normal repository) [DEFAULT]'
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l 'no-working-dir' -d 'Do not create a working tree (bare repository)'
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l 'with-patch-index' -d 'Build patch index'
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l 'no-patch-index' -d 'Don\'t build patch index [DEFAULT]'
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l 'hashed' -d 'Deprecated, use --darcs-1 instead'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l darcs-2 -d 'Standard darcs patch format [DEFAULT]'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l darcs-1 -d 'Older patch format (for compatibility)'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l with-working-dir -d 'Create a working tree (normal repository) [DEFAULT]'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l no-working-dir -d 'Do not create a working tree (bare repository)'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l with-patch-index -d 'Build patch index'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l no-patch-index -d 'Don\'t build patch index [DEFAULT]'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l hashed -d 'Deprecated, use --darcs-1 instead'
 
 #
 # Completions for the 'optimize' subcommands
 #
 
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'optimize relink' subcommand
 #
 
-complete -c darcs -n 'contains \'optimize\' (commandline -poc) && contains \'relink\' (commandline -poc)' -l 'sibling' -d 'Specify a sibling directory'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc) && contains \'relink\' (commandline -poc)' -l sibling -d 'Specify a sibling directory'
 
 #
 # Completions for the 'repair' subcommand
 #
 
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l 'ignore-times' -d 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l 'no-ignore-times' -d 'Trust modification times to find modified files [DEFAULT]'
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l 'myers' -d 'Use myers diff algorithm'
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l 'patience' -d 'Use patience diff algorithm [DEFAULT]'
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l 'dry-run' -d 'Don\'t actually take the action'
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l 'umask' -d 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l ignore-times -d 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l no-ignore-times -d 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l myers -d 'Use myers diff algorithm'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l patience -d 'Use patience diff algorithm [DEFAULT]'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l dry-run -d 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l umask -d 'Specify umask to use when writing'
 
 #
 # Completions for the 'convert darcs-2' subcommand
 #
 
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'repo-name' -d 'Path of output directory'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Path of output directory'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'set-scripts-executable' -d 'Make scripts executable'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'dont-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'no-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'with-working-dir' -d 'Create a working tree (normal repository) [DEFAULT]'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'no-working-dir' -d 'Do not create a working tree (bare repository)'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'no-http-pipelining' -d 'Disable HTTP pipelining'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'remote-darcs' -d 'Name of the darcs executable on the remote server'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'with-patch-index' -d 'Build patch index'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l 'no-patch-index' -d 'Don\'t build patch index [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l repo-name -d 'Path of output directory'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Path of output directory'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l set-scripts-executable -d 'Make scripts executable'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l dont-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l no-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l with-working-dir -d 'Create a working tree (normal repository) [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l no-working-dir -d 'Do not create a working tree (bare repository)'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l no-http-pipelining -d 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l remote-darcs -d 'Name of the darcs executable on the remote server'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l with-patch-index -d 'Build patch index'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'darcs-2\' (commandline -poc)' -l no-patch-index -d 'Don\'t build patch index [DEFAULT]'
 
 #
 # Completions for the 'convert export' subcommand
 #
 
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l 'repo-name' -d 'Path of output directory'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Path of output directory'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l 'read-marks' -d 'Continue conversion, previously checkpointed by --write-marks'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l 'write-marks' -d 'Checkpoint conversion to continue it later'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l 'no-http-pipelining' -d 'Disable HTTP pipelining'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l 'remote-darcs' -d 'Name of the darcs executable on the remote server'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l repo-name -d 'Path of output directory'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Path of output directory'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l read-marks -d 'Continue conversion, previously checkpointed by --write-marks'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l write-marks -d 'Checkpoint conversion to continue it later'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l no-http-pipelining -d 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'export\' (commandline -poc)' -l remote-darcs -d 'Name of the darcs executable on the remote server'
 
 #
 # Completions for the 'convert import' subcommand
 #
 
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'repo-name' -d 'Path of output directory'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'repodir' -x -a '(__fish_complete_directories (commandline -ct))' -d 'Path of output directory'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'set-scripts-executable' -d 'Make scripts executable'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'dont-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'no-set-scripts-executable' -d 'Don\'t make scripts executable [DEFAULT]'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'darcs-2' -d 'Standard darcs patch format [DEFAULT]'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'darcs-1' -d 'Older patch format (for compatibility)'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'with-working-dir' -d 'Create a working tree (normal repository) [DEFAULT]'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'no-working-dir' -d 'Do not create a working tree (bare repository)'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'with-patch-index' -d 'Build patch index'
-complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l 'no-patch-index' -d 'Don\'t build patch index [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l repo-name -d 'Path of output directory'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' -d 'Path of output directory'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l set-scripts-executable -d 'Make scripts executable'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l dont-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l no-set-scripts-executable -d 'Don\'t make scripts executable [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l darcs-2 -d 'Standard darcs patch format [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l darcs-1 -d 'Older patch format (for compatibility)'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l with-working-dir -d 'Create a working tree (normal repository) [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l no-working-dir -d 'Do not create a working tree (bare repository)'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l with-patch-index -d 'Build patch index'
+complete -c darcs -n 'contains \'convert\' (commandline -poc) && contains \'import\' (commandline -poc)' -l no-patch-index -d 'Don\'t build patch index [DEFAULT]'
diff --git a/share/completions/dconf.fish b/share/completions/dconf.fish
index 8c014dd29..45d427d67 100644
--- a/share/completions/dconf.fish
+++ b/share/completions/dconf.fish
@@ -22,16 +22,16 @@ end
 set -l commands read list write reset compile update watch dump load help
 
 complete -f -e -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'
-complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a 'reset' -d 'Delete a key or an entire directory'
-complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a 'compile' -d 'Compile a binary database from keyfiles'
-complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a 'update' -d 'Update the system dconf databases'
-complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a 'watch' -d 'Watch a key or directory for changes'
-complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a 'dump' -d 'Dump an entire subpath to stdout'
-complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a 'load' -d 'Populate a subpath from stdin'
-complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a 'help' -d 'Display help and exit'
+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'
+complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a reset -d 'Delete a key or an entire directory'
+complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a compile -d 'Compile a binary database from keyfiles'
+complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a update -d 'Update the system dconf databases'
+complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a watch -d 'Watch a key or directory for changes'
+complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a dump -d 'Dump an entire subpath to stdout'
+complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a load -d 'Populate a subpath from stdin'
+complete -f -c dconf -n "not __fish_seen_subcommand_from $commands" -a help -d 'Display help and exit'
 
 
 ### Arguments to commands
diff --git a/share/completions/dd.fish b/share/completions/dd.fish
index db245850d..abd938c58 100644
--- a/share/completions/dd.fish
+++ b/share/completions/dd.fish
@@ -1,6 +1,6 @@
 complete -c dd -xa '(__fish_complete_dd)'
-complete -c dd -d 'display help and exit' -xa '--help'
-complete -c dd -d 'output version information and exit' -xa '--version'
+complete -c dd -d 'display help and exit' -xa --help
+complete -c dd -d 'output version information and exit' -xa --version
 
 function __fish_complete_dd -d 'Complete dd operands'
     # set operand_string as a local variable containing the current command-line token.
diff --git a/share/completions/defaults.fish b/share/completions/defaults.fish
index 408bfe688..772065d82 100644
--- a/share/completions/defaults.fish
+++ b/share/completions/defaults.fish
@@ -4,30 +4,30 @@ function __fish_defaults_domains
     defaults domains | string split ", "
 end
 
-complete -f -c defaults -o 'currentHost' -d 'Restricts preferences operations to the current logged-in host'
-complete -f -c defaults -o 'host' -d 'Restricts preferences operations to hostname'
+complete -f -c defaults -o currentHost -d 'Restricts preferences operations to the current logged-in host'
+complete -f -c defaults -o host -d 'Restricts preferences operations to hostname'
 
 # read
-complete -f -c defaults -n '__fish_use_subcommand' -a read -d 'Shows defaults entire given domain'
+complete -f -c defaults -n __fish_use_subcommand -a read -d 'Shows defaults entire given domain'
 complete -f -c defaults -n '__fish_seen_subcommand_from read read-type write rename delete' -a '(__fish_defaults_domains)'
-complete -f -c defaults -n '__fish_seen_subcommand_from read read-type write rename delete' -o 'app'
+complete -f -c defaults -n '__fish_seen_subcommand_from read read-type write rename delete' -o app
 
 # write
-complete -f -c defaults -n '__fish_use_subcommand' -a write -d 'Writes domain or or a key in the domain'
-complete -f -c defaults -n '__fish_seen_subcommand_from write' -o 'string' -d 'String as the value for the given key'
-complete -f -c defaults -n '__fish_seen_subcommand_from write' -o 'data' -d 'Raw data bytes for given key'
-complete -f -c defaults -n '__fish_seen_subcommand_from write' -o 'int' -d 'Integer as the value for the given key'
-complete -f -c defaults -n '__fish_seen_subcommand_from write' -o 'float' -d 'Floating point number as the value for the given key'
-complete -f -c defaults -n '__fish_seen_subcommand_from write' -o 'bool' -d 'Boolean as the value for the given key'
-complete -f -c defaults -n '__fish_seen_subcommand_from write' -o 'date' -d 'Date as the value for the given key'
-complete -f -c defaults -n '__fish_seen_subcommand_from write' -o 'array' -d 'Array as the value for the given key'
-complete -f -c defaults -n '__fish_seen_subcommand_from write' -o 'array-add' -d 'Add new elements to the end of an array'
-complete -f -c defaults -n '__fish_seen_subcommand_from write' -o 'dict' -d 'Add a dictionary to domain'
-complete -f -c defaults -n '__fish_seen_subcommand_from write' -o 'dict-add' -d 'Add new key/value pairs to a dictionary'
+complete -f -c defaults -n __fish_use_subcommand -a write -d 'Writes domain or or a key in the domain'
+complete -f -c defaults -n '__fish_seen_subcommand_from write' -o string -d 'String as the value for the given key'
+complete -f -c defaults -n '__fish_seen_subcommand_from write' -o data -d 'Raw data bytes for given key'
+complete -f -c defaults -n '__fish_seen_subcommand_from write' -o int -d 'Integer as the value for the given key'
+complete -f -c defaults -n '__fish_seen_subcommand_from write' -o float -d 'Floating point number as the value for the given key'
+complete -f -c defaults -n '__fish_seen_subcommand_from write' -o bool -d 'Boolean as the value for the given key'
+complete -f -c defaults -n '__fish_seen_subcommand_from write' -o date -d 'Date as the value for the given key'
+complete -f -c defaults -n '__fish_seen_subcommand_from write' -o array -d 'Array as the value for the given key'
+complete -f -c defaults -n '__fish_seen_subcommand_from write' -o array-add -d 'Add new elements to the end of an array'
+complete -f -c defaults -n '__fish_seen_subcommand_from write' -o dict -d 'Add a dictionary to domain'
+complete -f -c defaults -n '__fish_seen_subcommand_from write' -o dict-add -d 'Add new key/value pairs to a dictionary'
 
-complete -f -c defaults -n '__fish_use_subcommand' -a read-type -d 'Shows the type for the given domain, key'
-complete -f -c defaults -n '__fish_use_subcommand' -a rename -d 'Renames old_key to new_key'
-complete -f -c defaults -n '__fish_use_subcommand' -a delete -d 'Deletes domain or a key in the domain'
-complete -f -c defaults -n '__fish_use_subcommand' -a domains -d 'Prints the names of all domains in the users defaults system'
-complete -f -c defaults -n '__fish_use_subcommand' -a find -d 'Searches for word in domain names, keys, and values'
-complete -f -c defaults -n '__fish_use_subcommand' -a help -d 'Prints a list of possible command formats'
+complete -f -c defaults -n __fish_use_subcommand -a read-type -d 'Shows the type for the given domain, key'
+complete -f -c defaults -n __fish_use_subcommand -a rename -d 'Renames old_key to new_key'
+complete -f -c defaults -n __fish_use_subcommand -a delete -d 'Deletes domain or a key in the domain'
+complete -f -c defaults -n __fish_use_subcommand -a domains -d 'Prints the names of all domains in the users defaults system'
+complete -f -c defaults -n __fish_use_subcommand -a find -d 'Searches for word in domain names, keys, and values'
+complete -f -c defaults -n __fish_use_subcommand -a help -d 'Prints a list of possible command formats'
diff --git a/share/completions/dhclient.fish b/share/completions/dhclient.fish
index 24a7f756f..f87a85fcb 100644
--- a/share/completions/dhclient.fish
+++ b/share/completions/dhclient.fish
@@ -38,8 +38,8 @@ complete -c dhclient -l no-pid -d 'Disable writing pid files'
 complete -c dhclient -o sf -F -d 'Path to the network configuration script'
 complete -c dhclient -s B -d 'Always set the bootp broadcast flag in request packets'
 complete -c dhclient -s C -x -d 'DHCP client identifier'
-complete -c dhclient -s H -x -d 'Hostname'
-complete -c dhclient -s F -x -d 'FQDN'
+complete -c dhclient -s H -x -d Hostname
+complete -c dhclient -s F -x -d FQDN
 complete -c dhclient -s V -x -d 'Vendor class identifier'
 complete -c dhclient -l request-options -x -d 'Request option list'
-complete -c dhclient -l timeout -x -d 'Timeout'
+complete -c dhclient -l timeout -x -d Timeout
diff --git a/share/completions/diskutil.fish b/share/completions/diskutil.fish
index ca9265a8e..1730c3427 100644
--- a/share/completions/diskutil.fish
+++ b/share/completions/diskutil.fish
@@ -27,130 +27,130 @@ end
 ############
 
 # list
-complete -f -c diskutil -n '__fish_use_subcommand' -a list -d 'List disks'
-complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand list' -o 'plist' -d 'Return a property list'
+complete -f -c diskutil -n __fish_use_subcommand -a list -d 'List disks'
+complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand list' -o plist -d 'Return a property list'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand list' -a '(__fish_diskutil_devices)'
 
 # info
-complete -f -c diskutil -n '__fish_use_subcommand' -a info -d 'Get detailed information about a specific whole disk or partition'
-complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand info' -o 'plist' -d 'Return a property list'
+complete -f -c diskutil -n __fish_use_subcommand -a info -d 'Get detailed information about a specific whole disk or partition'
+complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand info' -o plist -d 'Return a property list'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand info' -a '(__fish_diskutil_devices)'
-complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand info' -o 'all' -d 'Process all disks'
+complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand info' -o all -d 'Process all disks'
 
 # activity
-complete -f -c diskutil -n '__fish_use_subcommand' -a activity -d 'Continuously display system-wide disk manipulation activity'
+complete -f -c diskutil -n __fish_use_subcommand -a activity -d 'Continuously display system-wide disk manipulation activity'
 
 # listFilesystems
-complete -f -c diskutil -n '__fish_use_subcommand' -a listFilesystems -d 'Show the file system personalities available'
-complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand listFilesystems' -o 'plist' -d 'Return a property list'
+complete -f -c diskutil -n __fish_use_subcommand -a listFilesystems -d 'Show the file system personalities available'
+complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand listFilesystems' -o plist -d 'Return a property list'
 
 # umount
-complete -f -c diskutil -n '__fish_use_subcommand' -a umount -d 'Unmount a single volume'
+complete -f -c diskutil -n __fish_use_subcommand -a umount -d 'Unmount a single volume'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand umount' -a '(__fish_diskutil_mounted_volumes)'
 
 # umountDisk
-complete -f -c diskutil -n '__fish_use_subcommand' -a umountDisk -d 'Unmount an entire disk (all volumes)'
+complete -f -c diskutil -n __fish_use_subcommand -a umountDisk -d 'Unmount an entire disk (all volumes)'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand umountDisk' -a '(__fish_diskutil_mounted_volumes)'
 
 # eject
-complete -f -c diskutil -n '__fish_use_subcommand' -a eject -d 'Eject a disk'
+complete -f -c diskutil -n __fish_use_subcommand -a eject -d 'Eject a disk'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand eject' -a '(__fish_diskutil_devices)'
 
 # mount
-complete -f -c diskutil -n '__fish_use_subcommand' -a mount -d 'Mount a single volume'
-complete -r -c diskutil -n '__fish_diskutil_using_not_subcommand mount' -o 'mountPoint' -d 'Specify mount point'
+complete -f -c diskutil -n __fish_use_subcommand -a mount -d 'Mount a single volume'
+complete -r -c diskutil -n '__fish_diskutil_using_not_subcommand mount' -o mountPoint -d 'Specify mount point'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand mount' -a '(__fish_diskutil_devices)'
 
 # mountDisk
-complete -f -c diskutil -n '__fish_use_subcommand' -a mountDisk -d 'Mount an entire disk (all mountable volumes)'
+complete -f -c diskutil -n __fish_use_subcommand -a mountDisk -d 'Mount an entire disk (all mountable volumes)'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand mountDisk' -a '(__fish_diskutil_devices)'
 
 # rename
-complete -f -c diskutil -n '__fish_use_subcommand' -a rename -d 'Rename a volume'
+complete -f -c diskutil -n __fish_use_subcommand -a rename -d 'Rename a volume'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand rename' -a '(__fish_diskutil_devices)'
 
 # enableJournal
-complete -f -c diskutil -n '__fish_use_subcommand' -a enableJournal -d 'Enable journaling on an HFS+ volume'
+complete -f -c diskutil -n __fish_use_subcommand -a enableJournal -d 'Enable journaling on an HFS+ volume'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand enableJournal' -a '(__fish_diskutil_devices)'
 
 # disableJournal
-complete -f -c diskutil -n '__fish_use_subcommand' -a disableJournal -d 'Disable journaling on an HFS+ volume'
+complete -f -c diskutil -n __fish_use_subcommand -a disableJournal -d 'Disable journaling on an HFS+ volume'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand disableJournal' -a '(__fish_diskutil_devices)'
 
 # moveJournal
-complete -f -c diskutil -n '__fish_use_subcommand' -a moveJournal -d 'Create a 512MB Apple_Journal partition'
+complete -f -c diskutil -n __fish_use_subcommand -a moveJournal -d 'Create a 512MB Apple_Journal partition'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand moveJournal' -a '(__fish_diskutil_devices)'
 
 # enableOwnership
-complete -f -c diskutil -n '__fish_use_subcommand' -a enableOwnership -d 'Enable ownership of a volume'
+complete -f -c diskutil -n __fish_use_subcommand -a enableOwnership -d 'Enable ownership of a volume'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand enableOwnership' -a '(__fish_diskutil_devices)'
 
 # disableOwnership
-complete -f -c diskutil -n '__fish_use_subcommand' -a disableOwnership -d 'Disable ownership of a volume'
+complete -f -c diskutil -n __fish_use_subcommand -a disableOwnership -d 'Disable ownership of a volume'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand disableOwnership' -a '(__fish_diskutil_devices)'
 
 # verifyVolume
-complete -f -c diskutil -n '__fish_use_subcommand' -a verifyVolume -d 'Verify the file system data structures of a volume'
+complete -f -c diskutil -n __fish_use_subcommand -a verifyVolume -d 'Verify the file system data structures of a volume'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand verifyVolume' -a '(__fish_diskutil_devices)'
 
 # repairVolume
-complete -f -c diskutil -n '__fish_use_subcommand' -a repairVolume -d 'Repair the file system data structures of a volume'
+complete -f -c diskutil -n __fish_use_subcommand -a repairVolume -d 'Repair the file system data structures of a volume'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand repairVolume' -a '(__fish_diskutil_devices)'
 
 # verifyDisk
-complete -f -c diskutil -n '__fish_use_subcommand' -a verifyDisk -d 'Verify the partition map layout of a whole disk'
+complete -f -c diskutil -n __fish_use_subcommand -a verifyDisk -d 'Verify the partition map layout of a whole disk'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand verifyDisk' -a '(__fish_diskutil_devices)'
 
 # repairDisk
-complete -f -c diskutil -n '__fish_use_subcommand' -a repairDisk -d 'Repair the partition map layout of a whole disk'
+complete -f -c diskutil -n __fish_use_subcommand -a repairDisk -d 'Repair the partition map layout of a whole disk'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand repairDisk' -a '(__fish_diskutil_devices)'
 
 # eraseDisk
-complete -f -c diskutil -n '__fish_use_subcommand' -a eraseDisk -d 'Erase an existing disk'
+complete -f -c diskutil -n __fish_use_subcommand -a eraseDisk -d 'Erase an existing disk'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand eraseDisk' -a '(__fish_diskutil_devices)'
 
 # eraseVolume
-complete -f -c diskutil -n '__fish_use_subcommand' -a verifyDisk -d 'Write out a new empty file system volume'
+complete -f -c diskutil -n __fish_use_subcommand -a verifyDisk -d 'Write out a new empty file system volume'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand verifyDisk' -a '(__fish_diskutil_devices)'
 
 # reformat
-complete -f -c diskutil -n '__fish_use_subcommand' -a reformat -d 'Erase an existing volume by writing out a new empty file system'
+complete -f -c diskutil -n __fish_use_subcommand -a reformat -d 'Erase an existing volume by writing out a new empty file system'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand reformat' -a '(__fish_diskutil_devices)'
 
 # eraseOptical
-complete -f -c diskutil -n '__fish_use_subcommand' -a eraseOptical -d 'Erase optical media (CD/RW, DVD/RW, etc.)'
+complete -f -c diskutil -n __fish_use_subcommand -a eraseOptical -d 'Erase optical media (CD/RW, DVD/RW, etc.)'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand eraseOptical' -a '(__fish_diskutil_devices)'
 
 # zeroDisk
-complete -f -c diskutil -n '__fish_use_subcommand' -a zeroDisk -d 'Erase a device, writing zeros to the media'
+complete -f -c diskutil -n __fish_use_subcommand -a zeroDisk -d 'Erase a device, writing zeros to the media'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand zeroDisk' -a '(__fish_diskutil_devices)'
 
 # randomDisk
-complete -f -c diskutil -n '__fish_use_subcommand' -a randomDisk -d 'Erase a whole disk, writing random data to the media'
+complete -f -c diskutil -n __fish_use_subcommand -a randomDisk -d 'Erase a whole disk, writing random data to the media'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand randomDisk' -a '(__fish_diskutil_devices)'
 
 # secureErase
-complete -f -c diskutil -n '__fish_use_subcommand' -a secureErase -d 'Erase, using a secure method'
+complete -f -c diskutil -n __fish_use_subcommand -a secureErase -d 'Erase, using a secure method'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand secureErase' -a '(__fish_diskutil_devices)'
 
 # partitionDisk
-complete -f -c diskutil -n '__fish_use_subcommand' -a partitionDisk -d '(re)Partition a disk, removing all volumes'
+complete -f -c diskutil -n __fish_use_subcommand -a partitionDisk -d '(re)Partition a disk, removing all volumes'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand partitionDisk' -a '(__fish_diskutil_devices)'
 
 # resizeVolume
-complete -f -c diskutil -n '__fish_use_subcommand' -a resizeVolume -d 'Non-destructively resize a volume (partition)'
+complete -f -c diskutil -n __fish_use_subcommand -a resizeVolume -d 'Non-destructively resize a volume (partition)'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand resizeVolume' -a '(__fish_diskutil_devices)'
 
 # splitPartition
-complete -f -c diskutil -n '__fish_use_subcommand' -a splitPartition -d 'Destructively split a volume into multiple partitions'
+complete -f -c diskutil -n __fish_use_subcommand -a splitPartition -d 'Destructively split a volume into multiple partitions'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand splitPartition' -a '(__fish_diskutil_devices)'
 
 # mergePartitions
-complete -f -c diskutil -n '__fish_use_subcommand' -a mergePartitions -d 'Merge two or more partitions on a disk'
+complete -f -c diskutil -n __fish_use_subcommand -a mergePartitions -d 'Merge two or more partitions on a disk'
 complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand mergePartitions' -a '(__fish_diskutil_devices)'
 
 # apfs
-complete -f -c diskutil -n '__fish_use_subcommand' -a apfs -d 'Merge two or more partitions on a disk'
+complete -f -c diskutil -n __fish_use_subcommand -a apfs -d 'Merge two or more partitions on a disk'
 complete -f -c diskutil -n '__fish_seen_subcommand_from apfs' -a list -d 'Show status of all current APFS Containers'
 complete -f -c diskutil -n '__fish_seen_subcommand_from apfs' -a convert -d 'Nondestructively convert from HFS to APFS'
 complete -f -c diskutil -n '__fish_seen_subcommand_from apfs' -a create -d 'Create a new APFS Container with one APFS Volume'
@@ -171,7 +171,7 @@ complete -f -c diskutil -n '__fish_seen_subcommand_from apfs' -a decryptVolume -
 complete -f -c diskutil -n '__fish_seen_subcommand_from apfs' -a updatePreboot -d 'Update the APFS Volume\'s related APFS Preboot Volume'
 
 # appleRAID
-complete -f -c diskutil -n '__fish_use_subcommand' -a appleRAID -d 'Create, manipulate and destroy AppleRAID volumes'
+complete -f -c diskutil -n __fish_use_subcommand -a appleRAID -d 'Create, manipulate and destroy AppleRAID volumes'
 complete -f -c diskutil -n '__fish_seen_subcommand_from appleRAID' -a list -d 'Display the current status of RAID sets'
 complete -f -c diskutil -n '__fish_seen_subcommand_from appleRAID' -a create -d 'Create a RAID set on multiple disks'
 complete -f -c diskutil -n '__fish_seen_subcommand_from appleRAID' -a delete -d 'Delete an existing RAID set'
@@ -182,7 +182,7 @@ complete -f -c diskutil -n '__fish_seen_subcommand_from appleRAID' -a enable -d
 complete -f -c diskutil -n '__fish_seen_subcommand_from appleRAID' -a update -d 'Update the settings of an existing RAID'
 
 # coreStorage
-complete -f -c diskutil -n '__fish_use_subcommand' -a coreStorage -d 'Create, manipulate and destroy CoreStorage volumes'
+complete -f -c diskutil -n __fish_use_subcommand -a coreStorage -d 'Create, manipulate and destroy CoreStorage volumes'
 complete -f -c diskutil -n '__fish_seen_subcommand_from coreStorage' -a list -d 'Show status of CoreStorage volumes'
 complete -f -c diskutil -n '__fish_seen_subcommand_from coreStorage' -a info -d 'Get CoreStorage information by UUID or disk'
 complete -f -c diskutil -n '__fish_seen_subcommand_from coreStorage' -a convert -d 'Convert a volume into a CoreStorage volume'
diff --git a/share/completions/dnf.fish b/share/completions/dnf.fish
index 99c43b7e1..0e1e72b7f 100644
--- a/share/completions/dnf.fish
+++ b/share/completions/dnf.fish
@@ -19,28 +19,28 @@ function __dnf_list_transactions
 end
 
 # Alias
-complete -c dnf -n "__fish_use_subcommand" -xa alias -d "Manage aliases"
+complete -c dnf -n __fish_use_subcommand -xa alias -d "Manage aliases"
 complete -c dnf -n "__fish_seen_subcommand_from alias" -xa add -d "Add a new alias"
 complete -c dnf -n "__fish_seen_subcommand_from alias" -xa list -d "Lists all defined aliases"
 complete -c dnf -n "__fish_seen_subcommand_from alias" -xa delete -d "Delete an alias"
 
 # Autoremove
-complete -c dnf -n "__fish_use_subcommand" -xa autoremove -d "Removes unneeded packages"
+complete -c dnf -n __fish_use_subcommand -xa autoremove -d "Removes unneeded packages"
 complete -c dnf -n "__fish_seen_subcommand_from autoremove" -xa "(__dnf_list_installed_packages)"
 
 # Check
-complete -c dnf -n "__fish_use_subcommand" -xa check -d "Check for problems in packagedb"
+complete -c dnf -n __fish_use_subcommand -xa check -d "Check for problems in packagedb"
 complete -c dnf -n "__fish_seen_subcommand_from check" -l dependencies -d "Checks dependencies"
 complete -c dnf -n "__fish_seen_subcommand_from check" -l duplicates -d "Checks duplicates"
 complete -c dnf -n "__fish_seen_subcommand_from check" -l obsoleted -d "Checks obsoleted"
 complete -c dnf -n "__fish_seen_subcommand_from check" -l provides -d "Checks provides"
 
 # Check-Update
-complete -c dnf -n "__fish_use_subcommand" -xa check-update -d "Checks for updates"
+complete -c dnf -n __fish_use_subcommand -xa check-update -d "Checks for updates"
 complete -c dnf -n "__fish_seen_subcommand_from check-update" -l changelogs
 
 # Clean
-complete -c dnf -n "__fish_use_subcommand" -xa clean -d "Clean up cache directory"
+complete -c dnf -n __fish_use_subcommand -xa clean -d "Clean up cache directory"
 complete -c dnf -n "__fish_seen_subcommand_from clean" -xa dbcache -d "Removes the database cache"
 complete -c dnf -n "__fish_seen_subcommand_from clean" -xa expire-cache -d "Marks the repository metadata expired"
 complete -c dnf -n "__fish_seen_subcommand_from clean" -xa metadata -d "Removes repository metadata"
@@ -48,14 +48,14 @@ complete -c dnf -n "__fish_seen_subcommand_from clean" -xa packages -d "Removes
 complete -c dnf -n "__fish_seen_subcommand_from clean" -xa all -d "Removes all cache"
 
 # Distro-sync
-complete -c dnf -n "__fish_use_subcommand" -xa distro-sync -d "Synchronizes packages to match the latest"
+complete -c dnf -n __fish_use_subcommand -xa distro-sync -d "Synchronizes packages to match the latest"
 
 # Downgrade
-complete -c dnf -n "__fish_use_subcommand" -xa downgrade -d "Downgrades the specified package"
+complete -c dnf -n __fish_use_subcommand -xa downgrade -d "Downgrades the specified package"
 complete -c dnf -n "__fish_seen_subcommand_from downgrade" -xa "(__dnf_list_installed_packages)"
 
 # Group
-complete -c dnf -n "__fish_use_subcommand" -xa group -d "Manage groups"
+complete -c dnf -n __fish_use_subcommand -xa group -d "Manage groups"
 
 complete -c dnf -n "__fish_seen_subcommand_from group; and not __fish_seen_subcommand_from mark" -xa summary -d "Display overview of installed and available groups"
 complete -c dnf -n "__fish_seen_subcommand_from group; and not __fish_seen_subcommand_from mark" -xa info -d "Display package list of a group"
@@ -78,10 +78,10 @@ complete -c dnf -n "__fish_seen_subcommand_from group; and __fish_seen_subcomman
 complete -c dnf -n "__fish_seen_subcommand_from group; and __fish_seen_subcommand_from mark" -xa remove -d "Mark group removed without removing packages"
 
 # Help
-complete -c dnf -n "__fish_use_subcommand" -xa help -d "Display help and exit"
+complete -c dnf -n __fish_use_subcommand -xa help -d "Display help and exit"
 
 # History
-complete -c dnf -n "__fish_use_subcommand" -xa history -d "View and manage past transactions"
+complete -c dnf -n __fish_use_subcommand -xa history -d "View and manage past transactions"
 complete -c dnf -n "__fish_seen_subcommand_from history" -xa list -d "Lists all transactions"
 complete -c dnf -n "__fish_seen_subcommand_from history" -xa info -d "Describe the given transactions"
 complete -c dnf -n "__fish_seen_subcommand_from history" -xa redo -d "Redoes the specified transaction"
@@ -94,15 +94,15 @@ for i in info redo rollback undo
 end
 
 # Info
-complete -c dnf -n "__fish_use_subcommand" -xa info -d "Describes the given package"
+complete -c dnf -n __fish_use_subcommand -xa info -d "Describes the given package"
 complete -c dnf -n "__fish_seen_subcommand_from info; and not __fish_seen_subcommand_from history" -xa "(__dnf_list_available_packages)"
 
 # Install
-complete -c dnf -n "__fish_use_subcommand" -xa install -d "Install package"
+complete -c dnf -n __fish_use_subcommand -xa install -d "Install package"
 complete -c dnf -n "__fish_seen_subcommand_from install" -xa "(__dnf_list_available_packages)"
 
 # List
-complete -c dnf -n "__fish_use_subcommand" -xa list -d "Lists all packages"
+complete -c dnf -n __fish_use_subcommand -xa list -d "Lists all packages"
 complete -c dnf -n "__fish_seen_subcommand_from list" -l all -d "Lists all packages"
 complete -c dnf -n "__fish_seen_subcommand_from list" -l installed -d "Lists installed packages"
 complete -c dnf -n "__fish_seen_subcommand_from list" -l available -d "Lists available packages"
@@ -113,17 +113,17 @@ complete -c dnf -n "__fish_seen_subcommand_from list" -l upgrades -d "List avail
 complete -c dnf -n "__fish_seen_subcommand_from list" -l autoremove -d "List packages which will be removed by autoremove"
 
 # Makecache
-complete -c dnf -n "__fish_use_subcommand" -xa makecache -d "Downloads and caches metadata for all known repos"
+complete -c dnf -n __fish_use_subcommand -xa makecache -d "Downloads and caches metadata for all known repos"
 complete -c dnf -n "__fish_seen_subcommand_from makecache" -l timer -d "Instructs DNF to be more resource-aware"
 
 # Mark
-complete -c dnf -n "__fish_use_subcommand" -xa mark -d "Mark packages"
+complete -c dnf -n __fish_use_subcommand -xa mark -d "Mark packages"
 complete -c dnf -n "__fish_seen_subcommand_from mark" -xa install -d "Mark package installed"
 complete -c dnf -n "__fish_seen_subcommand_from mark" -xa remove -d "Unmarks installed package"
 complete -c dnf -n "__fish_seen_subcommand_from mark" -xa group -d "Mark installed by group"
 
 # Module
-complete -c dnf -n "__fish_use_subcommand" -xa module -d "Manage modules"
+complete -c dnf -n __fish_use_subcommand -xa module -d "Manage modules"
 complete -c dnf -n "__fish_seen_subcommand_from module" -xa install -d "Install module"
 complete -c dnf -n "__fish_seen_subcommand_from module" -xa update -d "Update modules"
 complete -c dnf -n "__fish_seen_subcommand_from module" -xa remove -d "Remove module"
@@ -139,21 +139,21 @@ complete -c dnf -n "__fish_seen_subcommand_from module" -xa info -d "Print modul
 complete -c dnf -n "__fish_seen_subcommand_from module; and __fish_seen_subcommand_from info" -l profile -d "Print module profiles information"
 
 # Provides
-complete -c dnf -n "__fish_use_subcommand" -xa provides -d "Finds packages providing the given command"
+complete -c dnf -n __fish_use_subcommand -xa provides -d "Finds packages providing the given command"
 
 # Reinstall
-complete -c dnf -n "__fish_use_subcommand" -xa reinstall -d "Reinstalls a package"
+complete -c dnf -n __fish_use_subcommand -xa reinstall -d "Reinstalls a package"
 complete -c dnf -n "__fish_seen_subcommand_from reinstall" -xa "(__dnf_list_installed_packages)"
 
 # Remove
-complete -c dnf -n "__fish_use_subcommand" -xa remove -d "Remove packages"
+complete -c dnf -n __fish_use_subcommand -xa remove -d "Remove packages"
 complete -c dnf -n "__fish_seen_subcommand_from remove" -xa "(__dnf_list_installed_packages)" -d "Removes the specified packages"
 complete -c dnf -n "__fish_seen_subcommand_from remove" -l duplicates -d "Removes older version of duplicated packages"
 complete -c dnf -n "__fish_seen_subcommand_from remove" -l oldinstallonly -d "Removes old installonly packages"
 
 # Repolist and Repoinfo
-complete -c dnf -n "__fish_use_subcommand" -xa repoinfo -d "Verbose repolist"
-complete -c dnf -n "__fish_use_subcommand" -xa repolist -d "Lists all enabled repositories"
+complete -c dnf -n __fish_use_subcommand -xa repoinfo -d "Verbose repolist"
+complete -c dnf -n __fish_use_subcommand -xa repolist -d "Lists all enabled repositories"
 
 for i in repolist repoinfo
     complete -c dnf -n "__fish_seen_subcommand_from $i" -l enabled -d "Lists all enabled repositories"
@@ -162,7 +162,7 @@ for i in repolist repoinfo
 end
 
 # Repoquery
-complete -c dnf -n "__fish_use_subcommand" -xa repoquery -d "Queries DNF repositories"
+complete -c dnf -n __fish_use_subcommand -xa repoquery -d "Queries DNF repositories"
 complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l querytags -d "Provides the list of tags"
 
 # repoquery select options
@@ -221,20 +221,20 @@ complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l recursive -d "Quer
 complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l resolve -d "Resolve capabilities to originating packages"
 
 # Repository-Packages
-complete -c dnf -n "__fish_use_subcommand" -xa repository-packages -d "Run commands on all packages in the repository"
+complete -c dnf -n __fish_use_subcommand -xa repository-packages -d "Run commands on all packages in the repository"
 
 # Search
-complete -c dnf -n "__fish_use_subcommand" -xa search -d "Search package metadata for keywords"
+complete -c dnf -n __fish_use_subcommand -xa search -d "Search package metadata for keywords"
 complete -c dnf -n "__fish_seen_subcommand_from search" -l all -d "Lists packages that match at least one of the keys"
 
 # Shell
-complete -c dnf -n "__fish_use_subcommand" -xa shell -d "Opens an interactive shell"
+complete -c dnf -n __fish_use_subcommand -xa shell -d "Opens an interactive shell"
 
 # Swap
-complete -c dnf -n "__fish_use_subcommand" -xa swap -d "Remove spec and install spec in one transaction"
+complete -c dnf -n __fish_use_subcommand -xa swap -d "Remove spec and install spec in one transaction"
 
 # Updateinfo
-complete -c dnf -n "__fish_use_subcommand" -xa updateinfo -d "Display information about update advisories"
+complete -c dnf -n __fish_use_subcommand -xa updateinfo -d "Display information about update advisories"
 complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l summary -d "Displays the summary"
 complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l list -d "List of advisories"
 complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l info -d "Detailed information"
@@ -246,63 +246,63 @@ complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l installed
 complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l updates
 
 # Upgrade
-complete -c dnf -n "__fish_use_subcommand" -xa upgrade -d "Updates packages"
+complete -c dnf -n __fish_use_subcommand -xa upgrade -d "Updates packages"
 complete -c dnf -n "__fish_seen_subcommand_from upgrade" -xa "(__dnf_list_installed_packages)"
 
 # Upgrade-Minimal
-complete -c dnf -n "__fish_use_subcommand" -xa upgrade-minimal -d "Updates packages"
+complete -c dnf -n __fish_use_subcommand -xa upgrade-minimal -d "Updates packages"
 complete -c dnf -n "__fish_seen_subcommand_from upgrade-minimal" -xa "(__dnf_list_installed_packages)"
 
 # Options:
 # Using __fish_no_arguments here so that users are not completely overloaded with
 #   available options when using subcommands (e.g. repoquery) (40 vs 100ish)
-complete -c dnf -n "__fish_no_arguments" -s 4 -d "Use IPv4 only"
-complete -c dnf -n "__fish_no_arguments" -s 6 -d "Use IPv6 only"
-complete -c dnf -n "__fish_no_arguments" -l advisory -l advisories -d "Include packages corresponding to the advisory ID"
-complete -c dnf -n "__fish_no_arguments" -l allowerasing -d "Allow erasing of installed packages to resolve dependencies"
-complete -c dnf -n "__fish_no_arguments" -l assumeno -d "Answer no for all questions"
-complete -c dnf -n "__fish_no_arguments" -s b -l best -d "Try the best available package versions in transactions"
-complete -c dnf -n "__fish_no_arguments" -l bugfix -d "Include packages that fix a bugfix issue"
-complete -c dnf -n "__fish_no_arguments" -l bz -l bzs -d "Include packages that fix a Bugzilla ID"
-complete -c dnf -n "__fish_no_arguments" -s C -l cacheonly -d "Run entirely from system cache"
-complete -c dnf -n "__fish_no_arguments" -l color -xa "always never auto" -d "Control whether color is used"
-complete -c dnf -n "__fish_no_arguments" -s c -l config -d "Configuration file location"
-complete -c dnf -n "__fish_no_arguments" -l cve -l cves -d "Include packages that fix a CVE"
-complete -c dnf -n "__fish_no_arguments" -s d -l debuglevel -d "Debugging output level"
-complete -c dnf -n "__fish_no_arguments" -l debugsolver -d "Dump dependency solver debugging info"
-complete -c dnf -n "__fish_no_arguments" -l disableexcludes -l disableexcludepkgs -d "Disable excludes"
-complete -c dnf -n "__fish_no_arguments" -l disable -l set-disabled -d "Disable specified repositories"
-complete -c dnf -n "__fish_no_arguments" -l disableplugin -d "Disable the listed plugins specified"
-complete -c dnf -n "__fish_no_arguments" -l disablerepo -d "Disable specified repositories"
-complete -c dnf -n "__fish_no_arguments" -l downloaddir -l destdir -d "Change downloaded packages to provided directory"
-complete -c dnf -n "__fish_no_arguments" -l downloadonly -d "Download packages without performing any transaction"
-complete -c dnf -n "__fish_no_arguments" -l enable -l set-enabled -d "Enable specified repositories"
-complete -c dnf -n "__fish_no_arguments" -l enableplugin -d "Enable the listed plugins"
-complete -c dnf -n "__fish_no_arguments" -l enablerepo -d "Enable additional repositories"
-complete -c dnf -n "__fish_no_arguments" -l enhancement -d "Include enhancement relevant packages"
-complete -c dnf -n "__fish_no_arguments" -s x -l exclude -d "Exclude packages specified"
-complete -c dnf -n "__fish_no_arguments" -l forcearch -d "Force the use of the specified architecture"
-complete -c dnf -n "__fish_no_arguments" -s h -l help -l help-i -d "Show the help"
-complete -c dnf -n "__fish_no_arguments" -l installroot -d "Specifies an alternative installroot"
-complete -c dnf -n "__fish_no_arguments" -l newpackage -d "Include newpackage relevant packages"
-complete -c dnf -n "__fish_no_arguments" -l noautoremove -d "Disable autoremove"
-complete -c dnf -n "__fish_no_arguments" -l nobest -d "Set best option to False"
-complete -c dnf -n "__fish_no_arguments" -l nodocs -d "Do not install documentation"
-complete -c dnf -n "__fish_no_arguments" -l nogpgcheck -d "Skip checking GPG signatures on packages"
-complete -c dnf -n "__fish_no_arguments" -l noplugins -d "Disable all plugins"
-complete -c dnf -n "__fish_no_arguments" -l obsoletes -d "Enables obsoletes processing logic"
-complete -c dnf -n "__fish_no_arguments" -s q -l quiet -d "Quiet mode"
-complete -c dnf -n "__fish_no_arguments" -s R -l randomwait -d "Maximum command wait time"
-complete -c dnf -n "__fish_no_arguments" -l refresh -d "Set metadata as expired before running the command"
-complete -c dnf -n "__fish_no_arguments" -l releasever -d "Configure the distribution release"
-complete -c dnf -n "__fish_no_arguments" -l repofrompath -d "Specify repository to add to the repositories for this query"
-complete -c dnf -n "__fish_no_arguments" -l repo -l repoid -d "Enable just specific repositories by an id or a glob"
-complete -c dnf -n "__fish_no_arguments" -l rpmverbosity -d "RPM debug scriptlet output level"
-complete -c dnf -n "__fish_no_arguments" -l sec-severity -l secseverity -d "Includes packages that provide a fix for an issue of the specified severity"
-complete -c dnf -n "__fish_no_arguments" -l security -d "Includes packages that provide a fix for a security issue"
-complete -c dnf -n "__fish_no_arguments" -l setopt -d "Override a configuration option"
-complete -c dnf -n "__fish_no_arguments" -l skip-broken -d "Skips broken packages"
-complete -c dnf -n "__fish_no_arguments" -l showduplicates -d "Shows duplicate packages"
-complete -c dnf -n "__fish_no_arguments" -s v -l verbose -d "Verbose mode"
-complete -c dnf -n "__fish_no_arguments" -l version -d "Shows DNF version and exit"
-complete -c dnf -n "__fish_no_arguments" -s y -l assumeyes -d "Answer yes for all questions"
\ No newline at end of file
+complete -c dnf -n __fish_no_arguments -s 4 -d "Use IPv4 only"
+complete -c dnf -n __fish_no_arguments -s 6 -d "Use IPv6 only"
+complete -c dnf -n __fish_no_arguments -l advisory -l advisories -d "Include packages corresponding to the advisory ID"
+complete -c dnf -n __fish_no_arguments -l allowerasing -d "Allow erasing of installed packages to resolve dependencies"
+complete -c dnf -n __fish_no_arguments -l assumeno -d "Answer no for all questions"
+complete -c dnf -n __fish_no_arguments -s b -l best -d "Try the best available package versions in transactions"
+complete -c dnf -n __fish_no_arguments -l bugfix -d "Include packages that fix a bugfix issue"
+complete -c dnf -n __fish_no_arguments -l bz -l bzs -d "Include packages that fix a Bugzilla ID"
+complete -c dnf -n __fish_no_arguments -s C -l cacheonly -d "Run entirely from system cache"
+complete -c dnf -n __fish_no_arguments -l color -xa "always never auto" -d "Control whether color is used"
+complete -c dnf -n __fish_no_arguments -s c -l config -d "Configuration file location"
+complete -c dnf -n __fish_no_arguments -l cve -l cves -d "Include packages that fix a CVE"
+complete -c dnf -n __fish_no_arguments -s d -l debuglevel -d "Debugging output level"
+complete -c dnf -n __fish_no_arguments -l debugsolver -d "Dump dependency solver debugging info"
+complete -c dnf -n __fish_no_arguments -l disableexcludes -l disableexcludepkgs -d "Disable excludes"
+complete -c dnf -n __fish_no_arguments -l disable -l set-disabled -d "Disable specified repositories"
+complete -c dnf -n __fish_no_arguments -l disableplugin -d "Disable the listed plugins specified"
+complete -c dnf -n __fish_no_arguments -l disablerepo -d "Disable specified repositories"
+complete -c dnf -n __fish_no_arguments -l downloaddir -l destdir -d "Change downloaded packages to provided directory"
+complete -c dnf -n __fish_no_arguments -l downloadonly -d "Download packages without performing any transaction"
+complete -c dnf -n __fish_no_arguments -l enable -l set-enabled -d "Enable specified repositories"
+complete -c dnf -n __fish_no_arguments -l enableplugin -d "Enable the listed plugins"
+complete -c dnf -n __fish_no_arguments -l enablerepo -d "Enable additional repositories"
+complete -c dnf -n __fish_no_arguments -l enhancement -d "Include enhancement relevant packages"
+complete -c dnf -n __fish_no_arguments -s x -l exclude -d "Exclude packages specified"
+complete -c dnf -n __fish_no_arguments -l forcearch -d "Force the use of the specified architecture"
+complete -c dnf -n __fish_no_arguments -s h -l help -l help-i -d "Show the help"
+complete -c dnf -n __fish_no_arguments -l installroot -d "Specifies an alternative installroot"
+complete -c dnf -n __fish_no_arguments -l newpackage -d "Include newpackage relevant packages"
+complete -c dnf -n __fish_no_arguments -l noautoremove -d "Disable autoremove"
+complete -c dnf -n __fish_no_arguments -l nobest -d "Set best option to False"
+complete -c dnf -n __fish_no_arguments -l nodocs -d "Do not install documentation"
+complete -c dnf -n __fish_no_arguments -l nogpgcheck -d "Skip checking GPG signatures on packages"
+complete -c dnf -n __fish_no_arguments -l noplugins -d "Disable all plugins"
+complete -c dnf -n __fish_no_arguments -l obsoletes -d "Enables obsoletes processing logic"
+complete -c dnf -n __fish_no_arguments -s q -l quiet -d "Quiet mode"
+complete -c dnf -n __fish_no_arguments -s R -l randomwait -d "Maximum command wait time"
+complete -c dnf -n __fish_no_arguments -l refresh -d "Set metadata as expired before running the command"
+complete -c dnf -n __fish_no_arguments -l releasever -d "Configure the distribution release"
+complete -c dnf -n __fish_no_arguments -l repofrompath -d "Specify repository to add to the repositories for this query"
+complete -c dnf -n __fish_no_arguments -l repo -l repoid -d "Enable just specific repositories by an id or a glob"
+complete -c dnf -n __fish_no_arguments -l rpmverbosity -d "RPM debug scriptlet output level"
+complete -c dnf -n __fish_no_arguments -l sec-severity -l secseverity -d "Includes packages that provide a fix for an issue of the specified severity"
+complete -c dnf -n __fish_no_arguments -l security -d "Includes packages that provide a fix for a security issue"
+complete -c dnf -n __fish_no_arguments -l setopt -d "Override a configuration option"
+complete -c dnf -n __fish_no_arguments -l skip-broken -d "Skips broken packages"
+complete -c dnf -n __fish_no_arguments -l showduplicates -d "Shows duplicate packages"
+complete -c dnf -n __fish_no_arguments -s v -l verbose -d "Verbose mode"
+complete -c dnf -n __fish_no_arguments -l version -d "Shows DNF version and exit"
+complete -c dnf -n __fish_no_arguments -s y -l assumeyes -d "Answer yes for all questions"
\ No newline at end of file
diff --git a/share/completions/dpkg-reconfigure.fish b/share/completions/dpkg-reconfigure.fish
index 2ddbdb6ab..c58267121 100644
--- a/share/completions/dpkg-reconfigure.fish
+++ b/share/completions/dpkg-reconfigure.fish
@@ -1,6 +1,6 @@
 # Completions for the `dpkg-reconfigure` command
 
-complete -f -c dpkg-reconfigure -a '(__fish_print_packages)' -d 'Package'
+complete -f -c dpkg-reconfigure -a '(__fish_print_packages)' -d Package
 
 # Support flags
 complete -x -f -c dpkg-reconfigure -s h -l help -d 'Display help'
diff --git a/share/completions/duply.fish b/share/completions/duply.fish
index c4884395a..d1df2a5ac 100644
--- a/share/completions/duply.fish
+++ b/share/completions/duply.fish
@@ -1,24 +1,24 @@
 
 # First parameter is the profile name, or 'usage'
-complete --command duply --no-files --condition '__fish_is_first_token' --arguments '(/bin/ls /etc/duply 2>/dev/null) (/bin/ls ~/.duply 2>/dev/null)' -d 'Profile'
-complete --command duply --no-files --arguments 'usage' -d 'Get usage help text'
+complete --command duply --no-files --condition __fish_is_first_token --arguments '(/bin/ls /etc/duply 2>/dev/null) (/bin/ls ~/.duply 2>/dev/null)' -d Profile
+complete --command duply --no-files --arguments usage -d 'Get usage help text'
 
 # Second parameter is a duply command
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'create' -d 'Creates a configuration profile'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'backup' -d 'Backup with pre/post script execution'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'bkp' -d 'Backup without executing pre/post scripts'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'pre' -d 'Execute <profile>/pre script'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'post' -d 'Execute <profile>/post script'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'full' -d 'Force full backup'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'incr' -d 'Force incremental backup'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'list' -d 'List all files in backup (as it was at <age>, default: now)'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'status' -d 'Prints backup sets and chains currently in repository'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'verify' -d 'List files changed since latest backup'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'purge' -d 'Shows outdated backup archives [--force, delete these files]'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'purge-full' -d 'Shows outdated backups [--force, delete these files]'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'cleanup' -d 'Shows broken backup archives [--force, delete these files]'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'restore' -d 'Restore the backup to <target_path> [as it was at <age>]'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'fetch' -d 'Restore single file/folder from backup [as it was at <age>]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments create -d 'Creates a configuration profile'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments backup -d 'Backup with pre/post script execution'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments bkp -d 'Backup without executing pre/post scripts'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments pre -d 'Execute <profile>/pre script'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments post -d 'Execute <profile>/post script'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments full -d 'Force full backup'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments incr -d 'Force incremental backup'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments list -d 'List all files in backup (as it was at <age>, default: now)'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments status -d 'Prints backup sets and chains currently in repository'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments verify -d 'List files changed since latest backup'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments purge -d 'Shows outdated backup archives [--force, delete these files]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments purge-full -d 'Shows outdated backups [--force, delete these files]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments cleanup -d 'Shows broken backup archives [--force, delete these files]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments restore -d 'Restore the backup to <target_path> [as it was at <age>]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments fetch -d 'Restore single file/folder from backup [as it was at <age>]'
 
 # Options
 complete --command duply --no-files --long-option force -d 'Really execute the commands: purge, purge-full, cleanup'
diff --git a/share/completions/ebuild.fish b/share/completions/ebuild.fish
index b95f6b2fe..1c6eba3d1 100644
--- a/share/completions/ebuild.fish
+++ b/share/completions/ebuild.fish
@@ -11,26 +11,26 @@ complete -c ebuild -l ignore-default-opts -d "Ignore EBUILD_DEFAULT_OPTS"
 complete -c ebuild -l skip-manifest -d "Skip all manifest checks"
 
 ## Subcommands
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'help' -d "Show help"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'pretend' -d "Run pkg_pretend()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'setup' -d "Run setup and system checks"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'clean' -d "Clean build dir"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'fetch' -d "Fetches all files from SRC_URI"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa help -d "Show help"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa pretend -d "Run pkg_pretend()"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa setup -d "Run setup and system checks"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa clean -d "Clean build dir"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa fetch -d "Fetches all files from SRC_URI"
 #complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'digest'      -d "Deprecared: see manifest"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'manifest' -d "Update pkg manifest"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'unpack' -d "Extracts sources"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'prepare' -d "Run src_prepare()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'configure' -d "Run src_configure()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'compile' -d "Run src_compile()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'test' -d "Run tests"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'preinst' -d "Run pkg_preinst()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'install' -d "Run src_install()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'postinst' -d "Run pkg_postinst()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'qmerge' -d "Install files to live filesystem"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'merge' -d "Run fetch, unpack, compile, install and qmerge"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'unmerge' -d "Uninstall files from live filesystem"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'prerm' -d "Run pkg_prerm()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'postrm' -d "Run pkg_postrm()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'config' -d "Run post-install configuration"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'package' -d "Create a binpkg in PKGDIR"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'rpm' -d "Builds a RedHat RPM pkg"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa manifest -d "Update pkg manifest"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa unpack -d "Extracts sources"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa prepare -d "Run src_prepare()"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa configure -d "Run src_configure()"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa compile -d "Run src_compile()"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa test -d "Run tests"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa preinst -d "Run pkg_preinst()"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa install -d "Run src_install()"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa postinst -d "Run pkg_postinst()"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa qmerge -d "Install files to live filesystem"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa merge -d "Run fetch, unpack, compile, install and qmerge"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa unmerge -d "Uninstall files from live filesystem"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa prerm -d "Run pkg_prerm()"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa postrm -d "Run pkg_postrm()"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa config -d "Run post-install configuration"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa package -d "Create a binpkg in PKGDIR"
+complete -c ebuild -n __fish_seen_ebuild_arg -xa rpm -d "Builds a RedHat RPM pkg"
diff --git a/share/completions/emaint.fish b/share/completions/emaint.fish
index c7e8ee45a..ca41c1bfd 100644
--- a/share/completions/emaint.fish
+++ b/share/completions/emaint.fish
@@ -11,16 +11,16 @@ complete -c emaint -s f -l fix -d "Attempt to fix problems"
 complete -c emaint -s P -l purge -d "Remove the list of failed merges"
 
 ## Subcommands
-complete -c emaint -n '__fish_use_subcommand' -xa 'all' -d 'Perform all supported commands'
-complete -c emaint -n '__fish_use_subcommand' -xa 'binhost' -d 'Scan and generate metadata indexes for binary pkgs'
-complete -c emaint -n '__fish_use_subcommand' -xa 'cleanconfmem' -d 'Check and clean the config tracker list for uninstalled pkgs'
-complete -c emaint -n '__fish_use_subcommand' -xa 'cleanresume' -d 'Discard emerge --resume merge lists'
-complete -c emaint -n '__fish_use_subcommand' -xa 'logs' -d 'Check and clean old logs in the PORT_LOGDIR'
-complete -c emaint -n '__fish_use_subcommand' -xa 'merges' -d 'Scan for failed merges and fix them'
-complete -c emaint -n '__fish_use_subcommand' -xa 'movebin' -d 'Perform pkg move updates for binary pkgs'
-complete -c emaint -n '__fish_use_subcommand' -xa 'moveinst' -d 'Perform pkg move updates for installed and binary pkgs'
-complete -c emaint -n '__fish_use_subcommand' -xa 'sync' -d 'Check repos.conf settings and sync repositories'
-complete -c emaint -n '__fish_use_subcommand' -xa 'world' -d 'Check and fix problems in the world file'
+complete -c emaint -n __fish_use_subcommand -xa all -d 'Perform all supported commands'
+complete -c emaint -n __fish_use_subcommand -xa binhost -d 'Scan and generate metadata indexes for binary pkgs'
+complete -c emaint -n __fish_use_subcommand -xa cleanconfmem -d 'Check and clean the config tracker list for uninstalled pkgs'
+complete -c emaint -n __fish_use_subcommand -xa cleanresume -d 'Discard emerge --resume merge lists'
+complete -c emaint -n __fish_use_subcommand -xa logs -d 'Check and clean old logs in the PORT_LOGDIR'
+complete -c emaint -n __fish_use_subcommand -xa merges -d 'Scan for failed merges and fix them'
+complete -c emaint -n __fish_use_subcommand -xa movebin -d 'Perform pkg move updates for binary pkgs'
+complete -c emaint -n __fish_use_subcommand -xa moveinst -d 'Perform pkg move updates for installed and binary pkgs'
+complete -c emaint -n __fish_use_subcommand -xa sync -d 'Check repos.conf settings and sync repositories'
+complete -c emaint -n __fish_use_subcommand -xa world -d 'Check and fix problems in the world file'
 
 ## Local opts
 # logs
diff --git a/share/completions/eopkg.fish b/share/completions/eopkg.fish
index 2fe1aeb02..00a02269a 100644
--- a/share/completions/eopkg.fish
+++ b/share/completions/eopkg.fish
@@ -7,13 +7,13 @@
 # Eopkg subcommand
 function __fish_eopkg_subcommand -a subcommand
     set -e argv[1]
-    complete -f -c eopkg -n '__fish_use_subcommand' -a $subcommand $argv
+    complete -f -c eopkg -n __fish_use_subcommand -a $subcommand $argv
 end
 
 function __fish_eopkg_subcommand_with_shortcut -a subcommand shortcut
     set -e argv[1..2]
-    complete -f -c eopkg -n '__fish_use_subcommand' -a $subcommand $argv
-    complete -f -c eopkg -n '__fish_use_subcommand' -a $shortcut $argv
+    complete -f -c eopkg -n __fish_use_subcommand -a $subcommand $argv
+    complete -f -c eopkg -n __fish_use_subcommand -a $shortcut $argv
 end
 
 # Eopkg subcommand's option
@@ -38,10 +38,10 @@ function __fish_eopkg_print_repos -d "Print list of repositories"
 end
 
 # Setup additional completion
-complete -f -c eopkg -n '__fish_seen_subcommand_from remove-repo rr enable-repo er disable-repo dr list-available la' -a "(__fish_eopkg_print_repos)" -d "Repository"
+complete -f -c eopkg -n '__fish_seen_subcommand_from remove-repo rr enable-repo er disable-repo dr list-available la' -a "(__fish_eopkg_print_repos)" -d Repository
 complete -f -c eopkg -n '__fish_seen_subcommand_from upgrade up install it info' -a "(__fish_print_packages)" -d "Available Package"
 complete -f -c eopkg -n '__fish_seen_subcommand_from remove rm autoremove rmf check' -a "(__fish_print_packages --installed)" -d "Installed Package"
-complete -f -c eopkg -n '__fish_seen_subcommand_from upgrade up remove rm install it info check list-available la list-installed li list-upgrades lu' -s c -l component -a "(__fish_eopkg_print_components)" -d "Component"
+complete -f -c eopkg -n '__fish_seen_subcommand_from upgrade up remove rm install it info check list-available la list-installed li list-upgrades lu' -s c -l component -a "(__fish_eopkg_print_components)" -d Component
 
 # Setup eopkg subcommand with shortcut
 ## Upgrade
@@ -84,7 +84,7 @@ __fish_eopkg_option_with_shortcut search sr -l name -d "Search in package name"
 __fish_eopkg_option_with_shortcut search sr -l summary -d "Search in package name"
 __fish_eopkg_option_with_shortcut search sr -s i -l installdb -d "Search only installed package"
 __fish_eopkg_option_with_shortcut search sr -s r -l repository -x -d "Name of the source or package repository"
-complete -f -c eopkg -n '__fish_seen_subcommand_from search sr' -s r -l repository -a "(__fish_eopkg_print_repos)" -d "Repository"
+complete -f -c eopkg -n '__fish_seen_subcommand_from search sr' -s r -l repository -a "(__fish_eopkg_print_repos)" -d Repository
 
 ## Search File
 __fish_eopkg_subcommand_with_shortcut search-file sf -d "Search for a file in installed packages"
diff --git a/share/completions/equery.fish b/share/completions/equery.fish
index 259435ce9..2b1b7235a 100644
--- a/share/completions/equery.fish
+++ b/share/completions/equery.fish
@@ -8,7 +8,7 @@ function __fish_equery_print_format
         '$version' "Version (without the revision) (e.g. '0.3.0_rc10')" \
         '$revision' "Revision (e.g. 'r1')" \
         '$fullversion' "Version including revision (e.g. '0.3.0_rc10-r1')" \
-        '$slot' "Slot" \
+        '$slot' Slot \
         '$repo' "Repository (e.g. 'gentoo')" \
         '$mask' "Mask-status field (~M-??)" \
         '$mask2' "Verbose description of the masking status" \
@@ -23,20 +23,20 @@ complete -c equery -s N -l no-pipe -d "Turns off pipe detection"
 complete -c equery -s V -l version -d "Display version information"
 
 ## Subcommands
-complete -c equery -n '__fish_use_subcommand' -xa 'belongs' -d "List all pkgs owning file(s)"
-complete -c equery -n '__fish_use_subcommand' -xa 'changes' -d "List changelog entries for ATOM"
-complete -c equery -n '__fish_use_subcommand' -xa 'check' -d "Check pkg's MD5sums and timestamps"
-complete -c equery -n '__fish_use_subcommand' -xa 'depends' -d "List all pkgs depending on specified pkg"
-complete -c equery -n '__fish_use_subcommand' -xa 'depgraph' -d "Display pkg's dependency tree"
-complete -c equery -n '__fish_use_subcommand' -xa 'files' -d "List files owned by pkg"
-complete -c equery -n '__fish_use_subcommand' -xa 'has' -d "List pkgs for matching ENVIRONMENT data"
-complete -c equery -n '__fish_use_subcommand' -xa 'hasuse' -d "List pkgs with specified useflag"
-complete -c equery -n '__fish_use_subcommand' -xa 'keywords' -d "Display pkg's keywords"
-complete -c equery -n '__fish_use_subcommand' -xa 'list' -d "List all pkgs matching pattern"
-complete -c equery -n '__fish_use_subcommand' -xa 'meta' -d "Display pkg's metadata"
-complete -c equery -n '__fish_use_subcommand' -xa 'size' -d "Print size of files contained in pkg"
-complete -c equery -n '__fish_use_subcommand' -xa 'uses' -d "Display pkg's USE flags"
-complete -c equery -n '__fish_use_subcommand' -xa 'which' -d "Print full path to ebuild for pkg"
+complete -c equery -n __fish_use_subcommand -xa belongs -d "List all pkgs owning file(s)"
+complete -c equery -n __fish_use_subcommand -xa changes -d "List changelog entries for ATOM"
+complete -c equery -n __fish_use_subcommand -xa check -d "Check pkg's MD5sums and timestamps"
+complete -c equery -n __fish_use_subcommand -xa depends -d "List all pkgs depending on specified pkg"
+complete -c equery -n __fish_use_subcommand -xa depgraph -d "Display pkg's dependency tree"
+complete -c equery -n __fish_use_subcommand -xa files -d "List files owned by pkg"
+complete -c equery -n __fish_use_subcommand -xa has -d "List pkgs for matching ENVIRONMENT data"
+complete -c equery -n __fish_use_subcommand -xa hasuse -d "List pkgs with specified useflag"
+complete -c equery -n __fish_use_subcommand -xa keywords -d "Display pkg's keywords"
+complete -c equery -n __fish_use_subcommand -xa list -d "List all pkgs matching pattern"
+complete -c equery -n __fish_use_subcommand -xa meta -d "Display pkg's metadata"
+complete -c equery -n __fish_use_subcommand -xa size -d "Print size of files contained in pkg"
+complete -c equery -n __fish_use_subcommand -xa uses -d "Display pkg's USE flags"
+complete -c equery -n __fish_use_subcommand -xa which -d "Print full path to ebuild for pkg"
 
 ## Arguments
 complete -c equery -n '__fish_seen_subcommand_from c changes d depends g depgraph y keywords m meta u uses w which' \
diff --git a/share/completions/eselect.fish b/share/completions/eselect.fish
index d240a25c9..3ae3319e2 100644
--- a/share/completions/eselect.fish
+++ b/share/completions/eselect.fish
@@ -18,7 +18,7 @@ function __fish_complete_eselect_action_options
     set -l cmdl (commandline -poc)
 
     # Alter further php completion
-    if [ (__fish_print_cmd_args_without_options)[2] = 'php' ]
+    if [ (__fish_print_cmd_args_without_options)[2] = php ]
         eselect php list-modules 2>/dev/null | string split " "
         return
     end
@@ -37,7 +37,7 @@ end
 function __fish_complete_eselect_php_actions
     set -l sedregexp 's/^\s*\[([0-9]+)\]\s+([A-Za-z0-9\.]+).*/\1\t\2/'
 
-    if test (__fish_print_cmd_args_without_options)[3] = 'set'
+    if test (__fish_print_cmd_args_without_options)[3] = set
         eselect php list (__fish_print_cmd_args_without_options)[-1] 2>/dev/null | sed -r $sedregexp
     end
 end
@@ -47,7 +47,7 @@ function __fish_complete_eselect_targets
     set -l cmdl (commandline -poc)
 
     # Disable further php completion
-    if [ (__fish_print_cmd_args_without_options)[2] = 'php' ]
+    if [ (__fish_print_cmd_args_without_options)[2] = php ]
         return
     end
 
diff --git a/share/completions/exercism.fish b/share/completions/exercism.fish
index df88e0297..2f2a5ca0c 100644
--- a/share/completions/exercism.fish
+++ b/share/completions/exercism.fish
@@ -11,17 +11,17 @@ complete -c exercism -s c -l config -d 'path to config file [$EXERCISM_CONFIG_FI
 complete -c exercism -s v -l verbose -d "turn on verbose logging"
 complete -c exercism -s h -l help -d "show help"
 complete -c exercism -s v -l version -d "print the version"
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'configure' -d "Writes config values to a JSON file."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'debug' -d "Outputs useful debug information."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'download' -d "Downloads a solution given the ID of the latest iteration."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'fetch' -d "Fetches the next unsubmitted problem in each track."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'list' -d "Lists the available problems for a language track, given its ID."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'open' -d "Opens exercism.io to your most recent iteration of a problem given the track ID and problem slug."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'restore' -d "Downloads the most recent iteration for each of your solutions on exercism.io."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'skip' -d "Skips a problem given a track ID and problem slug."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'status' -d "Fetches information about your progress with a given language track."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'submit' -d "Submits a new iteration to a problem on exercism.io."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'tracks' -d "Lists the available language tracks."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'unsubmit' -d "REMOVED"
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'upgrade' -d "Upgrades the CLI to the latest released version."
-complete -f -n '__fish_exercism_no_subcommand' -c exercism -a 'help' -d "show help"
+complete -f -n __fish_exercism_no_subcommand -c exercism -a configure -d "Writes config values to a JSON file."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a debug -d "Outputs useful debug information."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a download -d "Downloads a solution given the ID of the latest iteration."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a fetch -d "Fetches the next unsubmitted problem in each track."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a list -d "Lists the available problems for a language track, given its ID."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a open -d "Opens exercism.io to your most recent iteration of a problem given the track ID and problem slug."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a restore -d "Downloads the most recent iteration for each of your solutions on exercism.io."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a skip -d "Skips a problem given a track ID and problem slug."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a status -d "Fetches information about your progress with a given language track."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a submit -d "Submits a new iteration to a problem on exercism.io."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a tracks -d "Lists the available language tracks."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a unsubmit -d REMOVED
+complete -f -n __fish_exercism_no_subcommand -c exercism -a upgrade -d "Upgrades the CLI to the latest released version."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a help -d "show help"
diff --git a/share/completions/ezjail-admin.fish b/share/completions/ezjail-admin.fish
index 5eb0fc74c..dd6ec1d39 100644
--- a/share/completions/ezjail-admin.fish
+++ b/share/completions/ezjail-admin.fish
@@ -11,55 +11,55 @@ function __fish_complete_stopped_jails
 end
 
 # archive
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a archive -d "create a backup of one or several jails"
-complete -xc "ezjail-admin" -n "__fish_seen_subcommand_from archive" -a "(__fish_complete_jails)" -d "jail"
+complete -xc ezjail-admin -n __fish_use_subcommand -a archive -d "create a backup of one or several jails"
+complete -xc ezjail-admin -n "__fish_seen_subcommand_from archive" -a "(__fish_complete_jails)" -d jail
 
 # config
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a config -d "manage specific jails"
-complete -xc "ezjail-admin" -n "__fish_seen_subcommand_from config" -a "(__fish_complete_jails)" -d "jail"
+complete -xc ezjail-admin -n __fish_use_subcommand -a config -d "manage specific jails"
+complete -xc ezjail-admin -n "__fish_seen_subcommand_from config" -a "(__fish_complete_jails)" -d jail
 
 # console
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a console -d "attach your console to a running jail"
-complete -xc "ezjail-admin" -n "__fish_seen_subcommand_from console" -a "(__fish_complete_jails)" -d "jail"
+complete -xc ezjail-admin -n __fish_use_subcommand -a console -d "attach your console to a running jail"
+complete -xc ezjail-admin -n "__fish_seen_subcommand_from console" -a "(__fish_complete_jails)" -d jail
 
 # create
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a create -d "installs a new jail inside ezjail's scope"
+complete -xc ezjail-admin -n __fish_use_subcommand -a create -d "installs a new jail inside ezjail's scope"
 
 # delete
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a delete -d "removes a jail from ezjail's config"
-complete -xc "ezjail-admin" -n "__fish_seen_subcommand_from delete" -a "(__fish_complete_jails)" -d "jail"
+complete -xc ezjail-admin -n __fish_use_subcommand -a delete -d "removes a jail from ezjail's config"
+complete -xc ezjail-admin -n "__fish_seen_subcommand_from delete" -a "(__fish_complete_jails)" -d jail
 
 # freeze
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a freeze -d "dump diffs between jail initialisation and freeze time into a flavour"
-complete -xc "ezjail-admin" -n "__fish_seen_subcommand_from freeze" -a "(__fish_complete_jails)" -d "jail"
+complete -xc ezjail-admin -n __fish_use_subcommand -a freeze -d "dump diffs between jail initialisation and freeze time into a flavour"
+complete -xc ezjail-admin -n "__fish_seen_subcommand_from freeze" -a "(__fish_complete_jails)" -d jail
 
 # install
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a install -d "create the basejail from binary packages"
+complete -xc ezjail-admin -n __fish_use_subcommand -a install -d "create the basejail from binary packages"
 
 # list
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a list -d "list all jails"
+complete -xc ezjail-admin -n __fish_use_subcommand -a list -d "list all jails"
 
 # restart
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a restart -d "restart a running jail"
-complete -xc "ezjail-admin" -n "__fish_seen_subcommand_from restart" -a "(__fish_complete_running_jails)" -d "jail"
+complete -xc ezjail-admin -n __fish_use_subcommand -a restart -d "restart a running jail"
+complete -xc ezjail-admin -n "__fish_seen_subcommand_from restart" -a "(__fish_complete_running_jails)" -d jail
 
 # restore
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a restore -d "create new jails from archived versions"
+complete -xc ezjail-admin -n __fish_use_subcommand -a restore -d "create new jails from archived versions"
 
 # snapshot
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a snapshot -d "create a snapshot of a jail"
-complete -xc "ezjail-admin" -n "__fish_seen_subcommand_from snapshot" -a "(__fish_complete_jails)" -d "jail"
+complete -xc ezjail-admin -n __fish_use_subcommand -a snapshot -d "create a snapshot of a jail"
+complete -xc ezjail-admin -n "__fish_seen_subcommand_from snapshot" -a "(__fish_complete_jails)" -d jail
 
 # start
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a start -d "start a jail"
-complete -xc "ezjail-admin" -n "__fish_seen_subcommand_from start" -a "(__fish_complete_stopped_jails)" -d "jail"
+complete -xc ezjail-admin -n __fish_use_subcommand -a start -d "start a jail"
+complete -xc ezjail-admin -n "__fish_seen_subcommand_from start" -a "(__fish_complete_stopped_jails)" -d jail
 
 # stop
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a stop -d "stop a running jail"
-complete -xc "ezjail-admin" -n "__fish_seen_subcommand_from stop" -a "(__fish_complete_running_jails)" -d "jail"
+complete -xc ezjail-admin -n __fish_use_subcommand -a stop -d "stop a running jail"
+complete -xc ezjail-admin -n "__fish_seen_subcommand_from stop" -a "(__fish_complete_running_jails)" -d jail
 
 # troubleshoot
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a troubleshoot -d "check for reasons for the jails to fail"
+complete -xc ezjail-admin -n __fish_use_subcommand -a troubleshoot -d "check for reasons for the jails to fail"
 
 # update
-complete -xc "ezjail-admin" -n "__fish_use_subcommand" -a update -d "create or update the basejail from source"
+complete -xc ezjail-admin -n __fish_use_subcommand -a update -d "create or update the basejail from source"
diff --git a/share/completions/feh.fish b/share/completions/feh.fish
index 70a95c399..2832a2a53 100644
--- a/share/completions/feh.fish
+++ b/share/completions/feh.fish
@@ -66,7 +66,7 @@ complete -c feh -l zoom -x -a "max fill" -d "Zoom images by given percent when i
 
 # Montage Mode Options
 complete -c feh -l alpha -s a -x -d "Set thumbnails' transparency to given level (0-255)"
-complete -c feh -l bg -s b -r -a "trans" -d "Use given file as background for your montage"
+complete -c feh -l bg -s b -r -a trans -d "Use given file as background for your montage"
 complete -c feh -l ignore-aspect -s X -d "Don't retain thumbnails' aspect ratios"
 complete -c feh -l limit-height -s W -x -d "Limit montage's height"
 complete -c feh -l limit-width -s W -x -d "Limit montage's width"
diff --git a/share/completions/ffmpeg.fish b/share/completions/ffmpeg.fish
index 484444600..b2a089844 100644
--- a/share/completions/ffmpeg.fish
+++ b/share/completions/ffmpeg.fish
@@ -5,7 +5,7 @@ function __fish_ffmpeg_help_type
     for help_type in decoder encoder demuxer muxer filter
         set -l regex
 
-        if test $help_type = "filter"
+        if test $help_type = filter
             set regex '\S+\s+(\S+)\s+\S+\s+(\S+)'
         else
             set regex '\S+\s+(\S+)\s+(\S+)'
@@ -92,8 +92,8 @@ complete -c ffmpeg -o frames -d "Set the number of frames to output"
 complete -c ffmpeg -o filter -d "Set stream filtergraph"
 complete -c ffmpeg -o filter_script -d "Read stream filtergraph description from a file"
 complete -c ffmpeg -o reinit_filter -d "Reinit filtergraph on input parameter changes"
-complete -c ffmpeg -o discard -d "Discard"
-complete -c ffmpeg -o disposition -d "Disposition"
+complete -c ffmpeg -o discard -d Discard
+complete -c ffmpeg -o disposition -d Disposition
 
 # Video options
 complete -c ffmpeg -o vframes -d "Set the number of video frames to output"
diff --git a/share/completions/ffplay.fish b/share/completions/ffplay.fish
index d8abe059b..09eabc7c9 100644
--- a/share/completions/ffplay.fish
+++ b/share/completions/ffplay.fish
@@ -5,7 +5,7 @@ function __fish_ffplay_help_type
     for help_type in decoder encoder demuxer muxer filter
         set -l regex
 
-        if test $help_type = "filter"
+        if test $help_type = filter
             set regex '\S+\s+(\S+)\s+\S+\s+(\S+)'
         else
             set regex '\S+\s+(\S+)\s+(\S+)'
diff --git a/share/completions/ffprobe.fish b/share/completions/ffprobe.fish
index ff912423c..f9c98c319 100644
--- a/share/completions/ffprobe.fish
+++ b/share/completions/ffprobe.fish
@@ -5,7 +5,7 @@ function __fish_ffprobe_help_type
     for help_type in decoder encoder demuxer muxer filter
         set -l regex
 
-        if test $help_type = "filter"
+        if test $help_type = filter
             set regex '\S+\s+(\S+)\s+\S+\s+(\S+)'
         else
             set regex '\S+\s+(\S+)\s+(\S+)'
diff --git a/share/completions/fossil.fish b/share/completions/fossil.fish
index b5ce82140..8965229e3 100644
--- a/share/completions/fossil.fish
+++ b/share/completions/fossil.fish
@@ -50,7 +50,7 @@ complete -c fossil -n '__fish_fossil_command add' -l case-sensitive -x -a 'yes n
 complete -c fossil -n '__fish_fossil_command add' -l dotfiles -d 'Include dotfiles'
 complete -c fossil -n '__fish_fossil_command add' -l ignore -r -d 'Files to ignore'
 complete -c fossil -n '__fish_fossil_command add' -l clean -r -d 'Files to ignore'
-complete -c fossil -n '__fish_fossil_command add' -a '(__fish_fossil extra --rel-paths)' -x -d 'File'
+complete -c fossil -n '__fish_fossil_command add' -a '(__fish_fossil extra --rel-paths)' -x -d File
 
 # addremove
 complete -c fossil -n __fish_fossil_needs_command -a addremove -f -d 'Remove and add files to checkout'
@@ -85,9 +85,9 @@ complete -c fossil -n '__fish_fossil_subcommand bisect' -a log -d 'Show log of b
 complete -c fossil -n '__fish_fossil_subcommand bisect' -a chart -d 'Show log of bisects in check-in order'
 complete -c fossil -n '__fish_fossil_subcommand bisect' -a next -d 'Skip version'
 complete -c fossil -n '__fish_fossil_subcommand bisect' -a options -d 'Show bisect options'
-complete -c fossil -n '__fish_fossil_subsubcommand_only bisect options' -x -a 'auto-next' -d 'Automatically run bisect next'
-complete -c fossil -n '__fish_fossil_subsubcommand_only bisect options' -x -a 'direct-only' -d 'Follow only primary parent-child links'
-complete -c fossil -n '__fish_fossil_subsubcommand_only bisect options' -x -a 'display' -d 'Command to show after bisect next'
+complete -c fossil -n '__fish_fossil_subsubcommand_only bisect options' -x -a auto-next -d 'Automatically run bisect next'
+complete -c fossil -n '__fish_fossil_subsubcommand_only bisect options' -x -a direct-only -d 'Follow only primary parent-child links'
+complete -c fossil -n '__fish_fossil_subsubcommand_only bisect options' -x -a display -d 'Command to show after bisect next'
 complete -c fossil -n '__fish_fossil_subsubsubcommand_only bisect options auto-next' -x -a 'on off' -d 'Automatically run bisect next'
 complete -c fossil -n '__fish_fossil_subsubsubcommand_only bisect options direct-only' -x -a 'on off' -d 'Follow only primary parent-child links'
 complete -c fossil -n '__fish_fossil_subsubsubcommand_only bisect options display' -x -a chart -d 'Show log of bisects in check-in order'
@@ -157,7 +157,7 @@ complete -c fossil -n '__fish_fossil_command clone' -l ssl-identity -r -d 'Use S
 
 # commit
 complete -c fossil -n __fish_fossil_needs_command -a 'ci commit' -d 'Create new revision'
-complete -c fossil -n '__fish_fossil_command ci commit' -a '(__fish_fossil changes --rel-paths | cut -c12-)' -x -d 'File'
+complete -c fossil -n '__fish_fossil_command ci commit' -a '(__fish_fossil changes --rel-paths | cut -c12-)' -x -d File
 complete -c fossil -n '__fish_fossil_command ci commit' -l allow-conflict -d 'Allow unresolved merge conflicts'
 complete -c fossil -n '__fish_fossil_command ci commit' -l allow-empty -d 'Allow empty check-ins'
 complete -c fossil -n '__fish_fossil_command ci commit' -l allow-fork -d 'Allow forking'
@@ -247,13 +247,13 @@ complete -c fossil -n '__fish_fossil_command json' -s R -l repository -r -d 'Run
 
 # ls
 complete -c fossil -n __fish_fossil_needs_command -a ls -d 'List files'
-complete -c fossil -n '__fish_fossil_command ls' -s r -x -a '(__fish_fossil tag list)' -d 'Tag'
+complete -c fossil -n '__fish_fossil_command ls' -s r -x -a '(__fish_fossil tag list)' -d Tag
 complete -c fossil -n '__fish_fossil_command ls' -l age -d 'Show commit time'
 complete -c fossil -n '__fish_fossil_command ls' -s v -l verbose -d 'Provide extra information'
 
 # merge
 complete -c fossil -n __fish_fossil_needs_command -a merge -d 'Merge commits'
-complete -c fossil -n '__fish_fossil_command merge' -a '(__fish_fossil tag list)' -d 'Tag'
+complete -c fossil -n '__fish_fossil_command merge' -a '(__fish_fossil tag list)' -d Tag
 complete -c fossil -n '__fish_fossil_command merge' -l baseline -a '(__fish_fossil tag list)' -x -d 'Use baseline'
 complete -c fossil -n '__fish_fossil_command merge' -l binary -r -d 'Binary files glob pattern'
 complete -c fossil -n '__fish_fossil_command merge' -l case-sensitive -x -a 'yes no' -d 'Case insensitive file matching'
@@ -300,7 +300,7 @@ complete -c fossil -n __fish_fossil_needs_command -a remote-url -d 'Default serv
 
 # revert
 complete -c fossil -n __fish_fossil_needs_command -f -a revert -d 'Revert a commit'
-complete -c fossil -n '__fish_fossil_command revert' -a '(__fish_fossil tag list)' -d 'Tag'
+complete -c fossil -n '__fish_fossil_command revert' -a '(__fish_fossil tag list)' -d Tag
 complete -c fossil -n '__fish_fossil_command revert' -s r -x -a '(__fish_fossil tag list)' -d 'Revert back to given revision'
 
 # rm
@@ -392,13 +392,13 @@ complete -c fossil -n '__fish_fossil_subcommand tag' -x -a add -d 'Add tag to ch
 complete -c fossil -n '__fish_fossil_subsubcommand tag add' -l raw -d 'Add raw tag'
 complete -c fossil -n '__fish_fossil_subsubcommand tag add' -l propagate -d 'Propagate tag'
 complete -c fossil -n '__fish_fossil_subcommand tag' -x -a remove -d 'Remove tag from check-in'
-complete -c fossil -n '__fish_fossil_subsubcommand tag remove' -a '(__fish_fossil tag list)' -d 'Tag'
+complete -c fossil -n '__fish_fossil_subsubcommand tag remove' -a '(__fish_fossil tag list)' -d Tag
 complete -c fossil -n '__fish_fossil_subsubcommand tag remove' -l raw -d 'Remove raw tag'
 complete -c fossil -n '__fish_fossil_subcommand tag' -x -a find -d 'Find tag'
 complete -c fossil -n '__fish_fossil_subsubcommand tag find' -l raw -d 'Find raw tag'
 complete -c fossil -n '__fish_fossil_subsubcommand tag find' -s t -l type -x -a 'ci e' -d 'Find tag type'
 complete -c fossil -n '__fish_fossil_subsubcommand tag find' -s n -l limit -x -d 'Limit number of tags'
-complete -c fossil -n '__fish_fossil_subsubcommand tag find' -a '(__fish_fossil tag list)' -d 'Tag'
+complete -c fossil -n '__fish_fossil_subsubcommand tag find' -a '(__fish_fossil tag list)' -d Tag
 complete -c fossil -n '__fish_fossil_subcommand tag' -x -a list -d 'List tags'
 complete -c fossil -n '__fish_fossil_subsubcommand tag list' -l raw -d 'List raw tags'
 
@@ -416,7 +416,7 @@ complete -c fossil -n '__fish_fossil_command server' -l localhost -d 'Only liste
 complete -c fossil -n '__fish_fossil_command ui server' -s P -l port -d 'Port to listen on'
 complete -c fossil -n '__fish_fossil_command ui server' -l th-trace -d 'Trace TH1 execution'
 complete -c fossil -n '__fish_fossil_command ui server' -l baseurl -d 'Use base URL'
-complete -c fossil -n '__fish_fossil_command ui server' -l notfound -d 'Redirect'
+complete -c fossil -n '__fish_fossil_command ui server' -l notfound -d Redirect
 complete -c fossil -n '__fish_fossil_command ui server' -l files -d 'Static files glob'
 complete -c fossil -n '__fish_fossil_command ui server' -l scgi -d 'Use SCGI rather than HTTP'
 
diff --git a/share/completions/fsharpc.fish b/share/completions/fsharpc.fish
index 1b9094173..5a4fbfd86 100644
--- a/share/completions/fsharpc.fish
+++ b/share/completions/fsharpc.fish
@@ -8,7 +8,7 @@ complete -c fsharpc -o "a:winexe" -l "target:winexe" -d "Build a Windows executa
 complete -c fsharpc -o "a:library" -l "target:library" -d "Build a library"
 complete -c fsharpc -o "a:module" -l "target:module" -d "Build a module that can be added to another assembly"
 complete -c fsharpc -l delaysign -l "delaysign+" -d "Delay-sign the assembly using only the public portion of the strong name key"
-complete -c fsharpc -l "delaysign-" -d "Disable --delaysign"
+complete -c fsharpc -l delaysign- -d "Disable --delaysign"
 complete -c fsharpc -l "doc:" -d "Write the xmldoc of the assembly to the given file"
 complete -c fsharpc -l "keyfile:" -d "Specify a strong name key file"
 complete -c fsharpc -l "keycontainer:" -d "Specify a strong name key container"
@@ -33,23 +33,23 @@ complete -c fsharpc -l "linkresource:" -d "Link the specified resource to this a
 
 # Code generation
 complete -c fsharpc -s g -o "g+" -l debug -l "debug+" -d "Emit debug information"
-complete -c fsharpc -o "g-" -l "debug-" -d "Disable --debug"
+complete -c fsharpc -o g- -l debug- -d "Disable --debug"
 for arguments in full pdbonly portable embedded
     complete -c fsharpc -o "g:$arguments" -l "debug:$arguments" -d "Specify debugging type"
 end
 
 complete -c fsharpc -s O -o "O+" -l optimize -l "optimize+" -d "Enable optimizations"
-complete -c fsharpc -o "O-" -l "optimize-" -d "Disable --optimize"
+complete -c fsharpc -o O- -l optimize- -d "Disable --optimize"
 complete -c fsharpc -l tailcalls -l "tailcalls+" -d "Enable or disable tailcalls"
-complete -c fsharpc -l "tailcalls-" -d "Disable --tailcalls"
+complete -c fsharpc -l tailcalls- -d "Disable --tailcalls"
 complete -c fsharpc -l deterministic -l "deterministic+" -d "Produce a deterministic assembly (including module version GUID and timestamp)"
-complete -c fsharpc -l "deterministic-" -d "Disable --deterministic"
+complete -c fsharpc -l deterministic- -d "Disable --deterministic"
 complete -c fsharpc -l crossoptimize -l "crossoptimize+" -d "Enable or disable cross-module optimizations"
-complete -c fsharpc -l "crossoptimize-" -d "Disable --crossoptimize"
+complete -c fsharpc -l crossoptimize- -d "Disable --crossoptimize"
 
 # Errors and warnings
 complete -c fsharpc -l warnaserror -l "warnaserror+" -d "Report all warnings as errors"
-complete -c fsharpc -l "warnaserror-" -d "Disable --warnaserror"
+complete -c fsharpc -l warnaserror- -d "Disable --warnaserror"
 complete -c fsharpc -l "warnaserror:" -l "warnaserror+:" -d "Report specific warnings as errors"
 complete -c fsharpc -l "warnaserror-:" -d "Disable --warnaserror:"
 
@@ -60,11 +60,11 @@ end
 complete -c fsharpc -l "nowarn:" -d "Disable specific warning messages"
 complete -c fsharpc -l "warnon:" -d "Enable specific warnings that may be off by default"
 complete -c fsharpc -l consolecolors -l "consolecolors+" -d "Output warning and error messages in color"
-complete -c fsharpc -l "consolecolors-" -d "Disable --consolecolors"
+complete -c fsharpc -l consolecolors- -d "Disable --consolecolors"
 
 # Language
 complete -c fsharpc -l checked -l "checked+" -d "Generate overflow checks"
-complete -c fsharpc -l "checked-" -d "Disable --checked"
+complete -c fsharpc -l checked- -d "Disable --checked"
 complete -c fsharpc -o "d:" -l "define:" -d "Define conditional compilation symbols"
 complete -c fsharpc -l mlcompatibility -d "Ignore ML compatibility warnings"
 
@@ -84,7 +84,7 @@ complete -c fsharpc -l standalone -d "Statically link the F# library and all ref
 complete -c fsharpc -l "staticlink:" -d "Statically link the given assembly and all referenced DLLs that depend on this assembly"
 complete -c fsharpc -l "pdb:" -d "Name the output debug file"
 complete -c fsharpc -l highentropyva -l "highentropyva+" -d "Enable high-entropy ASLR"
-complete -c fsharpc -l "highentropyva-" -d "Disable --highentropyva"
+complete -c fsharpc -l highentropyva- -d "Disable --highentropyva"
 complete -c fsharpc -l "subsystemversion:" -d "Specify subsystem version of this assembly"
-complete -c fsharpc -l "quotations-debug" -l "quotations-debug+" -d "Emit debug information in quotations"
-complete -c fsharpc -l "quotations-debug-" -d "Disable --quotations-debug"
+complete -c fsharpc -l quotations-debug -l "quotations-debug+" -d "Emit debug information in quotations"
+complete -c fsharpc -l quotations-debug- -d "Disable --quotations-debug"
diff --git a/share/completions/fsharpi.fish b/share/completions/fsharpi.fish
index 669229b58..0611fc8e1 100644
--- a/share/completions/fsharpi.fish
+++ b/share/completions/fsharpi.fish
@@ -8,23 +8,23 @@ complete -c fsharpi -o "r:" -l "reference:" -d "Reference an assembly"
 
 # Code generation
 complete -c fsharpi -s g -o "g+" -l debug -l "debug+" -d "Emit debug information"
-complete -c fsharpi -o "g-" -l "debug-" -d "Disable --debug"
+complete -c fsharpi -o g- -l debug- -d "Disable --debug"
 for arguments in full pdbonly portable embedded
     complete -c fsharpi -o "g:$arguments" -l "debug:$arguments" -d "Specify debugging type"
 end
 
 complete -c fsharpi -s O -o "O+" -l optimize -l "optimize+" -d "Enable optimizations"
-complete -c fsharpi -o "O-" -l "optimize-" -d "Disable --optimize"
+complete -c fsharpi -o O- -l optimize- -d "Disable --optimize"
 complete -c fsharpi -l tailcalls -l "tailcalls+" -d "Enable or disable tailcalls"
-complete -c fsharpi -l "tailcalls-" -d "Disable --tailcalls"
+complete -c fsharpi -l tailcalls- -d "Disable --tailcalls"
 complete -c fsharpi -l deterministic -l "deterministic+" -d "Produce a deterministic assembly (including module version GUID and timestamp)"
-complete -c fsharpi -l "deterministic-" -d "Disable --deterministic"
+complete -c fsharpi -l deterministic- -d "Disable --deterministic"
 complete -c fsharpi -l crossoptimize -l "crossoptimize+" -d "Enable or disable cross-module optimizations"
-complete -c fsharpi -l "crossoptimize-" -d "Disable --crossoptimize"
+complete -c fsharpi -l crossoptimize- -d "Disable --crossoptimize"
 
 # Errors and warnings
 complete -c fsharpi -l warnaserror -l "warnaserror+" -d "Report all warnings as errors"
-complete -c fsharpi -l "warnaserror-" -d "Disable --warnaserror"
+complete -c fsharpi -l warnaserror- -d "Disable --warnaserror"
 complete -c fsharpi -l "warnaserror:" -l "warnaserror+:" -d "Report specific warnings as errors"
 complete -c fsharpi -l "warnaserror-:" -d "Disable --warnaserror:"
 
@@ -35,11 +35,11 @@ end
 complete -c fsharpi -l "nowarn:" -d "Disable specific warning messages"
 complete -c fsharpi -l "warnon:" -d "Enable specific warnings that may be off by default"
 complete -c fsharpi -l consolecolors -l "consolecolors+" -d "Output warning and error messages in color"
-complete -c fsharpi -l "consolecolors-" -d "Disable --consolecolors"
+complete -c fsharpi -l consolecolors- -d "Disable --consolecolors"
 
 # Language
 complete -c fsharpi -l checked -l "checked+" -d "Generate overflow checks"
-complete -c fsharpi -l "checked-" -d "Disable --checked"
+complete -c fsharpi -l checked- -d "Disable --checked"
 complete -c fsharpi -o "d:" -l "define:" -d "Define conditional compilation symbols"
 complete -c fsharpi -l mlcompatibility -d "Ignore ML compatibility warnings"
 
@@ -57,11 +57,11 @@ complete -c fsharpi -l "targetprofile:" -d "Specify target framework profile of
 complete -c fsharpi -l noframework -d "Do not reference the default CLI assemblies by default"
 complete -c fsharpi -l exec -d "Exit fsi after loading the files or running the .fsx script given on the command line"
 complete -c fsharpi -l gui -l "gui+" -d "Execute interactions on a Windows Forms event loop (on by default)"
-complete -c fsharpi -l "gui-" -d "Disable --gui"
+complete -c fsharpi -l gui- -d "Disable --gui"
 complete -c fsharpi -l quiet -d "Suppress fsi writing to stdout"
 complete -c fsharpi -l readline -l "readline+" -d "Support TAB completion in console (on by default)"
-complete -c fsharpi -l "readline-" -d "Disable --readline"
-complete -c fsharpi -l "quotations-debug" -l "quotations-debug+" -d "Emit debug information in quotations"
-complete -c fsharpi -l "quotations-debug-" -d "Disable --quotations-debug"
+complete -c fsharpi -l readline- -d "Disable --readline"
+complete -c fsharpi -l quotations-debug -l "quotations-debug+" -d "Emit debug information in quotations"
+complete -c fsharpi -l quotations-debug- -d "Disable --quotations-debug"
 complete -c fsharpi -l shadowcopyreferences -l "shadowcopyreferences+" -d "Prevents references from being locked by the F# Interactive process"
-complete -c fsharpi -l "shadowcopyreferences-" -d "Disable --shadowcopyreferences"
+complete -c fsharpi -l shadowcopyreferences- -d "Disable --shadowcopyreferences"
diff --git a/share/completions/function.fish b/share/completions/function.fish
index 7399da787..a64b0cff9 100644
--- a/share/completions/function.fish
+++ b/share/completions/function.fish
@@ -1,6 +1,6 @@
 complete -c function -s d -l description -d "Set function description" -x
-complete -c function -xa "(functions -n)" -d "Function"
-complete -c function -xa "(builtin -n)" -d "Builtin"
+complete -c function -xa "(functions -n)" -d Function
+complete -c function -xa "(builtin -n)" -d Builtin
 complete -c function -s j -l on-job-exit -d "Make the function a job exit event handler" -x
 complete -c function -s p -l on-process-exit -d "Make the function a process exit event handler" -x
 complete -c function -s s -l on-signal -d "Make the function a signal event handler" -x
diff --git a/share/completions/functions.fish b/share/completions/functions.fish
index 51a265b4e..1f8fbfc50 100644
--- a/share/completions/functions.fish
+++ b/share/completions/functions.fish
@@ -8,7 +8,7 @@ function __fish_maybe_list_all_functions
 end
 
 complete -c functions -s e -l erase -d "Erase function" -x -a "(__fish_maybe_list_all_functions)"
-complete -c functions -xa "(functions -na)" -d "Function"
+complete -c functions -xa "(functions -na)" -d Function
 complete -c functions -s a -l all -d "Show hidden functions"
 complete -c functions -s h -l help -d "Display help and exit"
 complete -c functions -s d -l description -d "Set function description" -x
diff --git a/share/completions/fusermount.fish b/share/completions/fusermount.fish
index 3b2e37d78..0c62c64dd 100644
--- a/share/completions/fusermount.fish
+++ b/share/completions/fusermount.fish
@@ -7,7 +7,7 @@ complete -c fusermount -d "Mount point" -x -a '(__fish_print_mounted)'
 complete -c fusermount -s h -d "Display help and exit"
 complete -c fusermount -s v -d "Display version and exit"
 complete -c fusermount -s o -x -d "Mount options"
-complete -c fusermount -s u -d "Unmount"
-complete -c fusermount -s q -d "Quiet"
+complete -c fusermount -s u -d Unmount
+complete -c fusermount -s q -d Quiet
 complete -c fusermount -s z -d "Lazy unmount"
 
diff --git a/share/completions/fzf.fish b/share/completions/fzf.fish
index cf1327c90..eb96f5cff 100644
--- a/share/completions/fzf.fish
+++ b/share/completions/fzf.fish
@@ -1,8 +1,8 @@
 complete -c fzf -f
 
 # Search mode
-complete -c fzf -l no-extended -d 'no-extended'
-complete -c fzf -n 'string match "+*" -- (commandline -ct)' -a +x -d 'no-extended'
+complete -c fzf -l no-extended -d no-extended
+complete -c fzf -n 'string match "+*" -- (commandline -ct)' -a +x -d no-extended
 complete -c fzf -s e -l --exact -d 'Enable exact-match'
 complete -c fzf -n 'string match "+*" -- (commandline -ct)' -a +i -d 'case-sensitive match'
 complete -c fzf -s i -d 'Case-insensitive match'
diff --git a/share/completions/gcc.fish b/share/completions/gcc.fish
index 034e7e36f..68e83e0c7 100644
--- a/share/completions/gcc.fish
+++ b/share/completions/gcc.fish
@@ -121,8 +121,8 @@ complete -c gcc -o Wselector -d 'Warn if multiple methods of different types for
 complete -c gcc -o Wstrict-selector-match -d 'Warn if multiple methods with differing argument and/or return types are found for a given selector when attempting to send a message using this selector to a receiver of type "id" or "Class"'
 complete -c gcc -o Wundeclared-selector -d 'Warn if a "@selector('
 complete -c gcc -o print-objc-runtime-info -d 'Generate C header describing the largest structure that is passed by value, if any'
-complete -c gcc -o fmessage-length -d 'Try to format error messages so that they fit on lines of the specified number of characters' -x -a "80"
-complete -c gcc -o fdiagnostics-show-location -d 'Only meaningful in line-wrapping mode' -a "once"
+complete -c gcc -o fmessage-length -d 'Try to format error messages so that they fit on lines of the specified number of characters' -x -a 80
+complete -c gcc -o fdiagnostics-show-location -d 'Only meaningful in line-wrapping mode' -a once
 complete -c gcc -o line -d 'Only meaningful in line-wrapping mode'
 complete -c gcc -o fdiagnostics-show-options -d 'This option instructs the diagnostic machinery to add text to each diagnostic emitted, which indicates which command line option directly controls that diagnostic, when such an option is known to the diagnostic machinery'
 complete -c gcc -o Wno- -d 'to turn off warnings; for example, -Wno-implicit'
@@ -165,7 +165,7 @@ complete -c gcc -o Wunused -d 'All the above -Wunused options combined'
 complete -c gcc -o Wuninitialized -d 'Warn if an automatic variable is used without first being initialized or if a variable may be clobbered by a "setjmp" call'
 complete -c gcc -o Wunknown-pragmas -d 'Warn when a #pragma directive is encountered which is not understood by GCC'
 complete -c gcc -o Wno-pragmas -d 'Do not warn about misuses of pragmas, such as incorrect parameters, invalid syntax, or conflicts between pragmas'
-complete -c gcc -o Wstrict-aliasing -d 'This option is only active when -fstrict-aliasing is active' -a "2"
+complete -c gcc -o Wstrict-aliasing -d 'This option is only active when -fstrict-aliasing is active' -a 2
 complete -c gcc -o Wall -d 'All of the above -W options combined'
 complete -c gcc -o Wextra -d '(This option used to be called -W'
 complete -c gcc -o Wno-div-by-zero -d 'Do not warn about compile-time integer division by zero'
diff --git a/share/completions/gdb.fish b/share/completions/gdb.fish
index 4ec6b447e..288cfa1c8 100644
--- a/share/completions/gdb.fish
+++ b/share/completions/gdb.fish
@@ -14,7 +14,7 @@ complete -c gdb -o core -s c -d 'Use file file as a core dump to examine' -r
 complete -c gdb -o command -s x -d 'Execute GDB commands from file file' -r
 complete -c gdb -o directory -s d -d 'Add directory to the path to search for source files' -x -a '(__fish_complete_directories (commandline -ct))'
 complete -c gdb -o nx -s n -d 'Do not execute commands from any .gdbinit files'
-complete -c gdb -o quiet -s q -d 'Quiet'
+complete -c gdb -o quiet -s q -d Quiet
 complete -c gdb -o batch -d 'Run in batch mode'
 complete -c gdb -o cd -d 'Run GDB using directory as its working directory, instead of the current directory' -x -a '(__fish_complete_directories (commandline -ct))'
 complete -c gdb -o fullname -s f -d 'Emacs sets this option when it runs GDB as a subprocess'
diff --git a/share/completions/gem.fish b/share/completions/gem.fish
index 6af96aa2a..05c94abc9 100644
--- a/share/completions/gem.fish
+++ b/share/completions/gem.fish
@@ -4,28 +4,28 @@
 
 #####
 # Global options
-complete -c gem -n '__fish_use_subcommand' -s h -l help -d "Print usage informations and quit"
-complete -c gem -n '__fish_use_subcommand' -s v -l version -d "Print the version and quit"
+complete -c gem -n __fish_use_subcommand -s h -l help -d "Print usage informations and quit"
+complete -c gem -n __fish_use_subcommand -s v -l version -d "Print the version and quit"
 
 #####
 # Subcommands
-complete -c gem -n '__fish_use_subcommand' -xa "build\tBuild a gem from a gemspec"
-complete -c gem -n '__fish_use_subcommand' -xa "cert\tAdjust RubyGems certificate settings"
-complete -c gem -n '__fish_use_subcommand' -xa "check\tCheck installed gems"
-complete -c gem -n '__fish_use_subcommand' -xa "cleanup\tCleanup old versions of installed gems in the local repository"
-complete -c gem -n '__fish_use_subcommand' -xa "contents\tDisplay the contents of the installed gems"
-complete -c gem -n '__fish_use_subcommand' -xa "dependency\tShow the dependencies of an installed gem"
-complete -c gem -n '__fish_use_subcommand' -xa "environment\tDisplay RubyGems environmental information"
-complete -c gem -n '__fish_use_subcommand' -xa "help\tProvide help on the 'gem' command"
-complete -c gem -n '__fish_use_subcommand' -xa "install\tInstall a gem into the local repository"
-complete -c gem -n '__fish_use_subcommand' -xa "list\tDisplay all gems whose name starts with STRING"
-complete -c gem -n '__fish_use_subcommand' -xa "query\tQuery gem information in local or remote repositories"
-complete -c gem -n '__fish_use_subcommand' -xa "rdoc\tGenerates RDoc for pre-installed gems"
-complete -c gem -n '__fish_use_subcommand' -xa "search\tDisplay all gems whose name contains STRING"
-complete -c gem -n '__fish_use_subcommand' -xa "specification\tDisplay gem specification (in yaml)"
-complete -c gem -n '__fish_use_subcommand' -xa "uninstall\tUninstall a gem from the local repository"
-complete -c gem -n '__fish_use_subcommand' -xa "unpack\tUnpack an installed gem to the current directory"
-complete -c gem -n '__fish_use_subcommand' -xa "update\tUpdate the named gem (or all installed gems) in the local repository"
+complete -c gem -n __fish_use_subcommand -xa "build\tBuild a gem from a gemspec"
+complete -c gem -n __fish_use_subcommand -xa "cert\tAdjust RubyGems certificate settings"
+complete -c gem -n __fish_use_subcommand -xa "check\tCheck installed gems"
+complete -c gem -n __fish_use_subcommand -xa "cleanup\tCleanup old versions of installed gems in the local repository"
+complete -c gem -n __fish_use_subcommand -xa "contents\tDisplay the contents of the installed gems"
+complete -c gem -n __fish_use_subcommand -xa "dependency\tShow the dependencies of an installed gem"
+complete -c gem -n __fish_use_subcommand -xa "environment\tDisplay RubyGems environmental information"
+complete -c gem -n __fish_use_subcommand -xa "help\tProvide help on the 'gem' command"
+complete -c gem -n __fish_use_subcommand -xa "install\tInstall a gem into the local repository"
+complete -c gem -n __fish_use_subcommand -xa "list\tDisplay all gems whose name starts with STRING"
+complete -c gem -n __fish_use_subcommand -xa "query\tQuery gem information in local or remote repositories"
+complete -c gem -n __fish_use_subcommand -xa "rdoc\tGenerates RDoc for pre-installed gems"
+complete -c gem -n __fish_use_subcommand -xa "search\tDisplay all gems whose name contains STRING"
+complete -c gem -n __fish_use_subcommand -xa "specification\tDisplay gem specification (in yaml)"
+complete -c gem -n __fish_use_subcommand -xa "uninstall\tUninstall a gem from the local repository"
+complete -c gem -n __fish_use_subcommand -xa "unpack\tUnpack an installed gem to the current directory"
+complete -c gem -n __fish_use_subcommand -xa "update\tUpdate the named gem (or all installed gems) in the local repository"
 
 #####
 # Subcommand switches
diff --git a/share/completions/git.fish b/share/completions/git.fish
index e98b4a3bf..13a2899f0 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -119,7 +119,7 @@ function __fish_git_files
     or return
 
     # Skip bare repositories.
-    test "$root[2]" = "true"
+    test "$root[2]" = true
     and return
     or set -e root[2]
 
@@ -745,24 +745,24 @@ end
 
 # general options
 complete -f -c git -l help -d 'Display the manual of a git command'
-complete -f -c git -n '__fish_git_needs_command' -l version -d 'Display version'
-complete -x -c git -n '__fish_git_needs_command' -s C -a '(__fish_complete_directories)' -d 'Run as if git was started in this directory'
-complete -x -c git -n '__fish_git_needs_command' -s c -a '(__fish_git config -l 2>/dev/null | string replace = \t)' -d 'Set a configuration option'
-complete -x -c git -n '__fish_git_needs_command' -l exec-path -a '(__fish_complete_directories)' -d 'Get or set the path to the git programs'
-complete -f -c git -n '__fish_git_needs_command' -l html-path -d 'Print the path to the html documentation'
-complete -f -c git -n '__fish_git_needs_command' -l man-path -d 'Print the path to the man documentation'
-complete -f -c git -n '__fish_git_needs_command' -l info-path -d 'Print the path to the info documentation'
-complete -f -c git -n '__fish_git_needs_command' -s p -l paginate -d 'Pipe output into a pager'
-complete -f -c git -n '__fish_git_needs_command' -l no-pager -d 'Do not pipe output into a pager'
-complete -r -c git -n '__fish_git_needs_command' -l git-dir -d 'Set the path to the repository'
-complete -r -c git -n '__fish_git_needs_command' -l work-tree -d 'Set the path to the working tree'
-complete -f -c git -n '__fish_git_needs_command' -l namespace -d 'Set the namespace'
-complete -f -c git -n '__fish_git_needs_command' -l bare -d 'Treat the repository as bare'
-complete -f -c git -n '__fish_git_needs_command' -l no-replace-objects -d 'Do not use replacement refs to replace git objects'
-complete -f -c git -n '__fish_git_needs_command' -l literal-pathspecs -d 'Treat pathspecs literally'
-complete -f -c git -n '__fish_git_needs_command' -l glob-pathspecs -d 'Treat pathspecs as globs'
-complete -f -c git -n '__fish_git_needs_command' -l noglob-pathspecs -d "Don't treat pathspecs as globs"
-complete -f -c git -n '__fish_git_needs_command' -l icase-pathspecs -d 'Match pathspecs case-insensitively'
+complete -f -c git -n __fish_git_needs_command -l version -d 'Display version'
+complete -x -c git -n __fish_git_needs_command -s C -a '(__fish_complete_directories)' -d 'Run as if git was started in this directory'
+complete -x -c git -n __fish_git_needs_command -s c -a '(__fish_git config -l 2>/dev/null | string replace = \t)' -d 'Set a configuration option'
+complete -x -c git -n __fish_git_needs_command -l exec-path -a '(__fish_complete_directories)' -d 'Get or set the path to the git programs'
+complete -f -c git -n __fish_git_needs_command -l html-path -d 'Print the path to the html documentation'
+complete -f -c git -n __fish_git_needs_command -l man-path -d 'Print the path to the man documentation'
+complete -f -c git -n __fish_git_needs_command -l info-path -d 'Print the path to the info documentation'
+complete -f -c git -n __fish_git_needs_command -s p -l paginate -d 'Pipe output into a pager'
+complete -f -c git -n __fish_git_needs_command -l no-pager -d 'Do not pipe output into a pager'
+complete -r -c git -n __fish_git_needs_command -l git-dir -d 'Set the path to the repository'
+complete -r -c git -n __fish_git_needs_command -l work-tree -d 'Set the path to the working tree'
+complete -f -c git -n __fish_git_needs_command -l namespace -d 'Set the namespace'
+complete -f -c git -n __fish_git_needs_command -l bare -d 'Treat the repository as bare'
+complete -f -c git -n __fish_git_needs_command -l no-replace-objects -d 'Do not use replacement refs to replace git objects'
+complete -f -c git -n __fish_git_needs_command -l literal-pathspecs -d 'Treat pathspecs literally'
+complete -f -c git -n __fish_git_needs_command -l glob-pathspecs -d 'Treat pathspecs as globs'
+complete -f -c git -n __fish_git_needs_command -l noglob-pathspecs -d "Don't treat pathspecs as globs"
+complete -f -c git -n __fish_git_needs_command -l icase-pathspecs -d 'Match pathspecs case-insensitively'
 
 # Options shared between multiple commands
 complete -f -c git -n '__fish_git_using_command log show diff-tree rev-list' -l pretty -a '(__fish_git_show_opt pretty)'
@@ -833,9 +833,9 @@ complete -x -c git -n '__fish_git_using_command diff log show range-diff' -l sub
 complete -x -c git -n '__fish_git_using_command diff log show range-diff' -l ws-error-highlight -a '(__fish_git_diff_opt ws-error-highlight)' -d 'Highlight whitespace errors in lines of the diff'
 
 #### fetch
-complete -f -c git -n '__fish_git_needs_command' -a fetch -d 'Download objects and refs from another repository'
+complete -f -c git -n __fish_git_needs_command -a fetch -d 'Download objects and refs from another repository'
 # Suggest "repository", then "refspec" - this also applies to e.g. push/pull
-complete -f -c git -n '__fish_git_using_command fetch; and not __fish_git_branch_for_remote' -a '(__fish_git_remotes)' -d 'Remote'
+complete -f -c git -n '__fish_git_using_command fetch; and not __fish_git_branch_for_remote' -a '(__fish_git_remotes)' -d Remote
 complete -f -c git -n '__fish_git_using_command fetch; and __fish_git_branch_for_remote' -a '(__fish_git_branch_for_remote)'
 complete -f -c git -n '__fish_git_using_command fetch' -s q -l quiet -d 'Be quiet'
 complete -f -c git -n '__fish_git_using_command fetch' -s v -l verbose -d 'Be verbose'
@@ -845,7 +845,7 @@ complete -f -c git -n '__fish_git_using_command fetch' -s f -l force -d 'Force u
 # TODO other options
 
 #### filter-branch
-complete -f -c git -n '__fish_git_needs_command' -a filter-branch -d 'Rewrite branches'
+complete -f -c git -n __fish_git_needs_command -a filter-branch -d 'Rewrite branches'
 complete -f -c git -n '__fish_git_using_command filter-branch' -l env-filter -d 'This filter may be used if you only need to modify the environment'
 complete -f -c git -n '__fish_git_using_command filter-branch' -l tree-filter -d 'This is the filter for rewriting the tree and its contents'
 complete -f -c git -n '__fish_git_using_command filter-branch' -l index-filter -d 'This is the filter for rewriting the index'
@@ -861,7 +861,7 @@ complete -c git -n '__fish_git_using_command filter-branch' -s f -l force -d 'Fo
 
 ### remote
 set -l remotecommands add rm remove show prune update rename set-head set-url set-branches get-url
-complete -f -c git -n '__fish_git_needs_command' -a remote -d 'Manage set of tracked repositories'
+complete -f -c git -n __fish_git_needs_command -a remote -d 'Manage set of tracked repositories'
 complete -f -c git -n '__fish_git_using_command remote' -a '(__fish_git_remotes)'
 complete -f -c git -n "__fish_git_using_command remote; and not __fish_seen_subcommand_from $remotecommands" -s v -l verbose -d 'Be verbose'
 complete -f -c git -n "__fish_git_using_command remote; and not __fish_seen_subcommand_from $remotecommands" -a add -d 'Adds a new remote'
@@ -890,11 +890,11 @@ complete -f -c git -n "__fish_git_using_command remote; and __fish_seen_subcomma
 complete -f -c git -n "__fish_git_using_command remote; and __fish_seen_subcommand_from update" -l prune -d 'Prune all remotes that are updated'
 
 ### show
-complete -f -c git -n '__fish_git_needs_command' -a show -d 'Shows the last commit of a branch'
+complete -f -c git -n __fish_git_needs_command -a show -d 'Shows the last commit of a branch'
 complete -f -c git -n '__fish_git_using_command show' -a '(__fish_git_branches)'
-complete -f -c git -n '__fish_git_using_command show' -ka '(__fish_git_tags)' -d 'Tag'
+complete -f -c git -n '__fish_git_using_command show' -ka '(__fish_git_tags)' -d Tag
 complete -f -c git -n '__fish_git_using_command show' -ka '(__fish_git_commits)'
-complete -f -c git -n '__fish_git_needs_rev_files' -xa '(__fish_git_complete_rev_files)'
+complete -f -c git -n __fish_git_needs_rev_files -xa '(__fish_git_complete_rev_files)'
 complete -f -c git -n '__fish_git_using_command show' -l format -d 'Pretty-print the contents of the commit logs in a given format' -a '(__fish_git_show_opt format)'
 complete -f -c git -n '__fish_git_using_command show' -l abbrev-commit -d 'Show only a partial hexadecimal commit object name'
 complete -f -c git -n '__fish_git_using_command show' -l no-abbrev-commit -d 'Show the full 40-byte hexadecimal commit object name'
@@ -908,12 +908,12 @@ complete -f -c git -n '__fish_git_using_command show' -l show-signature -d 'Chec
 
 
 ### show-branch
-complete -f -c git -n '__fish_git_needs_command' -a show-branch -d 'Shows the commits on branches'
-complete -f -c git -n '__fish_git_using_command show-branch' -a '(__fish_git_refs)' -d 'Rev'
+complete -f -c git -n __fish_git_needs_command -a show-branch -d 'Shows the commits on branches'
+complete -f -c git -n '__fish_git_using_command show-branch' -a '(__fish_git_refs)' -d Rev
 # TODO options
 
 ### add
-complete -c git -n '__fish_git_needs_command' -a add -d 'Add file contents to the index'
+complete -c git -n __fish_git_needs_command -a add -d 'Add file contents to the index'
 complete -c git -n '__fish_git_using_command add' -s n -l dry-run -d "Don't actually add the file(s)"
 complete -c git -n '__fish_git_using_command add' -s v -l verbose -d 'Be verbose'
 complete -c git -n '__fish_git_using_command add' -s f -l force -d 'Allow adding otherwise ignored files'
@@ -932,9 +932,9 @@ complete -f -c git -n '__fish_git_using_command add' -a '(__fish_git_files modif
 # TODO options
 
 ### checkout
-complete -f -c git -n '__fish_git_needs_command' -a checkout -d 'Checkout and switch to a branch'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_tags)' -d 'Tag'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_heads)' -d 'Head'
+complete -f -c git -n __fish_git_needs_command -a checkout -d 'Checkout and switch to a branch'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_tags)' -d Tag
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_heads)' -d Head
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_branches)'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_recent_commits)'
@@ -946,19 +946,19 @@ complete -f -c git -n '__fish_git_using_command checkout' -l ours -d 'Keep unmer
 # TODO options
 
 ### apply
-complete -f -c git -n '__fish_git_needs_command' -a apply -d 'Apply a patch on a git index file and a working tree'
+complete -f -c git -n __fish_git_needs_command -a apply -d 'Apply a patch on a git index file and a working tree'
 # TODO options
 
 ### archive
-complete -f -c git -n '__fish_git_needs_command' -a archive -d 'Create an archive of files from a named tree'
+complete -f -c git -n __fish_git_needs_command -a archive -d 'Create an archive of files from a named tree'
 # TODO options
 
 ### bisect
-complete -f -c git -n '__fish_git_needs_command' -a bisect -d 'Find the change that introduced a bug by binary search'
+complete -f -c git -n __fish_git_needs_command -a bisect -d 'Find the change that introduced a bug by binary search'
 # TODO options
 
 ### branch
-complete -f -c git -n '__fish_git_needs_command' -a branch -d 'List, create, or delete branches'
+complete -f -c git -n __fish_git_needs_command -a branch -d 'List, create, or delete branches'
 complete -f -c git -n '__fish_git_using_command branch' -a '(__fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command branch' -s d -l delete -d 'Delete branch' -xa '(__fish_git_local_branches)'
 complete -f -c git -n '__fish_git_using_command branch' -s D -d 'Force deletion of branch' -xa '(__fish_git_local_branches)'
@@ -975,12 +975,12 @@ complete -f -c git -n '__fish_git_using_command branch' -l merged -d 'List branc
 complete -f -c git -n '__fish_git_using_command branch' -l no-merged -d 'List branches that have not been merged'
 
 ### cherry
-complete -f -c git -n '__fish_git_needs_command' -a cherry -d 'Find commits yet to be applied to upstream [upstream [head]]'
+complete -f -c git -n __fish_git_needs_command -a cherry -d 'Find commits yet to be applied to upstream [upstream [head]]'
 complete -f -c git -n '__fish_git_using_command cherry' -s v -d 'Show the commit subjects next to the SHA1s'
-complete -f -c git -n '__fish_git_using_command cherry' -a '(__fish_git_refs)' -d 'Upstream'
+complete -f -c git -n '__fish_git_using_command cherry' -a '(__fish_git_refs)' -d Upstream
 
 ### cherry-pick
-complete -f -c git -n '__fish_git_needs_command' -a cherry-pick -d 'Apply the change introduced by an existing commit'
+complete -f -c git -n __fish_git_needs_command -a cherry-pick -d 'Apply the change introduced by an existing commit'
 complete -f -c git -n '__fish_git_using_command cherry-pick' -a '(__fish_git_branches --no-merged)'
 # TODO: Filter further
 complete -f -c git -n '__fish_git_using_command cherry-pick; and __fish_git_possible_commithash' -ka '(__fish_git_commits)'
@@ -994,7 +994,7 @@ complete -f -c git -n '__fish_git_using_command cherry-pick' -l abort -d 'Cancel
 complete -f -c git -n '__fish_git_using_command cherry-pick' -l skip -d 'Skip the current commit and continue with the rest of the sequence'
 
 ### clone
-complete -f -c git -n '__fish_git_needs_command' -a clone -d 'Clone a repository into a new directory'
+complete -f -c git -n __fish_git_needs_command -a clone -d 'Clone a repository into a new directory'
 complete -f -c git -n '__fish_git_using_command clone' -l no-hardlinks -d 'Copy files instead of using hardlinks'
 complete -f -c git -n '__fish_git_using_command clone' -s q -l quiet -d 'Operate quietly and do not report progress'
 complete -f -c git -n '__fish_git_using_command clone' -s v -l verbose -d 'Provide more information on what is going on'
@@ -1007,7 +1007,7 @@ complete -f -c git -n '__fish_git_using_command clone' -l depth -d 'Truncate the
 complete -f -c git -n '__fish_git_using_command clone' -l recursive -d 'Initialize all submodules within the cloned repository'
 
 ### commit
-complete -c git -n '__fish_git_needs_command' -a commit -d 'Record changes to the repository'
+complete -c git -n __fish_git_needs_command -a commit -d 'Record changes to the repository'
 complete -c git -n '__fish_git_using_command commit' -l amend -d 'Amend the log message of the last commit'
 complete -f -c git -n '__fish_git_using_command commit' -a '(__fish_git_files modified)'
 complete -c git -n '__fish_git_using_command commit' -s a -l all -d 'Automatically stage modified and deleted files'
@@ -1028,16 +1028,16 @@ complete -f -c git -n '__fish_git_using_command commit; and __fish_contains_opt
 # TODO options
 
 ### count-objects
-complete -f -c git -n '__fish_git_needs_command' -a count-objects -d 'Count unpacked number of objects and their disk consumption'
+complete -f -c git -n __fish_git_needs_command -a count-objects -d 'Count unpacked number of objects and their disk consumption'
 complete -f -c git -n '__fish_git_using_command count-objects' -s v -l verbose -d 'Be verbose'
 complete -f -c git -n '__fish_git_using_command count-objects' -s H -l human-readable -d 'Print in human readable format'
 
 ### describe
-complete -c git -n '__fish_git_needs_command' -a describe -d 'Give an object a human readable name based on an available ref'
-complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_tags)' -d 'Tag'
+complete -c git -n __fish_git_needs_command -a describe -d 'Give an object a human readable name based on an available ref'
+complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_tags)' -d Tag
 complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_branches)'
 complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
-complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_heads)' -d 'Head'
+complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_heads)' -d Head
 complete -f -c git -n '__fish_git_using_command describe' -l dirty -d 'Describe the state of the working tree, append dirty if there are local changes'
 complete -f -c git -n '__fish_git_using_command describe' -l broken -d 'Describe the state of the working tree, append -broken instead of erroring'
 complete -f -c git -n '__fish_git_using_command describe' -l all -d 'Use all tags, not just annotated'
@@ -1054,7 +1054,7 @@ complete -f -c git -n '__fish_git_using_command describe' -l always -d 'Show uni
 complete -f -c git -n '__fish_git_using_command describe' -l first-parent -d 'Follow only the first parent of a merge commit'
 
 ### diff
-complete -c git -n '__fish_git_needs_command' -a diff -d 'Show changes between commits, commit and working tree, etc'
+complete -c git -n __fish_git_needs_command -a diff -d 'Show changes between commits, commit and working tree, etc'
 complete -c git -n '__fish_git_using_command diff; and not contains -- -- (commandline -opc)' -a '(__fish_git_ranges)'
 complete -c git -n '__fish_git_using_command diff' -l cached -d 'Show diff of changes in the index (same as --staged)'
 complete -c git -n '__fish_git_using_command diff' -l no-index -d 'Compare two paths on the filesystem'
@@ -1079,7 +1079,7 @@ function __fish_git_diffmerge_tools -a cmd
 end
 
 ### difftool
-complete -c git -n '__fish_git_needs_command' -a difftool -d 'Open diffs in a visual tool'
+complete -c git -n __fish_git_needs_command -a difftool -d 'Open diffs in a visual tool'
 complete -c git -n '__fish_git_using_command difftool' -a '(__fish_git_ranges)'
 complete -c git -n '__fish_git_using_command difftool' -l cached -d 'Visually show diff of changes in the index'
 complete -f -c git -n '__fish_git_using_command difftool' -a '(__fish_git_files modified deleted)'
@@ -1095,7 +1095,7 @@ complete -f -c git -n '__fish_git_using_command difftool' -s x -l extcmd -d 'Spe
 # TODO options
 
 ### gc
-complete -f -c git -n '__fish_git_needs_command' -a gc -d 'Cleanup unnecessary files and optimize the local repository'
+complete -f -c git -n __fish_git_needs_command -a gc -d 'Cleanup unnecessary files and optimize the local repository'
 complete -f -c git -n '__fish_git_using_command gc' -l aggressive -d 'Aggressively optimize the repository'
 complete -f -c git -n '__fish_git_using_command gc' -l auto -d 'Checks any housekeeping is required and then run'
 complete -f -c git -n '__fish_git_using_command gc' -l prune -d 'Prune loose objects older than date'
@@ -1105,16 +1105,16 @@ complete -f -c git -n '__fish_git_using_command gc' -l force -d 'Force `git gc`
 complete -f -c git -n '__fish_git_using_command gc' -l keep-largest-pack -d 'Ignore `gc.bigPackThreshold`'
 
 ### grep
-complete -c git -n '__fish_git_needs_command' -a grep -d 'Print lines matching a pattern'
+complete -c git -n __fish_git_needs_command -a grep -d 'Print lines matching a pattern'
 # TODO options
 
 ### init
-complete -f -c git -n '__fish_git_needs_command' -a init -d 'Create an empty git repository or reinitialize an existing one'
+complete -f -c git -n __fish_git_needs_command -a init -d 'Create an empty git repository or reinitialize an existing one'
 # TODO options
 
 ### log
-complete -c git -n '__fish_git_needs_command' -a shortlog -d 'Show commit shortlog'
-complete -c git -n '__fish_git_needs_command' -a log -d 'Show commit logs'
+complete -c git -n __fish_git_needs_command -a shortlog -d 'Show commit shortlog'
+complete -c git -n __fish_git_needs_command -a log -d 'Show commit logs'
 complete -c git -n '__fish_git_using_command log; and not contains -- -- (commandline -opc)' -a '(__fish_git_ranges)'
 
 complete -c git -n '__fish_git_using_command log' -l follow -d 'Continue listing file history beyond renames'
@@ -1300,7 +1300,7 @@ complete -x -c git -n '__fish_git_using_command log' -l line-prefix
 complete -c git -n '__fish_git_using_command log' -l ita-invisible-in-index
 
 ### ls-files
-complete -c git -n '__fish_git_needs_command' -a ls-files -d 'Show information about files in the index and the working tree'
+complete -c git -n __fish_git_needs_command -a ls-files -d 'Show information about files in the index and the working tree'
 complete -c git -n '__fish_git_using_command ls-files'
 complete -c git -n '__fish_git_using_command ls-files' -s c -l cached -d 'Show cached files in the output'
 complete -c git -n '__fish_git_using_command ls-files' -s d -l deleted -d 'Show deleted files in the output'
@@ -1329,7 +1329,7 @@ complete -c git -n '__fish_git_using_command ls-files' -l debug -d 'After each l
 complete -c git -n '__fish_git_using_command ls-files' -l eol -d 'Show <eolinfo> and <eolattr> of files'
 
 ### merge
-complete -f -c git -n '__fish_git_needs_command' -a merge -d 'Join two or more development histories together'
+complete -f -c git -n __fish_git_needs_command -a merge -d 'Join two or more development histories together'
 complete -f -c git -n '__fish_git_using_command merge' -a '(__fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command merge' -l commit -d "Autocommit the merge"
 complete -f -c git -n '__fish_git_using_command merge' -l no-commit -d "Don't autocommit the merge"
@@ -1363,7 +1363,7 @@ complete -f -c git -n '__fish_git_using_command merge' -l abort -d 'Abort the cu
 complete -f -c git -n '__fish_git_using_command merge' -l continue -d 'Conclude current conflict resolution process'
 
 ### merge-base
-complete -f -c git -n '__fish_git_needs_command' -a merge-base -d 'Find as good common ancestors as possible for a merge'
+complete -f -c git -n __fish_git_needs_command -a merge-base -d 'Find as good common ancestors as possible for a merge'
 complete -f -c git -n '__fish_git_using_command merge-base' -a '(__fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command merge-base' -s a -l all -d 'Output all merge bases for the commits, instead of just one'
 complete -f -c git -n '__fish_git_using_command merge-base' -l octopus -d 'Compute the best common ancestors of all supplied commits'
@@ -1373,24 +1373,24 @@ complete -f -c git -n '__fish_git_using_command merge-base' -l fork-point -d 'Fi
 
 ### mergetool
 
-complete -f -c git -n '__fish_git_needs_command' -a mergetool -d 'Run merge conflict resolution tools to resolve merge conflicts'
+complete -f -c git -n __fish_git_needs_command -a mergetool -d 'Run merge conflict resolution tools to resolve merge conflicts'
 complete -f -c git -n '__fish_git_using_command mergetool' -s t -l tool -d "Use specific merge resolution program" -a "(__fish_git_diffmerge_tools mergetool)"
 complete -f -c git -n '__fish_git_using_command mergetool' -l tool-help -d 'Print a list of merge tools that may be used with `--tool`'
 complete -f -c git -n '__fish_git_using_command mergetool' -a "(__fish_git_files unmerged)"
 complete -f -c git -n '__fish_git_using_command mergetool' -s y -l no-prompt -d 'Do not prompt before launching a diff tool'
-complete -f -c git -n '__fish_git_using_command mergetool' -l 'prompt' -d 'Prompt before each invocation of the merge resolution program'
+complete -f -c git -n '__fish_git_using_command mergetool' -l prompt -d 'Prompt before each invocation of the merge resolution program'
 complete -c git -n '__fish_git_using_command mergetool' -s O -d 'Process files in the order specified in the file passed as argument'
 
 ### mv
-complete -c git -n '__fish_git_needs_command' -a mv -d 'Move or rename a file, a directory, or a symlink'
+complete -c git -n __fish_git_needs_command -a mv -d 'Move or rename a file, a directory, or a symlink'
 # TODO options
 
 ### prune
-complete -f -c git -n '__fish_git_needs_command' -a prune -d 'Prune all unreachable objects from the object database'
+complete -f -c git -n __fish_git_needs_command -a prune -d 'Prune all unreachable objects from the object database'
 # TODO options
 
 ### pull
-complete -f -c git -n '__fish_git_needs_command' -a pull -d 'Fetch from and merge with another repository or a local branch'
+complete -f -c git -n __fish_git_needs_command -a pull -d 'Fetch from and merge with another repository or a local branch'
 complete -f -c git -n '__fish_git_using_command pull' -s q -l quiet -d 'Be quiet'
 complete -f -c git -n '__fish_git_using_command pull' -s v -l verbose -d 'Be verbose'
 # Options related to fetching
@@ -1432,16 +1432,16 @@ complete -f -c git -n '__fish_git_using_command pull' -l no-autostash -d 'Do not
 # TODO other options
 
 ### range-diff
-complete -f -c git -n '__fish_git_needs_command' -a range-diff -d 'Compare two commit ranges (e.g. two versions of a branch)'
+complete -f -c git -n __fish_git_needs_command -a range-diff -d 'Compare two commit ranges (e.g. two versions of a branch)'
 complete -f -c git -n '__fish_git_using_command range-diff' -a '(__fish_git_branches)'
-complete -f -c git -n '__fish_git_using_command range-diff' -a '(__fish_git_heads)' -d 'Head'
-complete -f -c git -n '__fish_git_using_command range-diff' -a '(__fish_git_tags)' -d 'Tag'
+complete -f -c git -n '__fish_git_using_command range-diff' -a '(__fish_git_heads)' -d Head
+complete -f -c git -n '__fish_git_using_command range-diff' -a '(__fish_git_tags)' -d Tag
 complete -f -c git -n '__fish_git_using_command range-diff' -l creation-factor -d 'Percentage by which creation is weighted'
 complete -f -c git -n '__fish_git_using_command range-diff' -l no-dual-color -d 'Use simple diff colors'
 
 
 ### push
-complete -f -c git -n '__fish_git_needs_command' -a push -d 'Update remote refs along with associated objects'
+complete -f -c git -n __fish_git_needs_command -a push -d 'Update remote refs along with associated objects'
 complete -f -c git -n '__fish_git_using_command push; and not __fish_git_branch_for_remote' -a '(__fish_git_remotes)' -d 'Remote alias'
 complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote' -a '(__fish_git_branches)'
 # The "refspec" here is an optional "+" to signify a force-push
@@ -1468,11 +1468,11 @@ complete -f -c git -n '__fish_git_using_command push' -l progress -d 'Force prog
 # TODO --recurse-submodules=check|on-demand
 
 ### rebase
-complete -f -c git -n '__fish_git_needs_command' -a rebase -d 'Forward-port local commits to the updated upstream head'
+complete -f -c git -n __fish_git_needs_command -a rebase -d 'Forward-port local commits to the updated upstream head'
 complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_remotes)' -d 'Remote alias'
 complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_branches)'
-complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_heads)' -d 'Head'
-complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_tags)' -d 'Tag'
+complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_heads)' -d Head
+complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_tags)' -d Tag
 complete -f -c git -n '__fish_git_using_command rebase' -l continue -d 'Restart the rebasing process'
 complete -f -c git -n '__fish_git_using_command rebase' -l abort -d 'Abort the rebase operation'
 complete -f -c git -n '__fish_git_using_command rebase' -l keep-empty -d "Keep the commits that don't change anything"
@@ -1501,14 +1501,14 @@ complete -r -c git -n '__fish_git_using_command rebase' -l exec -d 'Execute shel
 
 ### reflog
 set -l reflogcommands show expire delete exists
-complete -f -c git -n '__fish_git_needs_command' -a reflog -d 'Manage reflog information'
+complete -f -c git -n __fish_git_needs_command -a reflog -d 'Manage reflog information'
 complete -f -c git -n '__fish_git_using_command reflog' -a '(__fish_git_branches)'
-complete -f -c git -n '__fish_git_using_command reflog' -a '(__fish_git_heads)' -d 'Head'
+complete -f -c git -n '__fish_git_using_command reflog' -a '(__fish_git_heads)' -d Head
 
 complete -f -c git -n "__fish_git_using_command reflog; and not __fish_seen_subcommand_from $reflogcommands" -a "$reflogcommands"
 
 ### reset
-complete -c git -n '__fish_git_needs_command' -a reset -d 'Reset current HEAD to the specified state'
+complete -c git -n __fish_git_needs_command -a reset -d 'Reset current HEAD to the specified state'
 complete -f -c git -n '__fish_git_using_command reset' -l hard -d 'Reset files in working directory'
 complete -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -opc)' -a '(__fish_git_branches)'
 # reset can either undo changes to versioned modified files,
@@ -1516,12 +1516,12 @@ complete -c git -n '__fish_git_using_command reset; and not contains -- -- (comm
 # Deleted files seem to need a "--" separator.
 complete -f -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -opc)' -a '(__fish_git_files all-staged modified)'
 complete -f -c git -n '__fish_git_using_command reset; and contains -- -- (commandline -opc)' -a '(__fish_git_files all-staged deleted modified)'
-complete -f -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -opc)' -a '(__fish_git_reflog)' -d 'Reflog'
+complete -f -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -opc)' -a '(__fish_git_reflog)' -d Reflog
 # TODO options
 
 ### restore and switch
 # restore options
-complete -f -c git -n '__fish_git_needs_command' -a restore -d 'Restore working tree files'
+complete -f -c git -n __fish_git_needs_command -a restore -d 'Restore working tree files'
 complete -f -c git -n '__fish_git_using_command restore' -r -s s -l source -d 'Specify the source tree used to restore the working tree' -a '(__fish_git_refs)'
 complete -f -c git -n '__fish_git_using_command restore' -s p -l patch -d 'Interactive mode'
 complete -f -c git -n '__fish_git_using_command restore' -s W -l worktree -d 'Restore working tree (default)'
@@ -1537,7 +1537,7 @@ complete -f -c git -n '__fish_git_using_command restore; and not contains -- --s
 complete -f -c git -n '__fish_git_using_command restore; and contains -- --staged (commandline -opc)' -a '(__fish_git_files added modified-staged deleted-staged renamed copied)'
 complete -f -c git -n '__fish_git_using_command restore; and __fish_contains_opt -s s source' -a '(git ls-files)'
 # switch options
-complete -f -c git -n '__fish_git_needs_command' -a switch -d 'Switch to a branch'
+complete -f -c git -n __fish_git_needs_command -a switch -d 'Switch to a branch'
 complete -k -f -c git -n '__fish_git_using_command switch' -a '(__fish_git_branches)'
 complete -k -f -c git -n '__fish_git_using_command switch' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
 complete -f -c git -n '__fish_git_using_command switch' -r -s c -l create -d 'Create a new branch'
@@ -1561,18 +1561,18 @@ complete -f -c git -n '__fish_git_using_command restore switch' -l 'conflict=mer
 complete -f -c git -n '__fish_git_using_command restore switch' -l 'conflict=diff3' -d 'Same as --merge, but specify \'diff3\' as the conflicting hunk style'
 
 ### rev-parse
-complete -f -c git -n '__fish_git_needs_command' -a rev-parse -d 'Pick out and massage parameters'
+complete -f -c git -n __fish_git_needs_command -a rev-parse -d 'Pick out and massage parameters'
 complete -f -c git -n '__fish_git_using_command rev-parse' -a '(__fish_git_branches)'
-complete -f -c git -n '__fish_git_using_command rev-parse' -a '(__fish_git_heads)' -d 'Head'
-complete -k -c git -n '__fish_git_using_command rev-parse' -a '(__fish_git_tags)' -d 'Tag'
+complete -f -c git -n '__fish_git_using_command rev-parse' -a '(__fish_git_heads)' -d Head
+complete -k -c git -n '__fish_git_using_command rev-parse' -a '(__fish_git_tags)' -d Tag
 
 ### revert
-complete -f -c git -n '__fish_git_needs_command' -a revert -d 'Revert an existing commit'
+complete -f -c git -n __fish_git_needs_command -a revert -d 'Revert an existing commit'
 complete -f -c git -n '__fish_git_using_command revert' -ka '(__fish_git_commits)'
 # TODO options
 
 ### rm
-complete -c git -n '__fish_git_needs_command' -a rm -d 'Remove files from the working tree and the index'
+complete -c git -n __fish_git_needs_command -a rm -d 'Remove files from the working tree and the index'
 complete -c git -n '__fish_git_using_command rm' -l cached -d 'Unstage files from the index'
 complete -c git -n '__fish_git_using_command rm; and __fish_contains_opt cached' -f -a '(__fish_git_files all-staged)'
 complete -c git -n '__fish_git_using_command rm' -l ignore-unmatch -d 'Exit with a zero status even if no files matched'
@@ -1583,7 +1583,7 @@ complete -c git -n '__fish_git_using_command rm' -s n -l dry-run -d 'Dry run'
 # TODO options
 
 ### status
-complete -f -c git -n '__fish_git_needs_command' -a status -d 'Show the working tree status'
+complete -f -c git -n __fish_git_needs_command -a status -d 'Show the working tree status'
 complete -f -c git -n '__fish_git_using_command status' -s s -l short -d 'Give the output in the short-format'
 complete -f -c git -n '__fish_git_using_command status' -s b -l branch -d 'Show the branch and tracking info even in short-format'
 complete -f -c git -n '__fish_git_using_command status' -l porcelain -d 'Give the output in a stable, easy-to-parse format'
@@ -1593,7 +1593,7 @@ complete -f -c git -n '__fish_git_using_command status' -l ignore-submodules -x
 # TODO options
 
 ### tag
-complete -f -c git -n '__fish_git_needs_command' -a tag -d 'Create, list, delete or verify a tag object signed with GPG'
+complete -f -c git -n __fish_git_needs_command -a tag -d 'Create, list, delete or verify a tag object signed with GPG'
 complete -f -c git -n '__fish_git_using_command tag; and __fish_not_contain_opt -s d; and __fish_not_contain_opt -s v; and test (count (commandline -opc | string match -r -v \'^-\')) -eq 3' -a '(__fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command tag' -s a -l annotate -d 'Make an unsigned, annotated tag object'
 complete -f -c git -n '__fish_git_using_command tag' -s s -l sign -d 'Make a GPG-signed tag'
@@ -1602,12 +1602,12 @@ complete -f -c git -n '__fish_git_using_command tag' -s v -l verify -d 'Verify s
 complete -f -c git -n '__fish_git_using_command tag' -s f -l force -d 'Force overwriting existing tag'
 complete -f -c git -n '__fish_git_using_command tag' -s l -l list -d 'List tags'
 complete -f -c git -n '__fish_git_using_command tag' -l contains -xka '(__fish_git_commits)' -d 'List tags that contain a commit'
-complete -f -c git -n '__fish_git_using_command tag; and __fish_contains_opt -s d delete -s v verify' -a '(__fish_git_tags)' -d 'Tag'
+complete -f -c git -n '__fish_git_using_command tag; and __fish_contains_opt -s d delete -s v verify' -a '(__fish_git_tags)' -d Tag
 # TODO options
 
 ### worktree
 set -l git_worktree_commands add list lock move prune remove unlock
-complete -c git -n '__fish_git_needs_command' -a worktree -d 'Manage multiple working trees'
+complete -c git -n __fish_git_needs_command -a worktree -d 'Manage multiple working trees'
 complete -f -c git -n "__fish_git_using_command worktree; and not __fish_seen_subcommand_from $git_worktree_commands" -a add -d 'Create a working tree'
 complete -f -c git -n "__fish_git_using_command worktree; and not __fish_seen_subcommand_from $git_worktree_commands" -a list -d 'List details of each worktree'
 complete -f -c git -n "__fish_git_using_command worktree; and not __fish_seen_subcommand_from $git_worktree_commands" -a lock -d 'Unlock a working tree'
@@ -1620,8 +1620,8 @@ complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcom
 
 complete -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add'
 complete -k -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -a '(__fish_git_branches)'
-complete -k -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -a '(__fish_git_heads)' -d 'Head'
-complete -k -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -a '(__fish_git_tags)' -d 'Tag'
+complete -k -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -a '(__fish_git_heads)' -d Head
+complete -k -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -a '(__fish_git_tags)' -d Tag
 complete -k -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
 complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -s b -d 'Create a new branch'
 complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -s B -d 'Create a new branch even if it already exists'
@@ -1635,18 +1635,18 @@ complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcom
 complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -l lock -d 'Lock working tree after creation'
 complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -s q -l quiet -d 'Suppress feedback messages'
 complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from list' -l porcelain -d 'Output in an easy-to-parse format for scripts'
-complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from lock' -a '(__fish_git_complete_worktrees)' -d 'Worktree'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from lock' -a '(__fish_git_complete_worktrees)' -d Worktree
 complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from lock' -l reason -d 'An explanation why the working tree is locked'
-complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from move; and not __fish_any_arg_in (__fish_git_complete_worktrees)' -a '(__fish_git_complete_worktrees)' -d 'Worktree'
+complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from move; and not __fish_any_arg_in (__fish_git_complete_worktrees)' -a '(__fish_git_complete_worktrees)' -d Worktree
 complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from move; and __fish_any_arg_in (__fish_git_complete_worktrees)' -a '(__fish_complete_directories)'
 complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from prune' -s n -l dry-run -d 'Do not remove anything'
 complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from prune' -s v -l verbose -d 'Report all removals'
 complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from prune' -l expire -d 'Only expire unused working trees older than <time>'
-complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from remove' -a '(__fish_git_complete_worktrees)' -d 'Worktree'
-complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from unlock' -a '(__fish_git_complete_worktrees)' -d 'Worktree'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from remove' -a '(__fish_git_complete_worktrees)' -d Worktree
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from unlock' -a '(__fish_git_complete_worktrees)' -d Worktree
 
 ### stash
-complete -c git -n '__fish_git_needs_command' -a stash -d 'Stash away changes'
+complete -c git -n __fish_git_needs_command -a stash -d 'Stash away changes'
 complete -f -c git -n '__fish_git_using_command stash; and __fish_git_stash_not_using_subcommand' -a list -d 'List stashes'
 complete -f -c git -n '__fish_git_using_command stash; and __fish_git_stash_not_using_subcommand' -a show -d 'Show the changes recorded in the stash'
 complete -f -c git -n '__fish_git_using_command stash; and __fish_git_stash_not_using_subcommand' -a pop -d 'Apply and remove a single stashed state'
@@ -1669,11 +1669,11 @@ complete -f -c git -n '__fish_git_stash_using_command push' -s p -l patch -d 'In
 complete -f -c git -n '__fish_git_stash_using_command push' -s m -l message -d 'Add a description'
 
 ### config
-complete -f -c git -n '__fish_git_needs_command' -a config -d 'Set and read git configuration variables'
+complete -f -c git -n __fish_git_needs_command -a config -d 'Set and read git configuration variables'
 # TODO options
 
 ### format-patch
-complete -f -c git -n '__fish_git_needs_command' -a format-patch -d 'Generate patch series to send upstream'
+complete -f -c git -n __fish_git_needs_command -a format-patch -d 'Generate patch series to send upstream'
 complete -f -c git -n '__fish_git_using_command format-patch' -a '(__fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command format-patch' -s p -l no-stat -d "Generate plain patches without diffstat"
 complete -f -c git -n '__fish_git_using_command format-patch' -s s -l no-patch -d "Suppress diff output"
@@ -1705,14 +1705,14 @@ complete -f -c git -n '__fish_git_using_command format-patch' -l no-numbered -s
 
 ## git submodule
 set -l submodulecommands add status init update summary foreach sync
-complete -f -c git -n '__fish_git_needs_command' -a submodule -d 'Initialize, update or inspect submodules'
-complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a 'add' -d 'Add a submodule'
-complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a 'status' -d 'Show submodule status'
-complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a 'init' -d 'Initialize all submodules'
-complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a 'update' -d 'Update all submodules'
-complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a 'summary' -d 'Show commit summary'
-complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a 'foreach' -d 'Run command on each submodule'
-complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a 'sync' -d 'Sync submodules\' URL with .gitmodules'
+complete -f -c git -n __fish_git_needs_command -a submodule -d 'Initialize, update or inspect submodules'
+complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a add -d 'Add a submodule'
+complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a status -d 'Show submodule status'
+complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a init -d 'Initialize all submodules'
+complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a update -d 'Update all submodules'
+complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a summary -d 'Show commit summary'
+complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a foreach -d 'Run command on each submodule'
+complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a sync -d 'Sync submodules\' URL with .gitmodules'
 complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -s q -l quiet -d "Only print error messages"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from update' -l init -d "Initialize all submodules"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from update' -l checkout -d "Checkout the superproject's commit on a detached HEAD in the submodule"
@@ -1729,13 +1729,13 @@ complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subco
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from foreach' -a "(__fish_complete_subcommand --fcs-skip=3)"
 
 ## git whatchanged
-complete -f -c git -n '__fish_git_needs_command' -a whatchanged -d 'Show logs with difference each commit introduces'
+complete -f -c git -n __fish_git_needs_command -a whatchanged -d 'Show logs with difference each commit introduces'
 
 ## Aliases (custom user-defined commands)
-complete -c git -n '__fish_git_needs_command' -a '(__fish_git_aliases)'
+complete -c git -n __fish_git_needs_command -a '(__fish_git_aliases)'
 
 ### git clean
-complete -f -c git -n '__fish_git_needs_command' -a clean -d 'Remove untracked files from the working tree'
+complete -f -c git -n __fish_git_needs_command -a clean -d 'Remove untracked files from the working tree'
 complete -f -c git -n '__fish_git_using_command clean' -s f -l force -d 'Force run'
 complete -f -c git -n '__fish_git_using_command clean' -s i -l interactive -d 'Show what would be done and clean files interactively'
 complete -f -c git -n '__fish_git_using_command clean' -s n -l dry-run -d 'Don\'t actually remove anything, just show what would be done'
@@ -1746,7 +1746,7 @@ complete -f -c git -n '__fish_git_using_command clean' -s X -d 'Remove only igno
 # TODO -e option
 
 ### git blame
-complete -f -c git -n '__fish_git_needs_command' -a blame -d 'Show what revision and author last modified each line of a file'
+complete -f -c git -n __fish_git_needs_command -a blame -d 'Show what revision and author last modified each line of a file'
 complete -f -c git -n '__fish_git_using_command blame' -s b -d 'Show blank SHA-1 for boundary commits'
 complete -f -c git -n '__fish_git_using_command blame' -l root -d 'Do not treat root commits as boundaries'
 complete -f -c git -n '__fish_git_using_command blame' -l show-stats -d 'Include additional statistics'
@@ -1771,7 +1771,7 @@ complete -f -c git -n '__fish_git_using_command blame' -s e -l show-email -d 'Sh
 complete -f -c git -n '__fish_git_using_command blame' -s w -d 'Ignore whitespace changes'
 
 ### help
-complete -f -c git -n '__fish_git_needs_command' -a help -d 'Display help information about Git'
+complete -f -c git -n __fish_git_needs_command -a help -d 'Display help information about Git'
 complete -f -c git -n '__fish_git_using_command help' -a '(__fish_git_help_all_concepts)'
 complete -f -c git -n '__fish_git_using_command help' -a add -d 'Add file contents to the index'
 complete -f -c git -n '__fish_git_using_command help' -a apply -d 'Apply a patch on a git index file and a working tree'
@@ -1862,4 +1862,4 @@ complete -c git -n '__fish_git_using_command bisect; and __fish_seen_argument --
 
 
 ## Custom commands (git-* commands installed in the PATH)
-complete -c git -n '__fish_git_needs_command' -a '(__fish_git_custom_commands)' -d 'Custom command'
+complete -c git -n __fish_git_needs_command -a '(__fish_git_custom_commands)' -d 'Custom command'
diff --git a/share/completions/go.fish b/share/completions/go.fish
index b7be9ea36..cfafbb0fd 100644
--- a/share/completions/go.fish
+++ b/share/completions/go.fish
@@ -23,42 +23,42 @@ complete -c go -n "__fish_seen_subcommand_from $__go_cmds_w_buildflags" -o mod -
 # Completions for go cmds that takes file arguments
 complete -c go -n "__fish_seen_subcommand_from build compile fix fmt install run test vet" -x -a "(
             __fish_complete_suffix .go
-    )" --description 'File'
+    )" --description File
 
 # Completions for go cmds that takes pkg arguments
 complete -c go -n "__fish_seen_subcommand_from build doc fix fmt install test vet" -x -a "(
             go list -e -f '{{.ImportPath}}	{{or .Doc \"Go package\"}}' (commandline -ct)... ^/dev/null
-    )" --description 'Package'
+    )" --description Package
 
 
 # build
-complete -c go -n '__fish_use_subcommand' -a build -d 'compile packages and dependencies'
+complete -c go -n __fish_use_subcommand -a build -d 'compile packages and dependencies'
 
 # clean
-complete -c go -n '__fish_use_subcommand' -a clean -d 'remove object files'
+complete -c go -n __fish_use_subcommand -a clean -d 'remove object files'
 complete -c go -n '__fish_seen_subcommand_from clean' -s i -d "remove the corresponding installed archive or binary (what 'go install' would create)"
 complete -c go -n '__fish_seen_subcommand_from clean' -s n -d "print the remove commands it would execute, but not run them"
 complete -c go -n '__fish_seen_subcommand_from clean' -s r -d "clean to be applied recursively to all the dependencies of the packages named by the import paths"
 complete -c go -n '__fish_seen_subcommand_from clean' -s x -d "clean to print remove commands as it executes them"
 
 # doc
-complete -c go -n '__fish_use_subcommand' -a doc -d 'run godoc on package sources'
+complete -c go -n __fish_use_subcommand -a doc -d 'run godoc on package sources'
 complete -c go -n '__fish_seen_subcommand_from doc' -s n -d "prints commands that would be executed"
 complete -c go -n '__fish_seen_subcommand_from doc' -s x -d "prints commands as they are executed"
 
 # env
-complete -c go -n '__fish_use_subcommand' -a env -d 'print Go environment information'
+complete -c go -n __fish_use_subcommand -a env -d 'print Go environment information'
 
 # fix
-complete -c go -n '__fish_use_subcommand' -a fix -d 'run go tool fix on packages'
+complete -c go -n __fish_use_subcommand -a fix -d 'run go tool fix on packages'
 
 # fmt
-complete -c go -n '__fish_use_subcommand' -a fmt -d 'run gofmt on package sources'
+complete -c go -n __fish_use_subcommand -a fmt -d 'run gofmt on package sources'
 complete -c go -n '__fish_seen_subcommand_from fmt' -s n -d "prints commands that would be executed"
 complete -c go -n '__fish_seen_subcommand_from fmt' -s x -d "prints commands as they are executed"
 
 # get
-complete -c go -n '__fish_use_subcommand' -a get -d 'download and install packages and dependencies'
+complete -c go -n __fish_use_subcommand -a get -d 'download and install packages and dependencies'
 complete -c go -n '__fish_seen_subcommand_from get' -s d -d "stop after downloading the packages; don't install"
 complete -c go -n '__fish_seen_subcommand_from get' -o fix -d "run fix tool on packages before resolving dependencies or building"
 complete -c go -n '__fish_seen_subcommand_from get' -s u -d "update remote packages"
@@ -67,14 +67,14 @@ complete -c go -n '__fish_seen_subcommand_from get' -s t -d "also download the p
 complete -c go -n '__fish_seen_subcommand_from get' -o insecure -d "flag permits fetching & resolving domains using insecure schemes"
 
 # generate
-complete -c go -n '__fish_use_subcommand' -a generate -d 'Generate runs commands described by directives within existing files.'
+complete -c go -n __fish_use_subcommand -a generate -d 'Generate runs commands described by directives within existing files.'
 complete -c go -n '__fish_seen_subcommand_from get' -s n -d "prints commands that would be executed"
 complete -c go -n '__fish_seen_subcommand_from get' -s x -d "prints commands as they are executed"
 complete -c go -n '__fish_seen_subcommand_from get' -s v -d "prints the names of packages and files as they are processed"
 complete -c go -n '__fish_seen_subcommand_from get' -o run -d "prints the names of packages and files as they are processed"
 
 # help
-complete -c go -n '__fish_use_subcommand' -a help -d 'get help on topic'
+complete -c go -n __fish_use_subcommand -a help -d 'get help on topic'
 complete -c go -n '__fish_seen_subcommand_from help' -xa bug -d "start a bug report"
 complete -c go -n '__fish_seen_subcommand_from help' -xa build -d "compile packages and dependencies"
 complete -c go -n '__fish_seen_subcommand_from help' -xa clean -d "remove object files and cached files"
@@ -111,10 +111,10 @@ complete -c go -n '__fish_seen_subcommand_from help' -xa testflag -d "testing fl
 complete -c go -n '__fish_seen_subcommand_from help' -xa testfunc -d "testing functions"
 
 # install
-complete -c go -n '__fish_use_subcommand' -a install -d 'compile and install packages and dependencies'
+complete -c go -n __fish_use_subcommand -a install -d 'compile and install packages and dependencies'
 
 # list
-complete -c go -n '__fish_use_subcommand' -a list -d 'list packages'
+complete -c go -n __fish_use_subcommand -a list -d 'list packages'
 complete -c go -n '__fish_seen_subcommand_from list' -s e -d "tolerate erroneous packages"
 complete -c go -n '__fish_seen_subcommand_from list' -s f -r -d "pass in template for formatting"
 complete -c go -n '__fish_seen_subcommand_from list' -o json -d "print in JSON format"
@@ -122,29 +122,29 @@ complete -c go -n '__fish_seen_subcommand_from list' -o tags -r -d 'list of buil
 complete -c go -n '__fish_seen_subcommand_from list' -s m -d 'list modules instead of packages'
 
 # run
-complete -c go -n '__fish_use_subcommand' -a run -d 'compile and run Go program'
+complete -c go -n __fish_use_subcommand -a run -d 'compile and run Go program'
 
 # test
-complete -c go -n '__fish_use_subcommand' -a test -d 'test packages'
+complete -c go -n __fish_use_subcommand -a test -d 'test packages'
 complete -c go -n '__fish_seen_subcommand_from test' -s c -r -d "compile the test binary to pkg.test but do not run it"
 complete -c go -n '__fish_seen_subcommand_from test' -s i -d "install dependent packages, but don't run tests"
 
 # tool
-complete -c go -n '__fish_use_subcommand' -a tool -d 'run specified go tool'
+complete -c go -n __fish_use_subcommand -a tool -d 'run specified go tool'
 complete -c go -n '__fish_seen_subcommand_from tool' -a 'addr2line api asm cgo compile dist fix link nm objdump pack pprof prof vet yacc' -d "target tool"
 complete -c go -n '__fish_seen_subcommand_from tool' -s n -d "print the command that would be executed but not execute it"
 
 # version
-complete -c go -f -n '__fish_use_subcommand' -a version -d 'print Go version'
+complete -c go -f -n __fish_use_subcommand -a version -d 'print Go version'
 complete -c go -f -n '__fish_seen_subcommand_from version'
 
 # vet
-complete -c go -n '__fish_use_subcommand' -a vet -d 'vet packages'
+complete -c go -n __fish_use_subcommand -a vet -d 'vet packages'
 complete -c go -n '__fish_seen_subcommand_from vet' -s n -d "print the command that would be executed"
 complete -c go -n '__fish_seen_subcommand_from vet' -s x -d "prints commands as they are executed"
 
 # mod
-complete -c go -n '__fish_use_subcommand' -a mod -d 'module maintenance'
+complete -c go -n __fish_use_subcommand -a mod -d 'module maintenance'
 complete -c go -f -n '__fish_seen_subcommand_from mod' -a download -d "download modules to local cache"
 complete -c go -f -n '__fish_seen_subcommand_from mod' -a edit -d "edit go.mod from tools or scripts"
 complete -c go -f -n '__fish_seen_subcommand_from mod' -a graph -d "print module requirement graph"
diff --git a/share/completions/gphoto2.fish b/share/completions/gphoto2.fish
index 71c805c69..16fa4876a 100644
--- a/share/completions/gphoto2.fish
+++ b/share/completions/gphoto2.fish
@@ -1,81 +1,81 @@
 
 #Common options
-complete -c gphoto2 -s '?' -l 'help' -d 'Print complete help message on program usage'
-complete -c gphoto2 -l 'usage' -d 'Print short message on program usage'
-complete -c gphoto2 -l 'debug' -d 'Turn on debugging'
-complete -c gphoto2 -l 'debug-logfile' -r -d 'Name of file to write debug info to'
-complete -c gphoto2 -l 'quiet' -d 'Quiet output (default=verbose)'
-complete -c gphoto2 -l 'hook-script' -r -d 'Hook script to call after downloads, captures, etc.'
+complete -c gphoto2 -s '?' -l help -d 'Print complete help message on program usage'
+complete -c gphoto2 -l usage -d 'Print short message on program usage'
+complete -c gphoto2 -l debug -d 'Turn on debugging'
+complete -c gphoto2 -l debug-logfile -r -d 'Name of file to write debug info to'
+complete -c gphoto2 -l quiet -d 'Quiet output (default=verbose)'
+complete -c gphoto2 -l hook-script -r -d 'Hook script to call after downloads, captures, etc.'
 
 #Miscellaneous options (unsorted)
-complete -c gphoto2 -l 'stdout' -d 'Send file to stdout'
-complete -c gphoto2 -l 'stdout-size' -d 'Print filesize before data'
-complete -c gphoto2 -l 'auto-detect' -d 'List auto-detected cameras'
-complete -c gphoto2 -l 'show-exif' -r -d 'Show EXIF information'
-complete -c gphoto2 -l 'show-info' -r -d 'Show info'
-complete -c gphoto2 -l 'summary' -d 'Show summary'
-complete -c gphoto2 -l 'manual' -d 'Show camera driver manual'
-complete -c gphoto2 -l 'about' -d 'About the camera driver manual'
-complete -c gphoto2 -l 'storage-info' -d 'Show storage information'
-complete -c gphoto2 -l 'shell' -d 'gPhoto shell'
+complete -c gphoto2 -l stdout -d 'Send file to stdout'
+complete -c gphoto2 -l stdout-size -d 'Print filesize before data'
+complete -c gphoto2 -l auto-detect -d 'List auto-detected cameras'
+complete -c gphoto2 -l show-exif -r -d 'Show EXIF information'
+complete -c gphoto2 -l show-info -r -d 'Show info'
+complete -c gphoto2 -l summary -d 'Show summary'
+complete -c gphoto2 -l manual -d 'Show camera driver manual'
+complete -c gphoto2 -l about -d 'About the camera driver manual'
+complete -c gphoto2 -l storage-info -d 'Show storage information'
+complete -c gphoto2 -l shell -d 'gPhoto shell'
 
 #Get information on software and host system (not from the camera)
-complete -c gphoto2 -s v -l 'version' -d 'Display version and exit'
-complete -c gphoto2 -l 'list-cameras' -d 'List supported camera models'
-complete -c gphoto2 -l 'list-ports' -d 'List supported port devices'
-complete -c gphoto2 -s a -l 'abilities' -d 'Display camera/driver abilities'
+complete -c gphoto2 -s v -l version -d 'Display version and exit'
+complete -c gphoto2 -l list-cameras -d 'List supported camera models'
+complete -c gphoto2 -l list-ports -d 'List supported port devices'
+complete -c gphoto2 -s a -l abilities -d 'Display camera/driver abilities'
 
 #Specify the camera to use
-complete -c gphoto2 -l 'port' -r -d 'Specify device port'
-complete -c gphoto2 -l 'speed' -r -d 'Specify serial transfer speed'
-complete -c gphoto2 -l 'camera' -r -d 'Specify camera model'
-complete -c gphoto2 -l 'usbid' -r -d '(expert only) Override USB IDs'
+complete -c gphoto2 -l port -r -d 'Specify device port'
+complete -c gphoto2 -l speed -r -d 'Specify serial transfer speed'
+complete -c gphoto2 -l camera -r -d 'Specify camera model'
+complete -c gphoto2 -l usbid -r -d '(expert only) Override USB IDs'
 
 #Camera and software configuration
-complete -c gphoto2 -l 'list-config' -d 'List configuration tree'
-complete -c gphoto2 -l 'list-all-config' -d 'Dump full configuration tree'
-complete -c gphoto2 -l 'get-config' -r -d 'Get configuration value'
-complete -c gphoto2 -l 'set-config' -r -d 'Set configuration value or index in choices'
-complete -c gphoto2 -l 'set-config-index' -r -d 'Set configuration value index in choices'
-complete -c gphoto2 -l 'set-config-value' -r -d 'Set configuration value'
+complete -c gphoto2 -l list-config -d 'List configuration tree'
+complete -c gphoto2 -l list-all-config -d 'Dump full configuration tree'
+complete -c gphoto2 -l get-config -r -d 'Get configuration value'
+complete -c gphoto2 -l set-config -r -d 'Set configuration value or index in choices'
+complete -c gphoto2 -l set-config-index -r -d 'Set configuration value index in choices'
+complete -c gphoto2 -l set-config-value -r -d 'Set configuration value'
 
 #Capture an image from or on the camera
-complete -c gphoto2 -l 'wait-event' -d 'Wait for event(s) from camera'
-complete -c gphoto2 -l 'wait-event-and-download' -d 'Wait for event(s) from the camera and download new images'
-complete -c gphoto2 -l 'capture-preview' -d 'Capture a quick preview'
-complete -c gphoto2 -s B -l 'bulb' -r -d 'Set bulb exposure time in seconds'
-complete -c gphoto2 -s F -l 'frames' -r -d 'Set number of frames to capture (default=infinite)'
-complete -c gphoto2 -s I -l 'interval' -r -d 'Set capture interval in seconds'
-complete -c gphoto2 -l 'reset-interval' -d 'Reset capture interval on signal (default=no)'
-complete -c gphoto2 -l 'capture-image' -d 'Capture an image'
-complete -c gphoto2 -l 'capture-image-and-download' -d 'Capture an image and download it'
-complete -c gphoto2 -l 'capture-movie' -d 'Capture a movie'
-complete -c gphoto2 -l 'capture-sound' -d 'Capture an audio clip'
-complete -c gphoto2 -l 'capture-tethered' -d 'Wait for shutter release on the camera and download'
+complete -c gphoto2 -l wait-event -d 'Wait for event(s) from camera'
+complete -c gphoto2 -l wait-event-and-download -d 'Wait for event(s) from the camera and download new images'
+complete -c gphoto2 -l capture-preview -d 'Capture a quick preview'
+complete -c gphoto2 -s B -l bulb -r -d 'Set bulb exposure time in seconds'
+complete -c gphoto2 -s F -l frames -r -d 'Set number of frames to capture (default=infinite)'
+complete -c gphoto2 -s I -l interval -r -d 'Set capture interval in seconds'
+complete -c gphoto2 -l reset-interval -d 'Reset capture interval on signal (default=no)'
+complete -c gphoto2 -l capture-image -d 'Capture an image'
+complete -c gphoto2 -l capture-image-and-download -d 'Capture an image and download it'
+complete -c gphoto2 -l capture-movie -d 'Capture a movie'
+complete -c gphoto2 -l capture-sound -d 'Capture an audio clip'
+complete -c gphoto2 -l capture-tethered -d 'Wait for shutter release on the camera and download'
 
 #Downloading, uploading and manipulating files
-complete -c gphoto2 -s l -l 'list-folders' -d 'List folders in folder'
-complete -c gphoto2 -s L -l 'list-files' -d 'List files in folder'
-complete -c gphoto2 -s m -l 'mkdir' -r -d 'Create a directory'
-complete -c gphoto2 -s r -l 'rmdir' -r -d 'Remove a directory'
-complete -c gphoto2 -s n -l 'num-files' -d 'Display number of files'
-complete -c gphoto2 -s p -l 'get-file' -r -d 'Get files given in range'
-complete -c gphoto2 -s P -l 'get-all-files' -d 'Get all files from folder'
-complete -c gphoto2 -s t -l 'get-thumbnail' -r -d 'Get thumbnails given in range'
-complete -c gphoto2 -s T -l 'get-all-thumbnails' -d 'Get all thumbnails from folder'
-complete -c gphoto2 -l 'get-metadata' -r -d 'Get metadata given in range'
-complete -c gphoto2 -l 'get-all-metadata' -d 'Get all metadata from folder'
-complete -c gphoto2 -l 'upload-metadata' -r -d 'Upload metadata for file'
-complete -c gphoto2 -l 'get-raw-data' -r -d 'Get raw data given in range'
-complete -c gphoto2 -l 'get-all-raw-data' -d 'Get all raw data from folder'
-complete -c gphoto2 -l 'get-audio-data' -r -d 'Get audio data given in range'
-complete -c gphoto2 -l 'get-all-audio-data' -d 'Get all audio data from folder'
-complete -c gphoto2 -s d -l 'delete-file' -r -d 'Delete files given in range'
-complete -c gphoto2 -s D -l 'delete-all-files' -d 'Delete all files in folder (--no-recurse by default)'
-complete -c gphoto2 -s u -l 'upload-file' -r -d 'Upload a file to camera'
-complete -c gphoto2 -l 'filename' -r -d 'Specify a filename or filename pattern'
-complete -c gphoto2 -s f -l 'folder' -r -d 'Specify camera folder (default="/")'
-complete -c gphoto2 -s R -l 'recurse' -d 'Recursion (default for download)'
-complete -c gphoto2 -l 'no-recurse' -d 'No recursion (default for deletion)'
-complete -c gphoto2 -l 'new' -d 'Process new files only'
-complete -c gphoto2 -l 'force-overwrite' -d 'Overwrite files without asking'
+complete -c gphoto2 -s l -l list-folders -d 'List folders in folder'
+complete -c gphoto2 -s L -l list-files -d 'List files in folder'
+complete -c gphoto2 -s m -l mkdir -r -d 'Create a directory'
+complete -c gphoto2 -s r -l rmdir -r -d 'Remove a directory'
+complete -c gphoto2 -s n -l num-files -d 'Display number of files'
+complete -c gphoto2 -s p -l get-file -r -d 'Get files given in range'
+complete -c gphoto2 -s P -l get-all-files -d 'Get all files from folder'
+complete -c gphoto2 -s t -l get-thumbnail -r -d 'Get thumbnails given in range'
+complete -c gphoto2 -s T -l get-all-thumbnails -d 'Get all thumbnails from folder'
+complete -c gphoto2 -l get-metadata -r -d 'Get metadata given in range'
+complete -c gphoto2 -l get-all-metadata -d 'Get all metadata from folder'
+complete -c gphoto2 -l upload-metadata -r -d 'Upload metadata for file'
+complete -c gphoto2 -l get-raw-data -r -d 'Get raw data given in range'
+complete -c gphoto2 -l get-all-raw-data -d 'Get all raw data from folder'
+complete -c gphoto2 -l get-audio-data -r -d 'Get audio data given in range'
+complete -c gphoto2 -l get-all-audio-data -d 'Get all audio data from folder'
+complete -c gphoto2 -s d -l delete-file -r -d 'Delete files given in range'
+complete -c gphoto2 -s D -l delete-all-files -d 'Delete all files in folder (--no-recurse by default)'
+complete -c gphoto2 -s u -l upload-file -r -d 'Upload a file to camera'
+complete -c gphoto2 -l filename -r -d 'Specify a filename or filename pattern'
+complete -c gphoto2 -s f -l folder -r -d 'Specify camera folder (default="/")'
+complete -c gphoto2 -s R -l recurse -d 'Recursion (default for download)'
+complete -c gphoto2 -l no-recurse -d 'No recursion (default for deletion)'
+complete -c gphoto2 -l new -d 'Process new files only'
+complete -c gphoto2 -l force-overwrite -d 'Overwrite files without asking'
diff --git a/share/completions/gradle.fish b/share/completions/gradle.fish
index 7181bd916..4480d8ff7 100644
--- a/share/completions/gradle.fish
+++ b/share/completions/gradle.fish
@@ -57,4 +57,4 @@ function __contains_gradle_build
     test -f build.gradle
 end
 
-complete -x -c gradle -n '__contains_gradle_build' -a "(__cache_or_get_gradle_completion)"
+complete -x -c gradle -n __contains_gradle_build -a "(__cache_or_get_gradle_completion)"
diff --git a/share/completions/gsettings.fish b/share/completions/gsettings.fish
index 0c10aec0f..f81a76ba8 100644
--- a/share/completions/gsettings.fish
+++ b/share/completions/gsettings.fish
@@ -9,7 +9,7 @@ function __fish_complete_gsettings_args
     set -e cmd[1]
 
     if set -q cmd[2]
-        and string match -q -- '--schemadir' $cmd[1]
+        and string match -q -- --schemadir $cmd[1]
         # TODO: This needs to support proper expansion of paths (~, variables, etc.)
         set schemadir --schemadir $cmd[2]
         set -e cmd[1..2]
@@ -46,7 +46,7 @@ function __fish_complete_gsettings_args
         return 0
     end
 
-    if test $subcommand != 'set'
+    if test $subcommand != set
         return 1
     end
 
@@ -59,7 +59,7 @@ function __fish_complete_gsettings_args
             case 'type b'
                 echo true
                 echo false
-            case 'enum'
+            case enum
                 string join \n $range
             case '*'
                 # If no sensible suggestions can be made, just use the current value.
@@ -76,21 +76,21 @@ set -l valid_commands get monitor writable range describe set reset reset-recurs
 
 complete -f -e -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))"
+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))"
 
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'get' -d 'Get the value of a key'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'writable' -d 'Determine if a key is writable'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'range' -d 'Determine the valid value range of a key'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'describe' -d 'Print the description of a key'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'set' -d 'Set the value of a key'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'reset' -d 'Reset a key to its default value'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'reset-recursively' -d 'Reset all keys under the given schema'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'list-schemas' -d 'List all installed, non-relocatable schemas'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'list-relocatable-schemas' -d 'List all installed, relocatable schemas'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'list-keys' -d 'List all keys in a schema'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'list-children' -d 'List all children of a schema'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'list-recursively' -d 'List keys and values, recursively'
-complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a 'help' -d 'Print help'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a get -d 'Get the value of a key'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a writable -d 'Determine if a key is writable'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a range -d 'Determine the valid value range of a key'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a describe -d 'Print the description of a key'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a set -d 'Set the value of a key'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a reset -d 'Reset a key to its default value'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a reset-recursively -d 'Reset all keys under the given schema'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a list-schemas -d 'List all installed, non-relocatable schemas'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a list-relocatable-schemas -d 'List all installed, relocatable schemas'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a list-keys -d 'List all keys in a schema'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a list-children -d 'List all children of a schema'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a list-recursively -d 'List keys and values, recursively'
+complete -f -c gsettings -n "not __fish_seen_subcommand_from $valid_commands" -a help -d 'Print help'
 
 complete -f -c gsettings -n "__fish_seen_subcommand_from $valid_commands" -xa "(__fish_complete_gsettings_args)"
diff --git a/share/completions/gunzip.fish b/share/completions/gunzip.fish
index f8ff46a5b..259ed5fa2 100644
--- a/share/completions/gunzip.fish
+++ b/share/completions/gunzip.fish
@@ -4,7 +4,7 @@ complete -c gunzip -x -a "(
 	__fish_complete_suffix .tgz
 )
 "
-complete -c gunzip -s f -l force -d "Overwrite"
+complete -c gunzip -s f -l force -d Overwrite
 complete -c gunzip -s h -l help -d "Display help and exit"
 complete -c gunzip -s l -l list -d "List compression information"
 complete -c gunzip -s L -l license -d "Print license"
@@ -12,7 +12,7 @@ complete -c gunzip -s n -l no-name -d "Do not save/restore filename"
 complete -c gunzip -s N -l name -d "Save/restore filename"
 complete -c gunzip -s q -l quiet -d "Suppress warnings"
 complete -c gunzip -s r -l recursive -d "Recurse directories"
-complete -c gunzip -s S -l suffix -r -d "Suffix"
+complete -c gunzip -s S -l suffix -r -d Suffix
 complete -c gunzip -s t -l test -d "Check integrity"
 complete -c gunzip -s v -l verbose -d "Display compression ratios"
 complete -c gunzip -s V -l version -d "Display version and exit"
diff --git a/share/completions/gzip.fish b/share/completions/gzip.fish
index 468aab2a0..fc83f2eff 100644
--- a/share/completions/gzip.fish
+++ b/share/completions/gzip.fish
@@ -6,7 +6,7 @@ complete -c gzip -s d -l decompress -x -a "
 )
 "
 
-complete -c gzip -s f -l force -d "Overwrite"
+complete -c gzip -s f -l force -d Overwrite
 complete -c gzip -s h -l help -d "Display help and exit"
 complete -c gzip -s l -l list -d "List compression information"
 complete -c gzip -s L -l license -d "Print license"
@@ -14,7 +14,7 @@ complete -c gzip -s n -l no-name -d "Do not save/restore filename"
 complete -c gzip -s N -l name -d "Save/restore filename"
 complete -c gzip -s q -l quiet -d "Suppress warnings"
 complete -c gzip -s r -l recursive -d "Recurse directories"
-complete -c gzip -s S -l suffix -r -d "Suffix"
+complete -c gzip -s S -l suffix -r -d Suffix
 complete -c gzip -s t -l test -d "Check integrity"
 complete -c gzip -s v -l verbose -d "Display compression ratios"
 complete -c gzip -s V -l version -d "Display version and exit"
diff --git a/share/completions/helm.fish b/share/completions/helm.fish
index 8e908b161..90e009a64 100644
--- a/share/completions/helm.fish
+++ b/share/completions/helm.fish
@@ -47,18 +47,18 @@ function __helm_subcommands -a cmd
             echo upgrade\t'Upgrade a release'
             echo verify\t'Verify that a chart has been signed and is valid'
             echo version\t'Print the client/server version information'
-        case 'dependency'
+        case dependency
             echo build\t'Rebuild the charts/ directory'
             echo list\t'List the dependencies for the given chart'
             echo update\t'Update charts/'
-        case 'get'
+        case get
             echo hooks\t'Download all hooks for a named release'
             echo manifest\t'Download the manifest for a named release'
             echo values\t'Download the values file for a named release'
-        case 'inspect'
+        case inspect
             echo chart\t'Show inspect chart'
             echo values\t'Show inspect values'
-        case 'repo'
+        case repo
             echo add\t'Add a chart repository'
             echo index\t'Generate an index file'
             echo list\t'List chart repositories'
@@ -72,7 +72,7 @@ function __helm_kube_contexts
 end
 
 function __helm_kube_namespaces
-    kubectl get namespaces -o name | string replace 'namespace/' ''
+    kubectl get namespaces -o name | string replace namespace/ ''
 end
 
 function __helm_releases
@@ -136,7 +136,7 @@ complete -c helm -n 'not __helm_seen_any_subcommand_from ""' -x -a '(__helm_subc
 complete -c helm -n '__helm_using_command create' -s p -l starter -x -d 'The named Helm starter scaffold'
 
 # helm delete [flags] RELEASE [...]
-complete -c helm -n '__helm_using_command delete' -f -a '(__helm_release_completions)' -d 'Release'
+complete -c helm -n '__helm_using_command delete' -f -a '(__helm_release_completions)' -d Release
 
 complete -c helm -n '__helm_using_command delete' -l dry-run -f -d 'Simulate a delete'
 complete -c helm -n '__helm_using_command delete' -l no-hooks -f -d 'Prevent hooks from running during deletion'
@@ -154,7 +154,7 @@ complete -c helm -n '__helm_using_command dependency update' -l keyring -r -d 'K
 complete -c helm -n '__helm_using_command dependency update' -l verify -f -d 'Verify the packages against signatures'
 
 # helm fetch [flags] [chart URL | repo/chartname] [...]
-complete -c helm -n '__helm_using_command fetch; and not __fish_seen_subcommand_from (__helm_charts)' -f -a '(__helm_charts)' -d 'Chart'
+complete -c helm -n '__helm_using_command fetch; and not __fish_seen_subcommand_from (__helm_charts)' -f -a '(__helm_charts)' -d Chart
 
 complete -c helm -n '__helm_using_command fetch' -s d -l destination -r -d 'Location to write the chart'
 complete -c helm -n '__helm_using_command fetch' -l keyring -r -d 'Keyring containing public keys'
@@ -168,15 +168,15 @@ complete -c helm -n '__helm_using_command fetch' -l version -x -a '(__helm_chart
 complete -c helm -n '__helm_using_command get; and not __helm_seen_any_subcommand_from get' -f -a '(__helm_subcommands get)'
 
 # helm get [flags] RELEASE
-complete -c helm -n '__helm_using_command get' -f -a '(__helm_release_completions)' -d 'Release'
+complete -c helm -n '__helm_using_command get' -f -a '(__helm_release_completions)' -d Release
 
-complete -c helm -n '__helm_using_command get' -l revision -x -a '(__helm_release_revisions)' -d 'Revision'
+complete -c helm -n '__helm_using_command get' -l revision -x -a '(__helm_release_revisions)' -d Revision
 
 # helm get values [flags] RELEASE
 complete -c helm -n '__helm_using_command get values' -s a -l all -f -d 'Dump all (computed) values'
 
 # helm history [flags] RELEASE
-complete -c helm -n '__helm_using_command history' -f -a '(__helm_release_completions)' -d 'Release'
+complete -c helm -n '__helm_using_command history' -f -a '(__helm_release_completions)' -d Release
 
 complete -c helm -n '__helm_using_command history' -l max -x -d 'Maximum number of revision to include in history'
 
@@ -190,20 +190,20 @@ complete -c helm -n '__helm_using_command init' -s i -l tiller-image -x -d 'Over
 complete -c helm -n '__helm_using_command inspect; and not __helm_seen_any_subcommand_from inspect' -f -a '(__helm_subcommands inspect)'
 
 # helm inspect [CHART] [flags]
-complete -c helm -n '__helm_using_command inspect; and not __fish_seen_subcommand_from (__helm_charts)' -a '(__helm_charts)' -d 'Chart'
+complete -c helm -n '__helm_using_command inspect; and not __fish_seen_subcommand_from (__helm_charts)' -a '(__helm_charts)' -d Chart
 
 complete -c helm -n '__helm_using_command inspect' -l keyring -r -d 'Keyring containing public verification keys'
 complete -c helm -n '__helm_using_command inspect' -l verify -f -d 'Verify the provenance data for this chart'
 complete -c helm -n '__helm_using_command inspect' -l version -x -a '(__helm_chart_versions)' -d 'Chart version'
 
 # helm install [CHART] [flags]
-complete -c helm -n '__helm_using_command install; and not __fish_seen_subcommand_from (__helm_charts)' -a '(__helm_charts)' -d 'Chart'
+complete -c helm -n '__helm_using_command install; and not __fish_seen_subcommand_from (__helm_charts)' -a '(__helm_charts)' -d Chart
 
 complete -c helm -n '__helm_using_command install' -l dry-run -f -d 'Simulate an install'
 complete -c helm -n '__helm_using_command install' -l keyring -r -d 'Keyring containing public verification keys'
 complete -c helm -n '__helm_using_command install' -s n -l name -x -d 'Release name'
 complete -c helm -n '__helm_using_command install' -l name-template -r -d 'Specify template used to name the release'
-complete -c helm -n '__helm_using_command install' -l namespace -x -a '(__helm_kube_namespaces)' -d 'Namespace'
+complete -c helm -n '__helm_using_command install' -l namespace -x -a '(__helm_kube_namespaces)' -d Namespace
 complete -c helm -n '__helm_using_command install' -l no-hooks -f -d 'Prevent hooks from running during install'
 complete -c helm -n '__helm_using_command install' -l replace -f -d 'Re-use the given name if already used'
 complete -c helm -n '__helm_using_command install' -l set -x -d 'Set values on the command line'
@@ -243,11 +243,11 @@ complete -c helm -n '__helm_using_command repo index' -l merge -x -d 'Merge the
 complete -c helm -n '__helm_using_command repo index' -l url -x -d 'URL of chart repository'
 
 # helm repo remove [flags] [NAME]
-complete -c helm -n '__helm_using_command repo remove' -f -a '(__helm_repositories)' -d 'Repository'
+complete -c helm -n '__helm_using_command repo remove' -f -a '(__helm_repositories)' -d Repository
 
 # helm rollback [RELEASE] [REVISION] [flags]
-complete -c helm -n '__helm_using_command rollback; and not __fish_seen_subcommand_from (__helm_releases)' -f -a '(__helm_release_completions)' -d 'Release'
-complete -c helm -n '__helm_using_command rollback' -f -a '(__helm_release_revisions)' -d 'Revision'
+complete -c helm -n '__helm_using_command rollback; and not __fish_seen_subcommand_from (__helm_releases)' -f -a '(__helm_release_completions)' -d Release
+complete -c helm -n '__helm_using_command rollback' -f -a '(__helm_release_revisions)' -d Revision
 
 complete -c helm -n '__helm_using_command rollback' -l dry-run -f -d 'Simulate a rollback'
 complete -c helm -n '__helm_using_command rollback' -l no-hooks -f -d 'Prevent hooks from running during rollback'
@@ -261,18 +261,18 @@ complete -c helm -n '__helm_using_command serve' -l address -x -d 'Address to li
 complete -c helm -n '__helm_using_command serve' -l repo-path -r -d 'Path from which to serve charts'
 
 # helm status [flags] RELEASE
-complete -c helm -n '__helm_using_command status' -f -a '(__helm_release_completions)' -d 'Release'
+complete -c helm -n '__helm_using_command status' -f -a '(__helm_release_completions)' -d Release
 
-complete -c helm -n '__helm_using_command status' -l revision -x -a '(__helm_release_revisions)' -d 'Revision'
+complete -c helm -n '__helm_using_command status' -l revision -x -a '(__helm_release_revisions)' -d Revision
 
 # helm upgrade [RELEASE] [CHART] [flags]
-complete -c helm -n '__helm_using_command upgrade; and not __fish_seen_subcommand_from (__helm_releases)' -f -a '(__helm_release_completions)' -d 'Release'
-complete -c helm -n '__helm_using_command upgrade; and __fish_seen_subcommand_from (__helm_releases); and not __fish_seen_subcommand_from (__helm_charts)' -a '(__helm_charts)' -d 'Chart'
+complete -c helm -n '__helm_using_command upgrade; and not __fish_seen_subcommand_from (__helm_releases)' -f -a '(__helm_release_completions)' -d Release
+complete -c helm -n '__helm_using_command upgrade; and __fish_seen_subcommand_from (__helm_releases); and not __fish_seen_subcommand_from (__helm_charts)' -a '(__helm_charts)' -d Chart
 
 complete -c helm -n '__helm_using_command upgrade' -l dry-run -f -d 'Simulate an upgrade'
 complete -c helm -n '__helm_using_command upgrade' -s i -l install -f -d "Run an install if the release don't exists"
 complete -c helm -n '__helm_using_command upgrade' -l keyring -r -d 'Keyring containing public keys'
-complete -c helm -n '__helm_using_command upgrade' -l namespace -x -a '(__helm_kube_namespaces)' -d 'Namespace'
+complete -c helm -n '__helm_using_command upgrade' -l namespace -x -a '(__helm_kube_namespaces)' -d Namespace
 complete -c helm -n '__helm_using_command upgrade' -l no-hooks -f -d 'Disable pre/post upgrade hooks'
 complete -c helm -n '__helm_using_command upgrade' -l set -x -d 'Set values on the command line'
 complete -c helm -n '__helm_using_command upgrade' -s f -l values -r -d 'Specify values in a YAML file'
diff --git a/share/completions/help.fish b/share/completions/help.fish
index a262eeeb1..040ef38d3 100644
--- a/share/completions/help.fish
+++ b/share/completions/help.fish
@@ -6,7 +6,7 @@ end
 # This was semi-automated with `grep 'class="anchor"' -A1 /usr/share/doc/fish/index.html
 # It's not fully automated since that requires parsing html with regex,
 # and since this is by definition in sync - we ship the html, and we ship these completions.
-complete -c help -x -a autosuggestions -d 'Autosuggestions'
+complete -c help -x -a autosuggestions -d Autosuggestions
 complete -c help -x -a builtin-overview -d 'Builtin commands'
 complete -c help -x -a cartesian-product -d 'Cartesian Products'
 complete -c help -x -a color -d 'Setting syntax highlighting colors'
@@ -16,7 +16,7 @@ complete -c help -x -a completion-func -d 'Useful functions for writing completi
 complete -c help -x -a completion-own -d 'Writing your own completions'
 complete -c help -x -a completion-path -d 'Where to put completions'
 complete -c help -x -a debugging -d 'Debugging fish scripts'
-complete -c help -x -a docs -d 'Help'
+complete -c help -x -a docs -d Help
 complete -c help -x -a editor -d 'Command line editor'
 complete -c help -x -a emacs-mode -d 'Emacs mode commands'
 complete -c help -x -a escapes -d 'Escaping characters'
@@ -37,28 +37,28 @@ complete -c help -x -a history -d 'Help on how to reuse previously entered comma
 complete -c help -x -a history-search -d 'Searchable history'
 complete -c help -x -a identifiers -d 'Shell variable and function names'
 complete -c help -x -a initialization -d 'Initialization files'
-complete -c help -x -a introduction -d 'Introduction'
+complete -c help -x -a introduction -d Introduction
 complete -c help -x -a job-control -d 'Running multiple programs'
 complete -c help -x -a killring -d 'Copy and paste (Kill Ring)'
 complete -c help -x -a more-help -d 'Further help and development'
 complete -c help -x -a multiline -d 'Multiline editing'
 complete -c help -x -a other -d 'Other features'
-complete -c help -x -a piping -d 'Piping'
+complete -c help -x -a piping -d Piping
 complete -c help -x -a prompt -d 'Programmable prompt'
-complete -c help -x -a quotes -d 'Quotes'
+complete -c help -x -a quotes -d Quotes
 complete -c help -x -a redirects -d 'Input/Output (IO) redirection'
 complete -c help -x -a shared-binds -d 'Shared bindings'
 complete -c help -x -a syntax -d 'Introduction to the fish syntax'
 complete -c help -x -a syntax-background -d 'Background jobs'
 complete -c help -x -a syntax-conditional -d 'Conditional execution of code and flow control'
-complete -c help -x -a syntax-function -d 'Functions'
+complete -c help -x -a syntax-function -d Functions
 complete -c help -x -a syntax-function-autoloading -d 'Autoloading functions'
 complete -c help -x -a syntax-function-wrappers -d 'Defining aliases'
 complete -c help -x -a syntax-job-control -d 'Job control'
 complete -c help -x -a syntax-words -d 'Some common words'
 complete -c help -x -a title -d 'Programmable title'
 complete -c help -x -a variables -d 'Shell variables'
-complete -c help -x -a variables-arrays -d 'Arrays'
+complete -c help -x -a variables-arrays -d Arrays
 complete -c help -x -a variables-color -d 'Variables for changing highlighting colors'
 complete -c help -x -a variables-export -d 'Exporting variables'
 complete -c help -x -a variables-functions -d 'Variable scope for functions'
@@ -73,29 +73,29 @@ complete -c help -x -a vi-mode-insert -d 'Insert mode'
 complete -c help -x -a vi-mode-visual -d 'Visual mode'
 
 # Tutorial
-complete -c help -x -a tutorial -d 'Tutorial'
+complete -c help -x -a tutorial -d Tutorial
 complete -c help -x -a tut_autoload -d 'Autoloading Functions'
-complete -c help -x -a tut_autosuggestions -d 'Autosuggestions'
+complete -c help -x -a tut_autosuggestions -d Autosuggestions
 complete -c help -x -a tut_combiners -d 'Combiners (And, Or, Not)'
 complete -c help -x -a tut_command_substitutions -d 'Command Substitutions'
 complete -c help -x -a tut_conditionals -d 'Conditionals (If, Else, Switch)'
 complete -c help -x -a tut_exit_status -d 'Exit Status'
 complete -c help -x -a tut_exports -d 'Exports (Shell Variables)'
-complete -c help -x -a tut_functions -d 'Functions'
+complete -c help -x -a tut_functions -d Functions
 complete -c help -x -a tut_getting_help -d 'Getting Help'
 complete -c help -x -a tut_learning_Fish -d 'Learning fish'
-complete -c help -x -a tut_lists -d 'Lists'
-complete -c help -x -a tut_loops -d 'Loops'
+complete -c help -x -a tut_lists -d Lists
+complete -c help -x -a tut_loops -d Loops
 complete -c help -x -a tut_more -d 'Ready for more?'
 complete -c help -x -a tut_path -d '$PATH'
 complete -c help -x -a tut_pipes_and_redirections -d 'Pipes and Redirections'
-complete -c help -x -a tut_prompt -d 'Prompt'
+complete -c help -x -a tut_prompt -d Prompt
 complete -c help -x -a tut_running_commands -d 'Running Commands'
 complete -c help -x -a tut_semicolon -d 'Separating Commands (Semicolon)'
 complete -c help -x -a tut_startup -d "Startup (Where's .bashrc?)"
 complete -c help -x -a tut_syntax_highlighting -d 'Syntax Highlighting'
 complete -c help -x -a tut_tab_completions -d 'Tab Completions'
 complete -c help -x -a tut_universal -d 'Universal Variables'
-complete -c help -x -a tut_variables -d 'Variables'
+complete -c help -x -a tut_variables -d Variables
 complete -c help -x -a tut_why_fish -d 'Why fish?'
-complete -c help -x -a tut_wildcards -d 'Wildcards'
+complete -c help -x -a tut_wildcards -d Wildcards
diff --git a/share/completions/heroku.fish b/share/completions/heroku.fish
index fba361414..4284cdd3a 100644
--- a/share/completions/heroku.fish
+++ b/share/completions/heroku.fish
@@ -47,7 +47,7 @@ function __fish_heroku_using_command
     return 1
 end
 
-set -l heroku_looking -c heroku -n '__fish_heroku_needs_command'
+set -l heroku_looking -c heroku -n __fish_heroku_needs_command
 
 # Main commands
 complete $heroku_looking -xa addons -d 'list installed addons'
diff --git a/share/completions/hg.fish b/share/completions/hg.fish
index 3bafe3832..673ddf859 100644
--- a/share/completions/hg.fish
+++ b/share/completions/hg.fish
@@ -399,7 +399,7 @@ complete -c hg -l color -x -a "true false always auto never debug" -d "when to c
 complete -c hg -l pager -x -a "true false always auto never" -d "when to paginate"
 
 # subcommands
-complete -c hg -n "__fish_hg_needs_command" -x -a "(__fish_hg_commands)"
+complete -c hg -n __fish_hg_needs_command -x -a "(__fish_hg_commands)"
 
 # hg add
 complete -c hg -n "__fish_hg_using_command add" -f -a "(__fish_hg_status -u)"
@@ -486,7 +486,7 @@ end
 # hg bookmarks
 for cmd in bo boo book bookm bookma bookmar bookmark bookmarks
     complete -c hg -n "__fish_hg_using_command $cmd" -f -a "(__fish_hg_bookmarks)"
-    complete -c hg -n "__fish_hg_using_command $cmd" -s f -l force -d "force"
+    complete -c hg -n "__fish_hg_using_command $cmd" -s f -l force -d force
     complete -c hg -n "__fish_hg_using_command $cmd" -s r -l rev -x -a "(__fish_hg_labels)" -d "revision for bookmark action"
     complete -c hg -n "__fish_hg_using_command $cmd" -s d -l delete -d "delete a given bookmark"
     complete -c hg -n "__fish_hg_using_command $cmd" -s m -l rename -x -a "(__fish_hg_bookmarks)" -d "rename a given bookmark"
@@ -604,7 +604,7 @@ end
 # hg diff
 for cmd in d di dif diff
     complete -c hg -n "__fish_hg_using_command $cmd" -f -a "(__fish_hg_status -amr)"
-    complete -c hg -n "__fish_hg_using_command $cmd" -s r -l rev -x -a "(__fish_hg_labels)" -d "revision"
+    complete -c hg -n "__fish_hg_using_command $cmd" -s r -l rev -x -a "(__fish_hg_labels)" -d revision
     complete -c hg -n "__fish_hg_using_command $cmd" -s c -l change -x -a "(__fish_hg_labels)" -d "change made by revision"
     complete -c hg -n "__fish_hg_using_command $cmd" -s a -l text -d "treat all files as text"
     complete -c hg -n "__fish_hg_using_command $cmd" -s g -l git -d "use git extended diff format"
@@ -1388,7 +1388,7 @@ for cmd in up upd upda updat update che chec check checko checkou checkout co
     complete -c hg -n "__fish_hg_using_command $cmd" -s c -l check -d "require clean working directory"
     complete -c hg -n "__fish_hg_using_command $cmd" -s m -l merge -d "merge uncommitted changes"
     complete -c hg -n "__fish_hg_using_command $cmd" -s d -l date -x -d "tipmost revision matching date"
-    complete -c hg -n "__fish_hg_using_command $cmd" -s r -l rev -x -a "(__fish_hg_labels)" -d "revision"
+    complete -c hg -n "__fish_hg_using_command $cmd" -s r -l rev -x -a "(__fish_hg_labels)" -d revision
     complete -c hg -n "__fish_hg_using_command $cmd" -s t -l tool -x -a "(__fish_hg_merge_tools)" -d "specify merge tool"
     complete -c hg -n "__fish_hg_using_command $cmd; and __fish_hg_mq_enabled" -l mq -d "operate on patch repository"
 end
diff --git a/share/completions/hjson.fish b/share/completions/hjson.fish
index 8ed109ae2..ae7907fd8 100644
--- a/share/completions/hjson.fish
+++ b/share/completions/hjson.fish
@@ -1,14 +1,14 @@
-complete -c hjson -n '__fish_should_complete_switches' -s j -l json -d "output formatted json"
-complete -c hjson -n '__fish_should_complete_switches' -s c -l compact -d "output condensed json"
+complete -c hjson -n __fish_should_complete_switches -s j -l json -d "output formatted json"
+complete -c hjson -n __fish_should_complete_switches -s c -l compact -d "output condensed json"
 
 # these are "old-style" arguments so using `__fish_should_complete_switches` is needed
 # to prevent completing them by default as regular arguments.
-complete -c hjson -n '__fish_should_complete_switches' -a "-sl" -d "output the opening brace on the same line"
-complete -c hjson -n '__fish_should_complete_switches' -a "-quote" -d "quote all strings"
-complete -c hjson -n '__fish_should_complete_switches' -a "-quote=all" -d "quote all strings and keys"
-complete -c hjson -n '__fish_should_complete_switches' -a "-js" -d "output in JSON-compatible format"
-complete -c hjson -n '__fish_should_complete_switches' -a "-rt" -d "round trip comments"
-complete -c hjson -n '__fish_should_complete_switches' -a "-nocol" -d "disable color output"
-complete -c hjson -n '__fish_should_complete_switches' -a "-cond=" -d "set condense option [default 60]"
+complete -c hjson -n __fish_should_complete_switches -a -sl -d "output the opening brace on the same line"
+complete -c hjson -n __fish_should_complete_switches -a -quote -d "quote all strings"
+complete -c hjson -n __fish_should_complete_switches -a "-quote=all" -d "quote all strings and keys"
+complete -c hjson -n __fish_should_complete_switches -a -js -d "output in JSON-compatible format"
+complete -c hjson -n __fish_should_complete_switches -a -rt -d "round trip comments"
+complete -c hjson -n __fish_should_complete_switches -a -nocol -d "disable color output"
+complete -c hjson -n __fish_should_complete_switches -a "-cond=" -d "set condense option [default 60]"
 
 complete -c hjson -k -xa "(__fish_complete_suffix .hjson; __fish_complete_suffix .json)"
diff --git a/share/completions/hledger.fish b/share/completions/hledger.fish
index be74055d9..c6b2e371d 100644
--- a/share/completions/hledger.fish
+++ b/share/completions/hledger.fish
@@ -55,32 +55,32 @@ complete -c hledger -x -l version -d 'Show version information'
 # Commands
 
 # Data entry
-complete -c hledger -f -n '__fish_use_subcommand' -a add -d 'Add transactions using guided prompts'
+complete -c hledger -f -n __fish_use_subcommand -a add -d 'Add transactions using guided prompts'
 complete -c hledger -f -n '__fish_seen_subcommand_from add' -l no-new-accounts -d 'Don’t allow creating new accounts'
 
-complete -c hledger -n '__fish_use_subcommand' -a import -d 'Add new transactions from other files'
+complete -c hledger -n __fish_use_subcommand -a import -d 'Add new transactions from other files'
 complete -c hledger -f -n '__fish_seen_subcommand_from import' -l dry-run -d 'Just show the transactions to be imported'
 
 # Data management
-complete -c hledger -f -n '__fish_use_subcommand' -a check-dates -d 'Ensure transactions are ordered by date'
+complete -c hledger -f -n __fish_use_subcommand -a check-dates -d 'Ensure transactions are ordered by date'
 complete -c hledger -f -n '__fish_seen_subcommand_from check-dates' -l strict -d 'Makes date comparing strict'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a check-dupes -d 'Ensure accounts have different leaf names'
+complete -c hledger -f -n __fish_use_subcommand -a check-dupes -d 'Ensure accounts have different leaf names'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a 'close equity' -d 'Generate balance-resetting transactions'
+complete -c hledger -f -n __fish_use_subcommand -a 'close equity' -d 'Generate balance-resetting transactions'
 complete -c hledger -f -n '__fish_seen_subcommand_from close' -l opening -d 'Show just opening transaction'
 complete -c hledger -f -n '__fish_seen_subcommand_from close' -l closing -d 'Show just closing transaction'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a rewrite -d 'Generate automated postings/diffs'
+complete -c hledger -f -n __fish_use_subcommand -a rewrite -d 'Generate automated postings/diffs'
 complete -c hledger -f -n '__fish_seen_subcommand_from rewrite' -l add-posting -d 'Add a posting to account'
 complete -c hledger -f -n '__fish_seen_subcommand_from rewrite' -l diff -d 'Generate diff suitable for patch(1)'
 
 # Financial reports
 set -l financial_reports_commands 'balancesheet bs balancesheetequity bse cashflow cf incomestatement is' # these four (but not roi!) use the same commands
-complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheet       bs' -d 'Show assets, liabilities, and net worth'
-complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheetequity bse' -d 'Show assets, liabilities, and equity'
-complete -c hledger -f -n '__fish_use_subcommand' -a 'cashflow           cf' -d 'Show changes in liquid assets'
-complete -c hledger -f -n '__fish_use_subcommand' -a 'incomestatement    is' -d 'Show revenues and expenses'
+complete -c hledger -f -n __fish_use_subcommand -a 'balancesheet       bs' -d 'Show assets, liabilities, and net worth'
+complete -c hledger -f -n __fish_use_subcommand -a 'balancesheetequity bse' -d 'Show assets, liabilities, and equity'
+complete -c hledger -f -n __fish_use_subcommand -a 'cashflow           cf' -d 'Show changes in liquid assets'
+complete -c hledger -f -n __fish_use_subcommand -a 'incomestatement    is' -d 'Show revenues and expenses'
 complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l change -d 'Show balance change in each period'
 complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l cumulative -d 'Show balance change accumulated across periods'
 complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s H -l historical -d 'Show historical ending balance in each period'
@@ -97,22 +97,22 @@ complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_comman
 complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s O -l output-format -a 'txt csv html' -d 'Select an output format'
 complete -c hledger -r -n "__fish_seen_subcommand_from $financial_reports_commands" -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a roi -d 'Show return on investments'
+complete -c hledger -f -n __fish_use_subcommand -a roi -d 'Show return on investments'
 complete -c hledger -f -n '__fish_seen_subcommand_from roi' -l cashflow -d 'Show all amounts that were used to compute returns'
 complete -c hledger -x -n '__fish_seen_subcommand_from roi' -l investment -d 'Query to select investment transactions'
 complete -c hledger -x -n '__fish_seen_subcommand_from roi' -l profit-loss -l pnl -d 'Query to select profit-and-loss or appreciation/valuation transactions'
 
 # Low-level reports
-complete -c hledger -f -n '__fish_use_subcommand' -a accounts -d 'Show account names'
+complete -c hledger -f -n __fish_use_subcommand -a accounts -d 'Show account names'
 complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l declared -d 'Show account names declared with account directives'
 complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l used -d 'Show account names referenced by transactions'
 complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l tree -d 'Show short account names as a tree'
 complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l flat -d 'Show short account names as a list'
 complete -c hledger -x -n '__fish_seen_subcommand_from accounts' -l drop -d 'Omit N leading account name parts in flat mode'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a activity -d 'Show postings-per-interval bar charts'
+complete -c hledger -f -n __fish_use_subcommand -a activity -d 'Show postings-per-interval bar charts'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a balance -d 'Show balance changes/end balances/budgets in accounts'
+complete -c hledger -f -n __fish_use_subcommand -a balance -d 'Show balance changes/end balances/budgets in accounts'
 complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l change -d 'Show balance change in each period'
 complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l cumulative -d 'Show balance change accumulated across periods'
 complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s H -l historical -d 'Show historical ending balance in each period'
@@ -132,23 +132,23 @@ complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l transpose -d
 complete -c hledger -x -n '__fish_seen_subcommand_from balance' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
 complete -c hledger -r -n '__fish_seen_subcommand_from balance' -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a commodities -d 'Show commodity/currency symbols'
+complete -c hledger -f -n __fish_use_subcommand -a commodities -d 'Show commodity/currency symbols'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a files -d 'Show input file paths'
+complete -c hledger -f -n __fish_use_subcommand -a files -d 'Show input file paths'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a prices -d 'Show market-price records'
+complete -c hledger -f -n __fish_use_subcommand -a prices -d 'Show market-price records'
 complete -c hledger -f -n '__fish_seen_subcommand_from prices' -l costs -d 'Print transaction prices from postings'
 complete -c hledger -f -n '__fish_seen_subcommand_from prices' -l inverted-costs -d 'Print transaction inverted prices from postings also'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a 'print txns' -d 'Show transactions'
-complete -c hledger -f -n '__fish_use_subcommand' -a 'print-unique' -d 'Show only transactions with unique descriptions'
+complete -c hledger -f -n __fish_use_subcommand -a 'print txns' -d 'Show transactions'
+complete -c hledger -f -n __fish_use_subcommand -a print-unique -d 'Show only transactions with unique descriptions'
 complete -c hledger -x -n '__fish_seen_subcommand_from print txns print-unique' -s m -l match -d 'Show the most-recent transaction most similar to STR'
 complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique' -s x -l explicit -d 'Show all amounts explicitly'
 complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique' -l new -d 'Show only newer-dated transactions added in each file since last run'
 complete -c hledger -x -n '__fish_seen_subcommand_from print txns print-unique' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
 complete -c hledger -r -n '__fish_seen_subcommand_from print txns print-unique' -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a register -d 'Show postings in one or more accounts & running total'
+complete -c hledger -f -n __fish_use_subcommand -a register -d 'Show postings in one or more accounts & running total'
 complete -c hledger -f -n '__fish_seen_subcommand_from register' -l cumulative -d 'Show running total from report start date'
 complete -c hledger -f -n '__fish_seen_subcommand_from register' -s H -l historical -d 'Show historical running total/balance'
 complete -c hledger -f -n '__fish_seen_subcommand_from register' -s A -l average -d 'Show running average of posting amounts instead of total (implies --empty)'
@@ -158,14 +158,14 @@ complete -c hledger -x -n '__fish_seen_subcommand_from register' -s w -l width -
 complete -c hledger -x -n '__fish_seen_subcommand_from register' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
 complete -c hledger -r -n '__fish_seen_subcommand_from register' -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a register-match -d 'Show a recent posting that best matches a description'
+complete -c hledger -f -n __fish_use_subcommand -a register-match -d 'Show a recent posting that best matches a description'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a stats -d 'Show journal statistics'
+complete -c hledger -f -n __fish_use_subcommand -a stats -d 'Show journal statistics'
 complete -c hledger -r -n '__fish_seen_subcommand_from stats' -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a tags -d 'Show tag names'
+complete -c hledger -f -n __fish_use_subcommand -a tags -d 'Show tag names'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a test -d 'Run self-tests'
+complete -c hledger -f -n __fish_use_subcommand -a test -d 'Run self-tests'
 
 # Help
-complete -c hledger -f -n '__fish_use_subcommand' -a help -d 'Show hledger manual list'
+complete -c hledger -f -n __fish_use_subcommand -a help -d 'Show hledger manual list'
diff --git a/share/completions/hugo.fish b/share/completions/hugo.fish
index db993bd54..b901d9e4f 100644
--- a/share/completions/hugo.fish
+++ b/share/completions/hugo.fish
@@ -12,7 +12,7 @@ function __fish_hugo_command
             set skip 1
         else
             switch $token
-                case "--config" "--logFile"
+                case --config --logFile
                     set skip 0
                 case "-*"
                 case "*"
@@ -50,38 +50,38 @@ complete -c hugo -l verboseLog -f -d "Verbose logging"
 
 # Main-like commands
 
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s b -l baseURL -r -d "Hostname and path to the root"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s B -l buildDrafts -f -d "Include content marked as draft"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s E -l buildExpired -f -d "Include expired content"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s F -l buildFuture -f -d "Include content with publishdate in the future"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l cacheDir -f -a "(__fish_complete_directories (commandline -ct) 'Cache directory')" -d "Cache directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l canonifyURLs -f -d "Canonicalize all relative URLs using baseurl"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l cleanDestinationDir -f -d "Remove files from destination not found in static directories"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s c -l contentDir -f -a "(__fish_complete_directories (commandline -ct) 'Content directory')" -d "Content directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s d -l destination -f -a "(__fish_complete_directories (commandline -ct) 'Destination directory')" -d "Destination directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l disable404 -f -d "Do not build 404 page"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l disableKinds -r -d "Disable different kinds of pages"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l disableRSS -f -d "Do not build RSS files"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l disableSitemap -f -d "Do not build sitemap files"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l enableGitInfo -f -d "Add Git revision, date and author info to the pages"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l forceSyncStatic -f -d "Copy all files when static is changed"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s h -l help -f -d "Help for hugo"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l i18n-warnings -f -d "Print missing translations"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l ignoreCache -f -d "Ignore the cache directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s l -l layoutDir -f -a "(__fish_complete_directories (commandline -ct) 'Layout directory')" -d "Layout directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l noChmod -f -d "Do not sync permission mode of files"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l noTimes -f -d "Do not sync modification time of files"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l pluralizeListTitles -f -d "Pluralize titles in lists using inflect"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l preserveTaxonomyNames -f -d "Preserve taxonomy names as written"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l renderToMemory -f -d "Render to memory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s s -l source -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l stepAnalysis -f -d "Display memory and timing of different steps of the program"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l templateMetrics -f -d "Display metrics about template executions"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l templateMetricsHints -f -d "Calculate some improvement hints when combined with --templateMetrics"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s t -l theme -r -d "Theme to use"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l themesDir -f -a "(__fish_complete_directories (commandline -ct) 'Themes directory')" -d "Themes directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -l uglyURLs -f -d "Use /filename.html instead of /filename/"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s w -l watch -f -d "Watch filesystem for changes and recreate as needed"
+complete -c hugo -n __fish_hugo_using_main_like_command -s b -l baseURL -r -d "Hostname and path to the root"
+complete -c hugo -n __fish_hugo_using_main_like_command -s B -l buildDrafts -f -d "Include content marked as draft"
+complete -c hugo -n __fish_hugo_using_main_like_command -s E -l buildExpired -f -d "Include expired content"
+complete -c hugo -n __fish_hugo_using_main_like_command -s F -l buildFuture -f -d "Include content with publishdate in the future"
+complete -c hugo -n __fish_hugo_using_main_like_command -l cacheDir -f -a "(__fish_complete_directories (commandline -ct) 'Cache directory')" -d "Cache directory"
+complete -c hugo -n __fish_hugo_using_main_like_command -l canonifyURLs -f -d "Canonicalize all relative URLs using baseurl"
+complete -c hugo -n __fish_hugo_using_main_like_command -l cleanDestinationDir -f -d "Remove files from destination not found in static directories"
+complete -c hugo -n __fish_hugo_using_main_like_command -s c -l contentDir -f -a "(__fish_complete_directories (commandline -ct) 'Content directory')" -d "Content directory"
+complete -c hugo -n __fish_hugo_using_main_like_command -s d -l destination -f -a "(__fish_complete_directories (commandline -ct) 'Destination directory')" -d "Destination directory"
+complete -c hugo -n __fish_hugo_using_main_like_command -l disable404 -f -d "Do not build 404 page"
+complete -c hugo -n __fish_hugo_using_main_like_command -l disableKinds -r -d "Disable different kinds of pages"
+complete -c hugo -n __fish_hugo_using_main_like_command -l disableRSS -f -d "Do not build RSS files"
+complete -c hugo -n __fish_hugo_using_main_like_command -l disableSitemap -f -d "Do not build sitemap files"
+complete -c hugo -n __fish_hugo_using_main_like_command -l enableGitInfo -f -d "Add Git revision, date and author info to the pages"
+complete -c hugo -n __fish_hugo_using_main_like_command -l forceSyncStatic -f -d "Copy all files when static is changed"
+complete -c hugo -n __fish_hugo_using_main_like_command -s h -l help -f -d "Help for hugo"
+complete -c hugo -n __fish_hugo_using_main_like_command -l i18n-warnings -f -d "Print missing translations"
+complete -c hugo -n __fish_hugo_using_main_like_command -l ignoreCache -f -d "Ignore the cache directory"
+complete -c hugo -n __fish_hugo_using_main_like_command -s l -l layoutDir -f -a "(__fish_complete_directories (commandline -ct) 'Layout directory')" -d "Layout directory"
+complete -c hugo -n __fish_hugo_using_main_like_command -l noChmod -f -d "Do not sync permission mode of files"
+complete -c hugo -n __fish_hugo_using_main_like_command -l noTimes -f -d "Do not sync modification time of files"
+complete -c hugo -n __fish_hugo_using_main_like_command -l pluralizeListTitles -f -d "Pluralize titles in lists using inflect"
+complete -c hugo -n __fish_hugo_using_main_like_command -l preserveTaxonomyNames -f -d "Preserve taxonomy names as written"
+complete -c hugo -n __fish_hugo_using_main_like_command -l renderToMemory -f -d "Render to memory"
+complete -c hugo -n __fish_hugo_using_main_like_command -s s -l source -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
+complete -c hugo -n __fish_hugo_using_main_like_command -l stepAnalysis -f -d "Display memory and timing of different steps of the program"
+complete -c hugo -n __fish_hugo_using_main_like_command -l templateMetrics -f -d "Display metrics about template executions"
+complete -c hugo -n __fish_hugo_using_main_like_command -l templateMetricsHints -f -d "Calculate some improvement hints when combined with --templateMetrics"
+complete -c hugo -n __fish_hugo_using_main_like_command -s t -l theme -r -d "Theme to use"
+complete -c hugo -n __fish_hugo_using_main_like_command -l themesDir -f -a "(__fish_complete_directories (commandline -ct) 'Themes directory')" -d "Themes directory"
+complete -c hugo -n __fish_hugo_using_main_like_command -l uglyURLs -f -d "Use /filename.html instead of /filename/"
+complete -c hugo -n __fish_hugo_using_main_like_command -s w -l watch -f -d "Watch filesystem for changes and recreate as needed"
 
 # Commands
 
diff --git a/share/completions/ifdown.fish b/share/completions/ifdown.fish
index cec7535e8..a89f32f85 100644
--- a/share/completions/ifdown.fish
+++ b/share/completions/ifdown.fish
@@ -1,2 +1,2 @@
 complete -x -c ifdown -a "(__fish_print_interfaces)" -d "Network interface"
-complete -c ifdown -l force -d "force"
+complete -c ifdown -l force -d force
diff --git a/share/completions/ifup.fish b/share/completions/ifup.fish
index fb74d9218..0d36a5214 100644
--- a/share/completions/ifup.fish
+++ b/share/completions/ifup.fish
@@ -1,2 +1,2 @@
 complete -x -c ifup -a "(__fish_print_interfaces)" -d "Network interface"
-complete -c ifup -l force -d "force"
+complete -c ifup -l force -d force
diff --git a/share/completions/invoke-rc.d.fish b/share/completions/invoke-rc.d.fish
index f3c50ff5a..2f893cebb 100644
--- a/share/completions/invoke-rc.d.fish
+++ b/share/completions/invoke-rc.d.fish
@@ -16,9 +16,9 @@ function __fish_invoke_rcd_has_service
 end
 
 complete -f -c invoke-rc.d -n 'not __fish_invoke_rcd_has_service' -a '(__fish_print_debian_services)'
-complete -f -c invoke-rc.d -n '__fish_invoke_rcd_has_service' -a 'start' -d 'Start the service'
-complete -f -c invoke-rc.d -n '__fish_invoke_rcd_has_service' -a 'stop' -d 'Stop the service'
-complete -f -c invoke-rc.d -n '__fish_invoke_rcd_has_service' -a 'restart' -d 'Restart the service'
-complete -f -c invoke-rc.d -n '__fish_invoke_rcd_has_service' -a 'reload' -d 'Reload Configuration'
-complete -f -c invoke-rc.d -n '__fish_invoke_rcd_has_service' -a 'force-reload' -d 'Force reloading configuration'
-complete -f -c invoke-rc.d -n '__fish_invoke_rcd_has_service' -a 'status' -d 'Print the status of the service'
+complete -f -c invoke-rc.d -n __fish_invoke_rcd_has_service -a start -d 'Start the service'
+complete -f -c invoke-rc.d -n __fish_invoke_rcd_has_service -a stop -d 'Stop the service'
+complete -f -c invoke-rc.d -n __fish_invoke_rcd_has_service -a restart -d 'Restart the service'
+complete -f -c invoke-rc.d -n __fish_invoke_rcd_has_service -a reload -d 'Reload Configuration'
+complete -f -c invoke-rc.d -n __fish_invoke_rcd_has_service -a force-reload -d 'Force reloading configuration'
+complete -f -c invoke-rc.d -n __fish_invoke_rcd_has_service -a status -d 'Print the status of the service'
diff --git a/share/completions/ip.fish b/share/completions/ip.fish
index 219f1966a..9a4a548d2 100644
--- a/share/completions/ip.fish
+++ b/share/completions/ip.fish
@@ -151,7 +151,7 @@ function __fish_ip_commandwords
                 else
                     echo $word
                 end
-            case '-n' '-netns' '--netns'
+            case -n -netns --netns
                 if test $have_command = 0
                     set skip 1
                 else
@@ -177,7 +177,7 @@ end
 
 function __fish_ip_device
     ip -o link show | while read a b c
-        printf '%s\t%s\n' (string replace ':' '' -- $b) "Device"
+        printf '%s\t%s\n' (string replace ':' '' -- $b) Device
     end
 end
 
diff --git a/share/completions/ipset.fish b/share/completions/ipset.fish
index 294665120..5b6c114d8 100644
--- a/share/completions/ipset.fish
+++ b/share/completions/ipset.fish
@@ -19,21 +19,21 @@ function __fish_ipset_list_sets
     end
 end
 
-complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'create' -d 'Create a set identified with SETNAME'
-complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'add' -d 'Add a given entry to a SET'
-complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'del' -d 'Delete an entry from a SET'
-complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'test' -d 'Test whether an entry is in a set'
-complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'x' -d 'Destroy the specified set or all sets'
-complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'destroy' -d 'Destroy the specified set or all sets'
-complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'list' -d 'a'
+complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a create -d 'Create a set identified with SETNAME'
+complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a add -d 'Add a given entry to a SET'
+complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a del -d 'Delete an entry from a SET'
+complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a test -d 'Test whether an entry is in a set'
+complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a x -d 'Destroy the specified set or all sets'
+complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a destroy -d 'Destroy the specified set or all sets'
+complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a list -d a
 
 complete -c ipset --no-files --condition __fish_ipset_needs_setname -a '(__fish_ipset_list_sets)'
 
-complete -c ipset --no-files -s ! -o 'exist' -d 'Ignore errors'
-complete -c ipset --no-files -s 'o' -o 'output' -a 'plain save xml' -d 'Output format to the list command'
-complete -c ipset --no-files -s 'q' -o 'quiet' -d 'Suppress any output'
-complete -c ipset --no-files -s 'r' -o 'resolve' -d 'Enforce name lookup'
+complete -c ipset --no-files -s ! -o exist -d 'Ignore errors'
+complete -c ipset --no-files -s o -o output -a 'plain save xml' -d 'Output format to the list command'
+complete -c ipset --no-files -s q -o quiet -d 'Suppress any output'
+complete -c ipset --no-files -s r -o resolve -d 'Enforce name lookup'
 # complete -c ipset --no-files -s 's' -o 'sorted' -d 'Sorted output (not supported yet)'
-complete -c ipset --no-files -s 'n' -o 'name' -d 'List just the names of the sets'
-complete -c ipset --no-files -s 't' -o 'terse' -d 'List the set names and headers'
-complete -c ipset --no-files -s 'f' -o 'file' -d 'Filename instead of stdout'
+complete -c ipset --no-files -s n -o name -d 'List just the names of the sets'
+complete -c ipset --no-files -s t -o terse -d 'List the set names and headers'
+complete -c ipset --no-files -s f -o file -d 'Filename instead of stdout'
diff --git a/share/completions/iptables.fish b/share/completions/iptables.fish
index e447b0feb..0e9acf579 100644
--- a/share/completions/iptables.fish
+++ b/share/completions/iptables.fish
@@ -7,7 +7,7 @@ function __fish_iptables_current_table
             case "--table=*"
                 echo (string split -m1 = -- $token)[2]
                 return 0
-            case "--table"
+            case --table
                 set next_is_table 0
             case "-*t*"
                 set next_is_table 0
@@ -45,24 +45,24 @@ function __fish_iptables_chains
     set -l forward "FORWARD	For packets being routed through"
     set -l postrouting "POSTROUTING	For packets that are about to go out"
     switch $table
-        case "filter"
+        case filter
             echo $input
             echo $forward
             echo $output
-        case "nat"
+        case nat
             echo $prerouting
             echo $output
             echo $postrouting
-        case "mangle"
+        case mangle
             echo $prerouting
             echo $input
             echo $output
             echo $forward
             echo $postrouting
-        case "raw"
+        case raw
             echo $prerouting
             echo $output
-        case "security"
+        case security
             echo $input
             echo $output
             echo $forward
@@ -90,9 +90,9 @@ end
 
 # A target is a user-defined chain, one of "ACCEPT DROP RETURN" or an extension (TODO)
 function __fish_iptables_targets
-    echo "ACCEPT"
-    echo "DROP"
-    echo "RETURN"
+    echo ACCEPT
+    echo DROP
+    echo RETURN
     __fish_iptables_chains
 end
 
@@ -106,8 +106,8 @@ complete -c iptables -n '__fish_contains_opt -s A -s C -s D append check delete;
 '(__fish_iptables_targets)'
 
 complete -c iptables -n '__fish_contains_opt -s A -s C -s D append check delete; and __fish_iptables_has_chain' -s m -l match -d 'Specify a match to use' -f
-complete -c iptables -n '__fish_iptables_has_chain' -a 'ACCEPT DROP RETURN' -f
-complete -c iptables -n '__fish_iptables_has_chain' -a '( __fish_iptables_user_chains)' -f
+complete -c iptables -n __fish_iptables_has_chain -a 'ACCEPT DROP RETURN' -f
+complete -c iptables -n __fish_iptables_has_chain -a '( __fish_iptables_user_chains)' -f
 complete -c iptables -s I -l insert -d 'Insert rules in the beginning of a chain' -a '(__fish_iptables_chains)' -f
 complete -c iptables -s R -l replace -d 'Replace a rule in a chain' -a '(__fish_iptables_chains)' -f
 complete -c iptables -s L -l list -d 'List all rules in a chain' -a '(__fish_iptables_chains)' -f
@@ -118,7 +118,7 @@ complete -c iptables -s N -l new-chain -d 'Create a new user-defined chain by th
 complete -c iptables -s X -l delete-chain -d 'Delete the optional user-defined chain specified' -a '(__fish_iptables_chains)' -f
 complete -c iptables -s P -l policy -d 'Set the policy for the chain to the given target' -a '(__fish_iptables_chains)' -f
 complete -c iptables -s E -l rename-chain -d 'Rename the user specified chain to the user supplied name' -a '(__fish_iptables_chains)' -f
-complete -c iptables -s h -d 'Help' -f
+complete -c iptables -s h -d Help -f
 
 complete -c iptables -s p -l protocol -d 'The protocol of the rule or of the packet to check' -f
 complete -c iptables -s s -l source -d 'Source specification' -f
diff --git a/share/completions/iw.fish b/share/completions/iw.fish
index 1a8f0e6c9..ca78c3717 100644
--- a/share/completions/iw.fish
+++ b/share/completions/iw.fish
@@ -7,7 +7,7 @@ set -l iw_commands dev phy reg event features commands list
 
 function __fish_iw_device
     __fish_print_interfaces | while read i
-        printf '%s\t%s\n' $i "Device"
+        printf '%s\t%s\n' $i Device
     end
 end
 
@@ -67,7 +67,7 @@ function __fish_complete_iw
                         printf '%s\t%s\n' join "Join an IBSS cell or create one" \
                             leave "Leave the current IBSS cell"
                     end
-                case 'switch'
+                case switch
                     if not set -q cmd[5]
                         echo channel
                         echo freq
@@ -180,7 +180,7 @@ function __fish_complete_iw
                         cqm "Set connection quality monitor RSSI threshold" \
                         ftm "Control the FTM responder" \
                         ibss "Join or leave a IBSS cell" \
-                        'switch' "Switch the operating channel by sending a CSA" \
+                        switch "Switch the operating channel by sending a CSA" \
                         info "Show information for this interface" \
                         del "Remove this virtual interface" \
                         interface "Control the interface" \
@@ -208,7 +208,7 @@ function __fish_complete_iw
                         printf '%s\t%s\n' show "Show coalesce status" \
                             disable "Disable coalesce" \
                             enable "Enable coalesce"
-                    else if [ "$cmd[5]" = "enable" ] && not set -q cmd[6]
+                    else if [ "$cmd[5]" = enable ] && not set -q cmd[6]
                         __fish_complete_path # Enable takes a config file
                     end
                 case hwsim
@@ -273,6 +273,6 @@ complete -f -c iw -n "__fish_seen_subcommand_from event" -s t -d 'Print timestam
 complete -f -c iw -n "__fish_seen_subcommand_from event" -s r -d 'Print relative timestamp'
 complete -f -c iw -n "__fish_seen_subcommand_from event" -s f -d 'Print full frame for auth/assoc'
 
-complete -f -c iw -n "__fish_seen_subcommand_from reg" -a 'reload' -d 'Reload the kernel\'s regulatory database'
-complete -f -c iw -n "__fish_seen_subcommand_from reg" -a 'get' -d 'Print the kernel\'s current regulatory domain information'
-complete -f -c iw -n "__fish_seen_subcommand_from reg" -a 'set' -d 'Notify the kernel about the current regulatory domain'
+complete -f -c iw -n "__fish_seen_subcommand_from reg" -a reload -d 'Reload the kernel\'s regulatory database'
+complete -f -c iw -n "__fish_seen_subcommand_from reg" -a get -d 'Print the kernel\'s current regulatory domain information'
+complete -f -c iw -n "__fish_seen_subcommand_from reg" -a set -d 'Notify the kernel about the current regulatory domain'
diff --git a/share/completions/jhipster.fish b/share/completions/jhipster.fish
index 2a09f47e9..a1f257755 100644
--- a/share/completions/jhipster.fish
+++ b/share/completions/jhipster.fish
@@ -11,27 +11,27 @@ function __fish_prog_needs_command
 end
 
 # Options
-complete -f -c jhipster -n '__fish_prog_needs_command' -s d -l debug -d 'Enable debugger'
-complete -f -c jhipster -n '__fish_prog_needs_command' -s h -l help -d 'Output usage information'
-complete -f -c jhipster -n '__fish_prog_needs_command' -s V -l version -d 'Output version number'
+complete -f -c jhipster -n __fish_prog_needs_command -s d -l debug -d 'Enable debugger'
+complete -f -c jhipster -n __fish_prog_needs_command -s h -l help -d 'Output usage information'
+complete -f -c jhipster -n __fish_prog_needs_command -s V -l version -d 'Output version number'
 
 # Commands
-complete -f -c jhipster -n '__fish_prog_needs_command' -a app -d 'Create a new JHipster application'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a aws -d 'Deploy the current application to AWS'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a ci-cd -d 'Create pipeline scripts for popular CI tools'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a client -d 'Create a new JHipster client-side application'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a cloudfoundry -d 'Prepare Cloud Foundry deployment'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a docker-compose -d 'Create all required Docker deployment configuration for the selected applications'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a entity -d 'Create a new JHipster entity: JPA entity, Spring server-side components and Angular client-side components'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a export-jdl -d 'Create a JDL file from the existing entities'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a heroku -d 'Deploy the current application to Heroku'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a import-jdl -d 'Create entities from the JDL file passed in argument'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a info -d 'Display information about your current project and system'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a kubernetes -d 'Deploy the current application to Kubernetes'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a languages -d 'Select languages from a list of available languages. The i18n files will be copied to the /webapp/i18n folder'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a openshift -d 'Deploy the current application to OpenShift'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a rancher-compose -d 'Deploy the current application to Rancher'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a server -d 'Create a new JHipster server-side application'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a service -d 'Create a new Spring service bean'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a upgrade -d 'Upgrade the JHipster version and the generated application'
-complete -f -c jhipster -n '__fish_prog_needs_command' -a completion -d 'Print command completion script'
+complete -f -c jhipster -n __fish_prog_needs_command -a app -d 'Create a new JHipster application'
+complete -f -c jhipster -n __fish_prog_needs_command -a aws -d 'Deploy the current application to AWS'
+complete -f -c jhipster -n __fish_prog_needs_command -a ci-cd -d 'Create pipeline scripts for popular CI tools'
+complete -f -c jhipster -n __fish_prog_needs_command -a client -d 'Create a new JHipster client-side application'
+complete -f -c jhipster -n __fish_prog_needs_command -a cloudfoundry -d 'Prepare Cloud Foundry deployment'
+complete -f -c jhipster -n __fish_prog_needs_command -a docker-compose -d 'Create all required Docker deployment configuration for the selected applications'
+complete -f -c jhipster -n __fish_prog_needs_command -r -a entity -d 'Create a new JHipster entity: JPA entity, Spring server-side components and Angular client-side components'
+complete -f -c jhipster -n __fish_prog_needs_command -r -a export-jdl -d 'Create a JDL file from the existing entities'
+complete -f -c jhipster -n __fish_prog_needs_command -a heroku -d 'Deploy the current application to Heroku'
+complete -f -c jhipster -n __fish_prog_needs_command -r -a import-jdl -d 'Create entities from the JDL file passed in argument'
+complete -f -c jhipster -n __fish_prog_needs_command -a info -d 'Display information about your current project and system'
+complete -f -c jhipster -n __fish_prog_needs_command -a kubernetes -d 'Deploy the current application to Kubernetes'
+complete -f -c jhipster -n __fish_prog_needs_command -r -a languages -d 'Select languages from a list of available languages. The i18n files will be copied to the /webapp/i18n folder'
+complete -f -c jhipster -n __fish_prog_needs_command -a openshift -d 'Deploy the current application to OpenShift'
+complete -f -c jhipster -n __fish_prog_needs_command -a rancher-compose -d 'Deploy the current application to Rancher'
+complete -f -c jhipster -n __fish_prog_needs_command -a server -d 'Create a new JHipster server-side application'
+complete -f -c jhipster -n __fish_prog_needs_command -r -a service -d 'Create a new Spring service bean'
+complete -f -c jhipster -n __fish_prog_needs_command -a upgrade -d 'Upgrade the JHipster version and the generated application'
+complete -f -c jhipster -n __fish_prog_needs_command -a completion -d 'Print command completion script'
diff --git a/share/completions/journalctl.fish b/share/completions/journalctl.fish
index b8ce1068f..33e31f20a 100644
--- a/share/completions/journalctl.fish
+++ b/share/completions/journalctl.fish
@@ -23,9 +23,9 @@ function __fish_journalctl_field_values
 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 2>/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
+complete -c journalctl -n "not __fish_journalctl_is_field" -a '(command journalctl -F _EXE 2>/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
 
 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/kdeconnect-cli.fish b/share/completions/kdeconnect-cli.fish
index b77452d6a..59881bbde 100644
--- a/share/completions/kdeconnect-cli.fish
+++ b/share/completions/kdeconnect-cli.fish
@@ -1,24 +1,24 @@
-complete -c 'kdeconnect-cli' -s l -l list-devices -d "List all devices"
-complete -c 'kdeconnect-cli' -s a -l list-available -d "List available (paired and reachable) devices"
-complete -c 'kdeconnect-cli' -l id-only -d "Make --list-devices or --list-available print the devices id, to ease scripting"
-complete -c 'kdeconnect-cli' -l refresh -d "Search for devices in the network and re-establish connections"
-complete -c 'kdeconnect-cli' -l pair -d "Request pairing to a said device"
-complete -c 'kdeconnect-cli' -l ring -d "Find the said device by ringing it."
-complete -c 'kdeconnect-cli' -l unpair -d "Stop pairing to a said device"
-complete -c 'kdeconnect-cli' -l ping -d "Sends a ping to said device"
-complete -c 'kdeconnect-cli' -l ping-msg -f -r -d "Same as ping but you can set the message to display" # message
-complete -c 'kdeconnect-cli' -l share -r -d "Share a file to a said device" # path
-complete -c 'kdeconnect-cli' -l list-notifications -d "Display the notifications on a said device"
-complete -c 'kdeconnect-cli' -l lock -d "Lock the specified device"
-complete -c 'kdeconnect-cli' -l send-sms -f -r -d "Sends an SMS. Requires destination" # message
-complete -c 'kdeconnect-cli' -l destination -f -r -d "Phone number to send the message" # phone number
-complete -c 'kdeconnect-cli' -s d -l device -f -r -a '(kdeconnect-cli -l --id-only)' -d "Device ID" # dev
-complete -c 'kdeconnect-cli' -s n -l name -f -r -d "Device Name" # name
-complete -c 'kdeconnect-cli' -l encryption-info -d "Get encryption info about said device"
-complete -c 'kdeconnect-cli' -l list-commands -d "Lists remote commands and their ids"
-complete -c 'kdeconnect-cli' -l execute-command -f -r -d "Executes a remote command by id" # id
-complete -c 'kdeconnect-cli' -s h -l help -d "Displays this help."
-complete -c 'kdeconnect-cli' -s v -l version -d "Displays version information."
-complete -c 'kdeconnect-cli' -l author -d "Show author information."
-complete -c 'kdeconnect-cli' -l license -d "Show license information."
-complete -c 'kdeconnect-cli' -l desktopfile -r -d "The base file name of the desktop entry for this application." # file name
+complete -c kdeconnect-cli -s l -l list-devices -d "List all devices"
+complete -c kdeconnect-cli -s a -l list-available -d "List available (paired and reachable) devices"
+complete -c kdeconnect-cli -l id-only -d "Make --list-devices or --list-available print the devices id, to ease scripting"
+complete -c kdeconnect-cli -l refresh -d "Search for devices in the network and re-establish connections"
+complete -c kdeconnect-cli -l pair -d "Request pairing to a said device"
+complete -c kdeconnect-cli -l ring -d "Find the said device by ringing it."
+complete -c kdeconnect-cli -l unpair -d "Stop pairing to a said device"
+complete -c kdeconnect-cli -l ping -d "Sends a ping to said device"
+complete -c kdeconnect-cli -l ping-msg -f -r -d "Same as ping but you can set the message to display" # message
+complete -c kdeconnect-cli -l share -r -d "Share a file to a said device" # path
+complete -c kdeconnect-cli -l list-notifications -d "Display the notifications on a said device"
+complete -c kdeconnect-cli -l lock -d "Lock the specified device"
+complete -c kdeconnect-cli -l send-sms -f -r -d "Sends an SMS. Requires destination" # message
+complete -c kdeconnect-cli -l destination -f -r -d "Phone number to send the message" # phone number
+complete -c kdeconnect-cli -s d -l device -f -r -a '(kdeconnect-cli -l --id-only)' -d "Device ID" # dev
+complete -c kdeconnect-cli -s n -l name -f -r -d "Device Name" # name
+complete -c kdeconnect-cli -l encryption-info -d "Get encryption info about said device"
+complete -c kdeconnect-cli -l list-commands -d "Lists remote commands and their ids"
+complete -c kdeconnect-cli -l execute-command -f -r -d "Executes a remote command by id" # id
+complete -c kdeconnect-cli -s h -l help -d "Displays this help."
+complete -c kdeconnect-cli -s v -l version -d "Displays version information."
+complete -c kdeconnect-cli -l author -d "Show author information."
+complete -c kdeconnect-cli -l license -d "Show license information."
+complete -c kdeconnect-cli -l desktopfile -r -d "The base file name of the desktop entry for this application." # file name
diff --git a/share/completions/keepassxc-cli.fish b/share/completions/keepassxc-cli.fish
index 57e01bb95..411c2d776 100644
--- a/share/completions/keepassxc-cli.fish
+++ b/share/completions/keepassxc-cli.fish
@@ -10,29 +10,29 @@ complete -c keepassxc-cli -s h -l help -d "Show help info"
 complete -c keepassxc-cli -s v -l version -d "Show version info"
 
 # Commands
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a add -d "Add a new entry"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a analyze -d "Analyze password for weakness and problem"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a clip -d "Copy an entry's password to the clipboard"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a close -d "Close the currently opened database"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a create -d "Create new database"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a diceware -d "Generate a new random diceware passphrase"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a edit -d "Edit an entry"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a estimate -d "Estimate the entropy of a password"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a exit -d "Exit interactive mode"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a export -d "Export the contents to stdout"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a generate -d "Generate a new password"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a help -d "Show command help"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a import -d "Import the contents"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a locate -d "Find entries quickly"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a ls -d "List database entries"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a merge -d "Merge two databases"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a mkdir -d "Add a new group"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a mv -d "Move an entry"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a open -d "Open a database"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a quit -d "Exit interactive mode"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a rm -d "Remove an entry"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a rmdir -d "Remove a group"
-complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a show -d "Show an entry's info"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a add -d "Add a new entry"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a analyze -d "Analyze password for weakness and problem"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a clip -d "Copy an entry's password to the clipboard"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a close -d "Close the currently opened database"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a create -d "Create new database"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a diceware -d "Generate a new random diceware passphrase"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a edit -d "Edit an entry"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a estimate -d "Estimate the entropy of a password"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a exit -d "Exit interactive mode"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a export -d "Export the contents to stdout"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a generate -d "Generate a new password"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a help -d "Show command help"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a import -d "Import the contents"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a locate -d "Find entries quickly"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a ls -d "List database entries"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a merge -d "Merge two databases"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a mkdir -d "Add a new group"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a mv -d "Move an entry"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a open -d "Open a database"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a quit -d "Exit interactive mode"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a rm -d "Remove an entry"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a rmdir -d "Remove a group"
+complete -f -c keepassxc-cli -n __fish_use_subcommand -a show -d "Show an entry's info"
 
 ## Merge options
 complete -r -c keepassxc-cli -n "__fish_seen_subcommand_from merge" -s d -l dry-run -d "Dry run"
diff --git a/share/completions/keybase.fish b/share/completions/keybase.fish
index 7d35f70bd..9787c88cb 100644
--- a/share/completions/keybase.fish
+++ b/share/completions/keybase.fish
@@ -49,10 +49,10 @@ complete -c keybase -f -n "$ends keybase" -l bg-identifier-disabled
 complete -c keybase -f -n "$ends keybase" -l chat-db
 complete -c keybase -f -n "$ends keybase" -l code-signing-kids
 complete -c keybase -f -n "$ends keybase" -l config-file
-complete -c keybase -f -n "$ends keybase" -s c -d "--config-file"
+complete -c keybase -f -n "$ends keybase" -s c -d --config-file
 complete -c keybase -f -n "$ends keybase" -l db
 complete -c keybase -f -n "$ends keybase" -l debug
-complete -c keybase -f -n "$ends keybase" -s d -d "--debug"
+complete -c keybase -f -n "$ends keybase" -s d -d --debug
 complete -c keybase -f -n "$ends keybase" -l debug-journeycard
 complete -c keybase -f -n "$ends keybase" -l disable-bg-conv-loader
 complete -c keybase -f -n "$ends keybase" -l disable-cert-pinning
@@ -72,9 +72,9 @@ complete -c keybase -f -n "$ends keybase" -l gpg-options
 complete -c keybase -f -n "$ends keybase" -l gpgdir
 complete -c keybase -f -n "$ends keybase" -l gui-config-file
 complete -c keybase -f -n "$ends keybase" -l help
-complete -c keybase -f -n "$ends keybase" -s h -d "--help"
+complete -c keybase -f -n "$ends keybase" -s h -d --help
 complete -c keybase -f -n "$ends keybase" -l home
-complete -c keybase -f -n "$ends keybase" -s H -d "--home"
+complete -c keybase -f -n "$ends keybase" -s H -d --home
 complete -c keybase -f -n "$ends keybase" -l leveldb-num-files
 complete -c keybase -f -n "$ends keybase" -l local-rpc-debug-unsafe
 complete -c keybase -f -n "$ends keybase" -l log-file
@@ -82,7 +82,7 @@ complete -c keybase -f -n "$ends keybase" -l log-format
 complete -c keybase -f -n "$ends keybase" -l log-prefix
 complete -c keybase -f -n "$ends keybase" -l merkle-kids
 complete -c keybase -f -n "$ends keybase" -l no-auto-fork
-complete -c keybase -f -n "$ends keybase" -s F -d "--no-auto-fork"
+complete -c keybase -f -n "$ends keybase" -s F -d --no-auto-fork
 complete -c keybase -f -n "$ends keybase" -l no-debug
 complete -c keybase -f -n "$ends keybase" -l paramproof-kit
 complete -c keybase -f -n "$ends keybase" -l pgpdir
@@ -102,7 +102,7 @@ complete -c keybase -f -n "$ends keybase" -l run-mode
 complete -c keybase -f -n "$ends keybase" -l scraper-timeout
 complete -c keybase -f -n "$ends keybase" -l secret-keyring
 complete -c keybase -f -n "$ends keybase" -l server
-complete -c keybase -f -n "$ends keybase" -s s -d "--server"
+complete -c keybase -f -n "$ends keybase" -s s -d --server
 complete -c keybase -f -n "$ends keybase" -l session-file
 complete -c keybase -f -n "$ends keybase" -l slow-gregor-conn
 complete -c keybase -f -n "$ends keybase" -l socket-file
@@ -117,7 +117,7 @@ complete -c keybase -f -n "$ends keybase" -l use-root-config-file
 complete -c keybase -f -n "$ends keybase" -l user-cache-size
 complete -c keybase -f -n "$ends keybase" -l vdebug
 complete -c keybase -f -n "$ends keybase" -l version
-complete -c keybase -f -n "$ends keybase" -s v -d "--version"
+complete -c keybase -f -n "$ends keybase" -s v -d --version
 
 #commands
 #L1
diff --git a/share/completions/killall.fish b/share/completions/killall.fish
index 4fd7bd802..217827298 100644
--- a/share/completions/killall.fish
+++ b/share/completions/killall.fish
@@ -1,7 +1,7 @@
 # On Solaris, `killall` kills all processes. So we don't want to bother providing completion
 # support on that OS.
 set -l OS (uname)
-if test "$OS" = 'SunOS'
+if test "$OS" = SunOS
     exit 0
 end
 
@@ -15,7 +15,7 @@ for i in $__kill_signals
     complete -c killall -o $number -d $name
     complete -c killall -o $name
     # The `-s` flag doesn't work in OS X
-    test "$OS" != 'Darwin'
+    test "$OS" != Darwin
     and complete -c killall -s s -x -a "$number $name"
 end
 
diff --git a/share/completions/kitchen.fish b/share/completions/kitchen.fish
index a42faec7e..e526e5386 100644
--- a/share/completions/kitchen.fish
+++ b/share/completions/kitchen.fish
@@ -26,16 +26,16 @@ end
 
 
 # help commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a help -d "Describe available commands or one specific command"
+complete -c kitchen -f -n __fish_kitchen_no_command -a help -d "Describe available commands or one specific command"
 
 # help help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a help -d "Describe available commands or one specific command"
 
 # list commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a list -d "Lists one or more instances"
-complete -c kitchen -f -n '__fish_kitchen_using_command list' -s "b" -l "bare" -d "List the name of each instance only, one per line"
-complete -c kitchen -f -n '__fish_kitchen_using_command list' -s "d" -l "debug" -d "[Deprecated] Please use `kitchen diagnose'"
-complete -c kitchen -f -n '__fish_kitchen_using_command list' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
+complete -c kitchen -f -n __fish_kitchen_no_command -a list -d "Lists one or more instances"
+complete -c kitchen -f -n '__fish_kitchen_using_command list' -s b -l bare -d "List the name of each instance only, one per line"
+complete -c kitchen -f -n '__fish_kitchen_using_command list' -s d -l debug -d "[Deprecated] Please use `kitchen diagnose'"
+complete -c kitchen -f -n '__fish_kitchen_using_command list' -s l -l log_level -d "Set the log level (debug, info, warn, error, fatal)"
 
 # list help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a list -d "Lists one or more instances"
@@ -44,11 +44,11 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a list -d "Lists
 complete -c kitchen -f -n '__fish_kitchen_using_command list' -a '(__fish_kitchen_list)'
 
 # diagnose commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a diagnose -d "Show computed diagnostic configuration"
-complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
-complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l "loader" -d "Include data loader diagnostics"
-complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l "instances" -d "Include instances diagnostics"
-complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l "all" -d "Include all diagnostics"
+complete -c kitchen -f -n __fish_kitchen_no_command -a diagnose -d "Show computed diagnostic configuration"
+complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -s l -l log_level -d "Set the log level (debug, info, warn, error, fatal)"
+complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l loader -d "Include data loader diagnostics"
+complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l instances -d "Include instances diagnostics"
+complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l all -d "Include all diagnostics"
 
 # diagnose help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a diagnose -d "Show computed diagnostic configuration"
@@ -57,10 +57,10 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a diagnose -d "Sh
 complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -a '(__fish_kitchen_list)'
 
 # create commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a create -d "Change instance state to create. Start one or more instances"
-complete -c kitchen -f -n '__fish_kitchen_using_command create' -s "c" -l "concurrency" -d "Run a create against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
-complete -c kitchen -f -n '__fish_kitchen_using_command create' -s "p" -l "parallel" -d "[Future DEPRECATION, use --concurrency] Run a create against all matching instances concurrently. "
-complete -c kitchen -f -n '__fish_kitchen_using_command create' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
+complete -c kitchen -f -n __fish_kitchen_no_command -a create -d "Change instance state to create. Start one or more instances"
+complete -c kitchen -f -n '__fish_kitchen_using_command create' -s c -l concurrency -d "Run a create against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
+complete -c kitchen -f -n '__fish_kitchen_using_command create' -s p -l parallel -d "[Future DEPRECATION, use --concurrency] Run a create against all matching instances concurrently. "
+complete -c kitchen -f -n '__fish_kitchen_using_command create' -s l -l log_level -d "Set the log level (debug, info, warn, error, fatal)"
 
 # create help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a create -d "Change instance state to create. Start one or more instances"
@@ -69,10 +69,10 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a create -d "Chan
 complete -c kitchen -f -n '__fish_kitchen_using_command create' -a '(__fish_kitchen_list)'
 
 # converge commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a converge -d "Change instance state to converge. Use a provisioner to configure one or more instances"
-complete -c kitchen -f -n '__fish_kitchen_using_command converge' -s "c" -l "concurrency" -d "Run a converge against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
-complete -c kitchen -f -n '__fish_kitchen_using_command converge' -s "p" -l "parallel" -d "[Future DEPRECATION, use --concurrency] Run a converge against all matching instances concurrently. "
-complete -c kitchen -f -n '__fish_kitchen_using_command converge' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
+complete -c kitchen -f -n __fish_kitchen_no_command -a converge -d "Change instance state to converge. Use a provisioner to configure one or more instances"
+complete -c kitchen -f -n '__fish_kitchen_using_command converge' -s c -l concurrency -d "Run a converge against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
+complete -c kitchen -f -n '__fish_kitchen_using_command converge' -s p -l parallel -d "[Future DEPRECATION, use --concurrency] Run a converge against all matching instances concurrently. "
+complete -c kitchen -f -n '__fish_kitchen_using_command converge' -s l -l log_level -d "Set the log level (debug, info, warn, error, fatal)"
 
 # converge help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a converge -d "Change instance state to converge. Use a provisioner to configure one or more instances"
@@ -81,10 +81,10 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a converge -d "Ch
 complete -c kitchen -f -n '__fish_kitchen_using_command converge' -a '(__fish_kitchen_list)'
 
 # setup commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a setup -d "Change instance state to setup. Prepare to run automated tests. Install busser and related gems on one or more instances"
-complete -c kitchen -f -n '__fish_kitchen_using_command setup' -s "c" -l "concurrency" -d "Run a setup against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
-complete -c kitchen -f -n '__fish_kitchen_using_command setup' -s "p" -l "parallel" -d "[Future DEPRECATION, use --concurrency] Run a setup against all matching instances concurrently. "
-complete -c kitchen -f -n '__fish_kitchen_using_command setup' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
+complete -c kitchen -f -n __fish_kitchen_no_command -a setup -d "Change instance state to setup. Prepare to run automated tests. Install busser and related gems on one or more instances"
+complete -c kitchen -f -n '__fish_kitchen_using_command setup' -s c -l concurrency -d "Run a setup against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
+complete -c kitchen -f -n '__fish_kitchen_using_command setup' -s p -l parallel -d "[Future DEPRECATION, use --concurrency] Run a setup against all matching instances concurrently. "
+complete -c kitchen -f -n '__fish_kitchen_using_command setup' -s l -l log_level -d "Set the log level (debug, info, warn, error, fatal)"
 
 # setup help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a setup -d "Change instance state to setup. Prepare to run automated tests. Install busser and related gems on one or more instances"
@@ -93,10 +93,10 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a setup -d "Chang
 complete -c kitchen -f -n '__fish_kitchen_using_command setup' -a '(__fish_kitchen_list)'
 
 # verify commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a verify -d "Change instance state to verify. Run automated tests on one or more instances"
-complete -c kitchen -f -n '__fish_kitchen_using_command verify' -s "c" -l "concurrency" -d "Run a verify against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
-complete -c kitchen -f -n '__fish_kitchen_using_command verify' -s "p" -l "parallel" -d "[Future DEPRECATION, use --concurrency] Run a verify against all matching instances concurrently. "
-complete -c kitchen -f -n '__fish_kitchen_using_command verify' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
+complete -c kitchen -f -n __fish_kitchen_no_command -a verify -d "Change instance state to verify. Run automated tests on one or more instances"
+complete -c kitchen -f -n '__fish_kitchen_using_command verify' -s c -l concurrency -d "Run a verify against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
+complete -c kitchen -f -n '__fish_kitchen_using_command verify' -s p -l parallel -d "[Future DEPRECATION, use --concurrency] Run a verify against all matching instances concurrently. "
+complete -c kitchen -f -n '__fish_kitchen_using_command verify' -s l -l log_level -d "Set the log level (debug, info, warn, error, fatal)"
 
 # verify help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a verify -d "Change instance state to verify. Run automated tests on one or more instances"
@@ -105,10 +105,10 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a verify -d "Chan
 complete -c kitchen -f -n '__fish_kitchen_using_command verify' -a '(__fish_kitchen_list)'
 
 # destroy commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a destroy -d "Change instance state to destroy. Delete all information for one or more instances"
-complete -c kitchen -f -n '__fish_kitchen_using_command destroy' -s "c" -l "concurrency" -d "Run a destroy against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
-complete -c kitchen -f -n '__fish_kitchen_using_command destroy' -s "p" -l "parallel" -d "[Future DEPRECATION, use --concurrency] Run a destroy against all matching instances concurrently. "
-complete -c kitchen -f -n '__fish_kitchen_using_command destroy' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
+complete -c kitchen -f -n __fish_kitchen_no_command -a destroy -d "Change instance state to destroy. Delete all information for one or more instances"
+complete -c kitchen -f -n '__fish_kitchen_using_command destroy' -s c -l concurrency -d "Run a destroy against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
+complete -c kitchen -f -n '__fish_kitchen_using_command destroy' -s p -l parallel -d "[Future DEPRECATION, use --concurrency] Run a destroy against all matching instances concurrently. "
+complete -c kitchen -f -n '__fish_kitchen_using_command destroy' -s l -l log_level -d "Set the log level (debug, info, warn, error, fatal)"
 
 # destroy help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a destroy -d "Change instance state to destroy. Delete all information for one or more instances"
@@ -117,12 +117,12 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a destroy -d "Cha
 complete -c kitchen -f -n '__fish_kitchen_using_command destroy' -a '(__fish_kitchen_list)'
 
 # test commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a test -d "Test (destroy, create, converge, setup, verify and destroy) one or more instances"
-complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "c" -l "concurrency" -d "Run a test against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
-complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "p" -l "parallel" -d "[Future DEPRECATION, use --concurrency] Run a test against all matching instances concurrently. "
-complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
-complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "d" -l "destroy" -d "Destroy strategy to use after testing (passing, always, never)."
-complete -c kitchen -f -n '__fish_kitchen_using_command test' -l "auto_init" -d "Invoke init command if .kitchen.yml is missing"
+complete -c kitchen -f -n __fish_kitchen_no_command -a test -d "Test (destroy, create, converge, setup, verify and destroy) one or more instances"
+complete -c kitchen -f -n '__fish_kitchen_using_command test' -s c -l concurrency -d "Run a test against all matching instances concurrently. Only N instances will run at the same time if a number is given. "
+complete -c kitchen -f -n '__fish_kitchen_using_command test' -s p -l parallel -d "[Future DEPRECATION, use --concurrency] Run a test against all matching instances concurrently. "
+complete -c kitchen -f -n '__fish_kitchen_using_command test' -s l -l log_level -d "Set the log level (debug, info, warn, error, fatal)"
+complete -c kitchen -f -n '__fish_kitchen_using_command test' -s d -l destroy -d "Destroy strategy to use after testing (passing, always, never)."
+complete -c kitchen -f -n '__fish_kitchen_using_command test' -l auto_init -d "Invoke init command if .kitchen.yml is missing"
 
 # test help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a test -d "Test (destroy, create, converge, setup, verify and destroy) one or more instances"
@@ -131,8 +131,8 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a test -d "Test (
 complete -c kitchen -f -n '__fish_kitchen_using_command test' -a '(__fish_kitchen_list)'
 
 # login commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a login -d "Log in to one instance"
-complete -c kitchen -f -n '__fish_kitchen_using_command login' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
+complete -c kitchen -f -n __fish_kitchen_no_command -a login -d "Log in to one instance"
+complete -c kitchen -f -n '__fish_kitchen_using_command login' -s l -l log_level -d "Set the log level (debug, info, warn, error, fatal)"
 
 # login help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a login -d "Log in to one instance"
@@ -141,9 +141,9 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a login -d "Log i
 complete -c kitchen -f -n '__fish_kitchen_using_command login' -a '(__fish_kitchen_list)'
 
 # exec commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a exec -d "Execute command on one or more instance"
-complete -c kitchen -f -n '__fish_kitchen_using_command exec' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
-complete -c kitchen -f -n '__fish_kitchen_using_command exec' -s "c" -l command -d "execute via ssh"
+complete -c kitchen -f -n __fish_kitchen_no_command -a exec -d "Execute command on one or more instance"
+complete -c kitchen -f -n '__fish_kitchen_using_command exec' -s l -l log_level -d "Set the log level (debug, info, warn, error, fatal)"
+complete -c kitchen -f -n '__fish_kitchen_using_command exec' -s c -l command -d "execute via ssh"
 
 # exec help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a exec -d "Execute command on one or more instance"
@@ -152,34 +152,34 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a exec -d "Execut
 complete -c kitchen -f -n '__fish_kitchen_using_command exec' -a '(__fish_kitchen_list)'
 
 # version commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a version -d "Print Kitchen's version information"
+complete -c kitchen -f -n __fish_kitchen_no_command -a version -d "Print Kitchen's version information"
 
 # version help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a version -d "Print Kitchen's version information"
 
 # sink commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a sink -d "Show the Kitchen sink!"
+complete -c kitchen -f -n __fish_kitchen_no_command -a sink -d "Show the Kitchen sink!"
 
 # sink help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a sink -d "Show the Kitchen sink!"
 
 # console commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a console -d "Kitchen Console!"
+complete -c kitchen -f -n __fish_kitchen_no_command -a console -d "Kitchen Console!"
 
 # console help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a console -d "Kitchen Console!"
 
 # init commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a init -d "Adds some configuration to your cookbook so Kitchen can rock"
-complete -c kitchen -f -n '__fish_kitchen_using_command init' -s "D" -l "driver" -d "One or more Kitchen Driver gems to be installed or added to a Gemfile "
-complete -c kitchen -f -n '__fish_kitchen_using_command init' -s "P" -l "provisioner" -d "The default Kitchen Provisioner to use "
-complete -c kitchen -f -n '__fish_kitchen_using_command init' -l "create_gemfile" -d "Whether or not to create a Gemfile if one does not exist. Default: false "
+complete -c kitchen -f -n __fish_kitchen_no_command -a init -d "Adds some configuration to your cookbook so Kitchen can rock"
+complete -c kitchen -f -n '__fish_kitchen_using_command init' -s D -l driver -d "One or more Kitchen Driver gems to be installed or added to a Gemfile "
+complete -c kitchen -f -n '__fish_kitchen_using_command init' -s P -l provisioner -d "The default Kitchen Provisioner to use "
+complete -c kitchen -f -n '__fish_kitchen_using_command init' -l create_gemfile -d "Whether or not to create a Gemfile if one does not exist. Default: false "
 
 # init help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a init -d "Adds some configuration to your cookbook so Kitchen can rock"
 
 # driver commands
-complete -c kitchen -f -n '__fish_kitchen_no_command' -a driver -d "Driver subcommands"
+complete -c kitchen -f -n __fish_kitchen_no_command -a driver -d "Driver subcommands"
 
 # driver help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a driver -d "Driver subcommands"
diff --git a/share/completions/launchctl.fish b/share/completions/launchctl.fish
index f4768177e..77e63e9ff 100644
--- a/share/completions/launchctl.fish
+++ b/share/completions/launchctl.fish
@@ -1,45 +1,45 @@
-complete --command launchctl -n '__fish_use_subcommand' -xa "bootstrap\tBootstraps a domain or a service into a domain"
-complete --command launchctl -n '__fish_use_subcommand' -xa "bootout\tTears down a domain or removes a service from a domain"
-complete --command launchctl -n '__fish_use_subcommand' -xa "enable\tEnables an existing service"
-complete --command launchctl -n '__fish_use_subcommand' -xa "disable\tDisables an existing service"
-complete --command launchctl -n '__fish_use_subcommand' -xa "uncache\tRemoves the specified service name from the service cache"
-complete --command launchctl -n '__fish_use_subcommand' -xa "kickstart\tForces an existing service to start"
-complete --command launchctl -n '__fish_use_subcommand' -xa "attach\tAttach the system's debugger to a service"
-complete --command launchctl -n '__fish_use_subcommand' -xa "debug\tConfigures the next invocation of a service for debugging"
-complete --command launchctl -n '__fish_use_subcommand' -xa "kill\tSends a signal to the service instance"
-complete --command launchctl -n '__fish_use_subcommand' -xa "blame\tPrints the reason a service is running"
-complete --command launchctl -n '__fish_use_subcommand' -xa "print\tPrints a description of a domain or service"
-complete --command launchctl -n '__fish_use_subcommand' -xa "print-cache\tPrints information about the service cache"
-complete --command launchctl -n '__fish_use_subcommand' -xa "print-disabled\tPrints which services are disabled"
-complete --command launchctl -n '__fish_use_subcommand' -xa "plist\tPrints a property list embedded in a binary (targets the Info.plist by default)"
-complete --command launchctl -n '__fish_use_subcommand' -xa "procinfo\tPrints port information about a process"
-complete --command launchctl -n '__fish_use_subcommand' -xa "hostinfo\tPrints port information about the host"
-complete --command launchctl -n '__fish_use_subcommand' -xa "resolveport\tResolves a port name from a process to an endpoint in launchd"
-complete --command launchctl -n '__fish_use_subcommand' -xa "limit\tReads or modifies launchd's resource limits"
-complete --command launchctl -n '__fish_use_subcommand' -xa "runstats\tPrints performance statistics for a service"
-complete --command launchctl -n '__fish_use_subcommand' -xa "examine\tRuns the specified analysis tool against launchd in a non-reentrant manner"
-complete --command launchctl -n '__fish_use_subcommand' -xa "config\tModifies persistent configuration parameters for launchd domains"
-complete --command launchctl -n '__fish_use_subcommand' -xa "dumpstate\tDumps launchd state to stdout"
-complete --command launchctl -n '__fish_use_subcommand' -xa "dumpjpcategory\tDumps the jetsam properties category for all services"
-complete --command launchctl -n '__fish_use_subcommand' -xa "reboot\tInitiates a system reboot of the specified type"
-complete --command launchctl -n '__fish_use_subcommand' -xa "bootshell\tBrings the system up from single-user mode with a console shell"
-complete --command launchctl -n '__fish_use_subcommand' -xa "load\tBootstraps a service or directory of services"
-complete --command launchctl -n '__fish_use_subcommand' -xa "unload\tUnloads a service or directory of services"
-complete --command launchctl -n '__fish_use_subcommand' -xa "remove\tUnloads the specified service name"
-complete --command launchctl -n '__fish_use_subcommand' -xa "list\tLists information about services"
-complete --command launchctl -n '__fish_use_subcommand' -xa "start\tStarts the specified service"
-complete --command launchctl -n '__fish_use_subcommand' -xa "stop\tStops the specified service if it is running"
-complete --command launchctl -n '__fish_use_subcommand' -xa "setenv\tSets the specified environment variables for all services within the domain"
-complete --command launchctl -n '__fish_use_subcommand' -xa "unsetenv\tUnsets the specified environment variables for all services within the domain"
-complete --command launchctl -n '__fish_use_subcommand' -xa "getenv\tGets the value of an environment variable from within launchd"
-complete --command launchctl -n '__fish_use_subcommand' -xa "bsexec\tExecute a program in another process' bootstrap context"
-complete --command launchctl -n '__fish_use_subcommand' -xa "asuser\tExecute a program in the bootstrap context of a given user"
-complete --command launchctl -n '__fish_use_subcommand' -xa "submit\tSubmit a basic job from the command line"
-complete --command launchctl -n '__fish_use_subcommand' -xa "managerpid\tPrints the PID of the launchd controlling the session"
-complete --command launchctl -n '__fish_use_subcommand' -xa "manageruid\tPrints the UID of the current launchd session"
-complete --command launchctl -n '__fish_use_subcommand' -xa "managername\tPrints the name of the current launchd session"
-complete --command launchctl -n '__fish_use_subcommand' -xa "error\tPrints a description of an error"
-complete --command launchctl -n '__fish_use_subcommand' -xa "variant\tPrints the launchd variant"
-complete --command launchctl -n '__fish_use_subcommand' -xa "version\tPrints the launchd version"
-complete --command launchctl -n '__fish_use_subcommand' -xa "help\tPrints the usage for a given subcommand"
+complete --command launchctl -n __fish_use_subcommand -xa "bootstrap\tBootstraps a domain or a service into a domain"
+complete --command launchctl -n __fish_use_subcommand -xa "bootout\tTears down a domain or removes a service from a domain"
+complete --command launchctl -n __fish_use_subcommand -xa "enable\tEnables an existing service"
+complete --command launchctl -n __fish_use_subcommand -xa "disable\tDisables an existing service"
+complete --command launchctl -n __fish_use_subcommand -xa "uncache\tRemoves the specified service name from the service cache"
+complete --command launchctl -n __fish_use_subcommand -xa "kickstart\tForces an existing service to start"
+complete --command launchctl -n __fish_use_subcommand -xa "attach\tAttach the system's debugger to a service"
+complete --command launchctl -n __fish_use_subcommand -xa "debug\tConfigures the next invocation of a service for debugging"
+complete --command launchctl -n __fish_use_subcommand -xa "kill\tSends a signal to the service instance"
+complete --command launchctl -n __fish_use_subcommand -xa "blame\tPrints the reason a service is running"
+complete --command launchctl -n __fish_use_subcommand -xa "print\tPrints a description of a domain or service"
+complete --command launchctl -n __fish_use_subcommand -xa "print-cache\tPrints information about the service cache"
+complete --command launchctl -n __fish_use_subcommand -xa "print-disabled\tPrints which services are disabled"
+complete --command launchctl -n __fish_use_subcommand -xa "plist\tPrints a property list embedded in a binary (targets the Info.plist by default)"
+complete --command launchctl -n __fish_use_subcommand -xa "procinfo\tPrints port information about a process"
+complete --command launchctl -n __fish_use_subcommand -xa "hostinfo\tPrints port information about the host"
+complete --command launchctl -n __fish_use_subcommand -xa "resolveport\tResolves a port name from a process to an endpoint in launchd"
+complete --command launchctl -n __fish_use_subcommand -xa "limit\tReads or modifies launchd's resource limits"
+complete --command launchctl -n __fish_use_subcommand -xa "runstats\tPrints performance statistics for a service"
+complete --command launchctl -n __fish_use_subcommand -xa "examine\tRuns the specified analysis tool against launchd in a non-reentrant manner"
+complete --command launchctl -n __fish_use_subcommand -xa "config\tModifies persistent configuration parameters for launchd domains"
+complete --command launchctl -n __fish_use_subcommand -xa "dumpstate\tDumps launchd state to stdout"
+complete --command launchctl -n __fish_use_subcommand -xa "dumpjpcategory\tDumps the jetsam properties category for all services"
+complete --command launchctl -n __fish_use_subcommand -xa "reboot\tInitiates a system reboot of the specified type"
+complete --command launchctl -n __fish_use_subcommand -xa "bootshell\tBrings the system up from single-user mode with a console shell"
+complete --command launchctl -n __fish_use_subcommand -xa "load\tBootstraps a service or directory of services"
+complete --command launchctl -n __fish_use_subcommand -xa "unload\tUnloads a service or directory of services"
+complete --command launchctl -n __fish_use_subcommand -xa "remove\tUnloads the specified service name"
+complete --command launchctl -n __fish_use_subcommand -xa "list\tLists information about services"
+complete --command launchctl -n __fish_use_subcommand -xa "start\tStarts the specified service"
+complete --command launchctl -n __fish_use_subcommand -xa "stop\tStops the specified service if it is running"
+complete --command launchctl -n __fish_use_subcommand -xa "setenv\tSets the specified environment variables for all services within the domain"
+complete --command launchctl -n __fish_use_subcommand -xa "unsetenv\tUnsets the specified environment variables for all services within the domain"
+complete --command launchctl -n __fish_use_subcommand -xa "getenv\tGets the value of an environment variable from within launchd"
+complete --command launchctl -n __fish_use_subcommand -xa "bsexec\tExecute a program in another process' bootstrap context"
+complete --command launchctl -n __fish_use_subcommand -xa "asuser\tExecute a program in the bootstrap context of a given user"
+complete --command launchctl -n __fish_use_subcommand -xa "submit\tSubmit a basic job from the command line"
+complete --command launchctl -n __fish_use_subcommand -xa "managerpid\tPrints the PID of the launchd controlling the session"
+complete --command launchctl -n __fish_use_subcommand -xa "manageruid\tPrints the UID of the current launchd session"
+complete --command launchctl -n __fish_use_subcommand -xa "managername\tPrints the name of the current launchd session"
+complete --command launchctl -n __fish_use_subcommand -xa "error\tPrints a description of an error"
+complete --command launchctl -n __fish_use_subcommand -xa "variant\tPrints the launchd variant"
+complete --command launchctl -n __fish_use_subcommand -xa "version\tPrints the launchd version"
+complete --command launchctl -n __fish_use_subcommand -xa "help\tPrints the usage for a given subcommand"
 
diff --git a/share/completions/lein.fish b/share/completions/lein.fish
index 90174050d..85d4f89b6 100644
--- a/share/completions/lein.fish
+++ b/share/completions/lein.fish
@@ -6,30 +6,30 @@ function __fish_lein_needs_command
     return 1
 end
 
-complete -f -c lein -n '__fish_lein_needs_command' -a check -d "Check syntax and warn on reflection."
-complete -f -c lein -n '__fish_lein_needs_command' -a classpath -d "Write the classpath of the current project to output-file."
-complete -f -c lein -n '__fish_lein_needs_command' -a clean -d "Remove all files from project's target-path."
-complete -f -c lein -n '__fish_lein_needs_command' -a compile -d "Compile Clojure source into .class files."
-complete -f -c lein -n '__fish_lein_needs_command' -a deploy -d "Build jar and deploy to remote repository."
-complete -f -c lein -n '__fish_lein_needs_command' -a deps -d "Show details about dependencies."
-complete -f -c lein -n '__fish_lein_needs_command' -a do -d "Higher-order task to perform other tasks in succession."
-complete -f -c lein -n '__fish_lein_needs_command' -a help -d "Display a list of tasks or help for a given task or subtask."
-complete -f -c lein -n '__fish_lein_needs_command' -a install -d "Install current project to the local repository."
-complete -f -c lein -n '__fish_lein_needs_command' -a jar -d "Package up all the project's files into a jar file."
-complete -f -c lein -n '__fish_lein_needs_command' -a javac -d "Compile Java source files."
-complete -f -c lein -n '__fish_lein_needs_command' -a light -d "Start a Light Table client for this project"
-complete -f -c lein -n '__fish_lein_needs_command' -a new -d "Generate scaffolding for a new project based on a template."
-complete -f -c lein -n '__fish_lein_needs_command' -a plugin -d "DEPRECATED. Please use the :user profile instead."
-complete -f -c lein -n '__fish_lein_needs_command' -a pom -d "Write a pom.xml file to disk for Maven interoperability."
-complete -f -c lein -n '__fish_lein_needs_command' -a repl -d "Start a repl session either with the current project or standalone."
-complete -f -c lein -n '__fish_lein_needs_command' -a retest -d "Run only the test namespaces which failed last time around."
-complete -f -c lein -n '__fish_lein_needs_command' -a run -d "Run the project's -main function."
-complete -f -c lein -n '__fish_lein_needs_command' -a search -d "Search remote maven repositories for matching jars."
-complete -f -c lein -n '__fish_lein_needs_command' -a show-profiles -d "List all available profiles or display one if given an argument."
-complete -f -c lein -n '__fish_lein_needs_command' -a test -d "Run the project's tests."
-complete -f -c lein -n '__fish_lein_needs_command' -a trampoline -d "Run a task without nesting the project's JVM inside Leiningen's."
-complete -f -c lein -n '__fish_lein_needs_command' -a uberjar -d "Package up the project files and all dependencies into a jar file."
-complete -f -c lein -n '__fish_lein_needs_command' -a update-in -d "Perform arbitrary transformations on your project map."
-complete -f -c lein -n '__fish_lein_needs_command' -a upgrade -d "Upgrade Leiningen to specified version or latest stable."
-complete -f -c lein -n '__fish_lein_needs_command' -a version -d "Print version for Leiningen and the current JVM."
-complete -f -c lein -n '__fish_lein_needs_command' -a with-profile -d "Apply the given task with the profile(s) specified."
\ No newline at end of file
+complete -f -c lein -n __fish_lein_needs_command -a check -d "Check syntax and warn on reflection."
+complete -f -c lein -n __fish_lein_needs_command -a classpath -d "Write the classpath of the current project to output-file."
+complete -f -c lein -n __fish_lein_needs_command -a clean -d "Remove all files from project's target-path."
+complete -f -c lein -n __fish_lein_needs_command -a compile -d "Compile Clojure source into .class files."
+complete -f -c lein -n __fish_lein_needs_command -a deploy -d "Build jar and deploy to remote repository."
+complete -f -c lein -n __fish_lein_needs_command -a deps -d "Show details about dependencies."
+complete -f -c lein -n __fish_lein_needs_command -a do -d "Higher-order task to perform other tasks in succession."
+complete -f -c lein -n __fish_lein_needs_command -a help -d "Display a list of tasks or help for a given task or subtask."
+complete -f -c lein -n __fish_lein_needs_command -a install -d "Install current project to the local repository."
+complete -f -c lein -n __fish_lein_needs_command -a jar -d "Package up all the project's files into a jar file."
+complete -f -c lein -n __fish_lein_needs_command -a javac -d "Compile Java source files."
+complete -f -c lein -n __fish_lein_needs_command -a light -d "Start a Light Table client for this project"
+complete -f -c lein -n __fish_lein_needs_command -a new -d "Generate scaffolding for a new project based on a template."
+complete -f -c lein -n __fish_lein_needs_command -a plugin -d "DEPRECATED. Please use the :user profile instead."
+complete -f -c lein -n __fish_lein_needs_command -a pom -d "Write a pom.xml file to disk for Maven interoperability."
+complete -f -c lein -n __fish_lein_needs_command -a repl -d "Start a repl session either with the current project or standalone."
+complete -f -c lein -n __fish_lein_needs_command -a retest -d "Run only the test namespaces which failed last time around."
+complete -f -c lein -n __fish_lein_needs_command -a run -d "Run the project's -main function."
+complete -f -c lein -n __fish_lein_needs_command -a search -d "Search remote maven repositories for matching jars."
+complete -f -c lein -n __fish_lein_needs_command -a show-profiles -d "List all available profiles or display one if given an argument."
+complete -f -c lein -n __fish_lein_needs_command -a test -d "Run the project's tests."
+complete -f -c lein -n __fish_lein_needs_command -a trampoline -d "Run a task without nesting the project's JVM inside Leiningen's."
+complete -f -c lein -n __fish_lein_needs_command -a uberjar -d "Package up the project files and all dependencies into a jar file."
+complete -f -c lein -n __fish_lein_needs_command -a update-in -d "Perform arbitrary transformations on your project map."
+complete -f -c lein -n __fish_lein_needs_command -a upgrade -d "Upgrade Leiningen to specified version or latest stable."
+complete -f -c lein -n __fish_lein_needs_command -a version -d "Print version for Leiningen and the current JVM."
+complete -f -c lein -n __fish_lein_needs_command -a with-profile -d "Apply the given task with the profile(s) specified."
\ No newline at end of file
diff --git a/share/completions/locate.fish b/share/completions/locate.fish
index 2a1c821ac..93a68b8f5 100644
--- a/share/completions/locate.fish
+++ b/share/completions/locate.fish
@@ -1,17 +1,17 @@
 
-complete -c locate -s A -l 'all' -d 'Match all non-option arguments'
-complete -c locate -s b -l 'basename' -d 'Match against the base name of the file'
-complete -c locate -s c -l 'count' -d 'Print only the number of matches found'
-complete -c locate -s d -l 'database' -r -d 'Use different DATABASE file[s]'
-complete -c locate -s e -l 'existing' -d 'Match only existing files'
-complete -c locate -s L -l 'follow' -d 'Consider broken symbolic links to be non-existing files'
-complete -c locate -s P -l 'nofollow' -d 'Treat broken symbolic links as if they were existing'
-complete -c locate -s H -l 'nofollow' -d 'Treat broken symbolic links as if they were existing'
-complete -c locate -s i -l 'ignore-case' -d 'Ignore case distinctions'
-complete -c locate -s l -l 'limit' -r -d 'Limit  the number of matches'
-complete -c locate -s 0 -l 'null' -d 'Use ASCII NUL as a separator'
-complete -c locate -s S -l 'statistics' -d 'Print statistics about databases and exit'
-complete -c locate -s w -l 'wholename' -d 'Match against the whole name of the file'
-complete -c locate -s r -l 'regex' -d 'The pattern is a regular expression'
-complete -c locate -s h -l 'help' -d 'Print a summary of the options and exit'
-complete -c locate -s V -l 'version' -d 'Print the version number and exit'
+complete -c locate -s A -l all -d 'Match all non-option arguments'
+complete -c locate -s b -l basename -d 'Match against the base name of the file'
+complete -c locate -s c -l count -d 'Print only the number of matches found'
+complete -c locate -s d -l database -r -d 'Use different DATABASE file[s]'
+complete -c locate -s e -l existing -d 'Match only existing files'
+complete -c locate -s L -l follow -d 'Consider broken symbolic links to be non-existing files'
+complete -c locate -s P -l nofollow -d 'Treat broken symbolic links as if they were existing'
+complete -c locate -s H -l nofollow -d 'Treat broken symbolic links as if they were existing'
+complete -c locate -s i -l ignore-case -d 'Ignore case distinctions'
+complete -c locate -s l -l limit -r -d 'Limit  the number of matches'
+complete -c locate -s 0 -l null -d 'Use ASCII NUL as a separator'
+complete -c locate -s S -l statistics -d 'Print statistics about databases and exit'
+complete -c locate -s w -l wholename -d 'Match against the whole name of the file'
+complete -c locate -s r -l regex -d 'The pattern is a regular expression'
+complete -c locate -s h -l help -d 'Print a summary of the options and exit'
+complete -c locate -s V -l version -d 'Print the version number and exit'
diff --git a/share/completions/lua.fish b/share/completions/lua.fish
index 046fbaa9b..1edb4de64 100644
--- a/share/completions/lua.fish
+++ b/share/completions/lua.fish
@@ -6,4 +6,4 @@ complete -c lua -s i -d 'Enter interactive mode after executing script'
 complete -c lua -s v -d 'Show version'
 complete -c lua -s h -l help -d 'Print help and exit'
 complete -c lua -a "(__fish_complete_suffix .lua)"
-complete -c lua -a '-' -d 'Execute stdin and stop handling options'
+complete -c lua -a - -d 'Execute stdin and stop handling options'
diff --git a/share/completions/lunchy.fish b/share/completions/lunchy.fish
index 954cf9bf8..73bedecc7 100644
--- a/share/completions/lunchy.fish
+++ b/share/completions/lunchy.fish
@@ -28,16 +28,16 @@ end
 complete -f -c lunchy -s v -l verbose -d 'Show command executions'
 
 # Commands
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a install -d 'Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a 'ls list' -d 'Show the list of installed agents'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a start -d 'Start the first matching agent'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a stop -d 'Stop the first matching agent'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a restart -d 'Stop and start the first matching agent'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a status -d 'Show the PID and label for all agents'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a edit -d 'Opens the launchctl daemon file in the default editor'
+complete -f -c lunchy -n __fish_lunchy_needs_command -a install -d 'Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents'
+complete -f -c lunchy -n __fish_lunchy_needs_command -a 'ls list' -d 'Show the list of installed agents'
+complete -f -c lunchy -n __fish_lunchy_needs_command -a start -d 'Start the first matching agent'
+complete -f -c lunchy -n __fish_lunchy_needs_command -a stop -d 'Stop the first matching agent'
+complete -f -c lunchy -n __fish_lunchy_needs_command -a restart -d 'Stop and start the first matching agent'
+complete -f -c lunchy -n __fish_lunchy_needs_command -a status -d 'Show the PID and label for all agents'
+complete -f -c lunchy -n __fish_lunchy_needs_command -a edit -d 'Opens the launchctl daemon file in the default editor'
 
 # Commands with service completion
-complete -f -c lunchy -n '__fish_lunchy_using_command ls list start stop restart status edit' -a '(lunchy ls)' -d 'Service'
+complete -f -c lunchy -n '__fish_lunchy_using_command ls list start stop restart status edit' -a '(lunchy ls)' -d Service
 
 # Command: start
 complete -f -c lunchy -n '__fish_lunchy_using_command start' -s w -l write -d 'Persist command'
diff --git a/share/completions/lxc.fish b/share/completions/lxc.fish
index 184e4e40c..1e1a3e238 100644
--- a/share/completions/lxc.fish
+++ b/share/completions/lxc.fish
@@ -11,32 +11,32 @@ function __fish_lxc_list_containers
     lxc list -c n | string match -r '\| [a-zA-Z_-]+' | string replace -r '\| ' ''
 end
 
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments config -d 'Manage configuration.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments copy -d 'Copy containers within or in between lxd instances.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments delete -d 'Delete containers or snapshots.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments exec -d 'Execute the specified command in a container.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments file -d 'Manage files on a container.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments finger -d 'Check if the LXD instance is up.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments help -d 'Print help.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments image -d 'Manipulate container images.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments info -d 'List information on LXD servers and containers.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments init -d 'Initialize a container from a particular image.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments launch -d 'Launch a container from a particular image.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments list -d 'Lists the available resources.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments manpage -d 'Prints all the subcommands help.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments monitor -d 'Monitor activity on the LXD server.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments move -d 'Move containers within or in between lxd instances.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments network -d 'Manage networks.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments pause -d 'Changes state of one or more containers to pause.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments profile -d 'Manage configuration profiles.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments publish -d 'Publish containers as images.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments remote -d 'Manage remote LXD servers.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments restart -d 'Changes state of one or more containers to restart.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments restore -d 'Set the current state of a container back to a snapshot.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments snapshot -d 'Create a read-only snapshot of a container.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments start -d 'Changes state of one or more containers to start.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments stop -d 'Changes state of one or more containers to stop.'
-complete --condition '__fish_lxc_no_subcommand' --command lxc --no-files --arguments version -d 'Prints the version number of this client tool.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments config -d 'Manage configuration.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments copy -d 'Copy containers within or in between lxd instances.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments delete -d 'Delete containers or snapshots.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments exec -d 'Execute the specified command in a container.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments file -d 'Manage files on a container.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments finger -d 'Check if the LXD instance is up.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments help -d 'Print help.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments image -d 'Manipulate container images.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments info -d 'List information on LXD servers and containers.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments init -d 'Initialize a container from a particular image.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments launch -d 'Launch a container from a particular image.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments list -d 'Lists the available resources.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments manpage -d 'Prints all the subcommands help.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments monitor -d 'Monitor activity on the LXD server.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments move -d 'Move containers within or in between lxd instances.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments network -d 'Manage networks.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments pause -d 'Changes state of one or more containers to pause.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments profile -d 'Manage configuration profiles.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments publish -d 'Publish containers as images.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments remote -d 'Manage remote LXD servers.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments restart -d 'Changes state of one or more containers to restart.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments restore -d 'Set the current state of a container back to a snapshot.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments snapshot -d 'Create a read-only snapshot of a container.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments start -d 'Changes state of one or more containers to start.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments stop -d 'Changes state of one or more containers to stop.'
+complete --condition __fish_lxc_no_subcommand --command lxc --no-files --arguments version -d 'Prints the version number of this client tool.'
 
 # config
 complete --condition '__fish_seen_subcommand_from config' --command lxc --no-files --arguments "device get set unset show edit trust"
diff --git a/share/completions/lz4.fish b/share/completions/lz4.fish
index 3bd35ef58..de2dc221c 100644
--- a/share/completions/lz4.fish
+++ b/share/completions/lz4.fish
@@ -1,7 +1,7 @@
 # Completions for lz4
 
 complete -c lz4 -s z -l compress -d "Compress (default)"
-complete -c lz4 -s d -l decompress -l uncompress -d "Decompress" -x -a "
+complete -c lz4 -s d -l decompress -l uncompress -d Decompress -x -a "
 (
     __fish_complete_suffix .lz4
 )
diff --git a/share/completions/machinectl.fish b/share/completions/machinectl.fish
index 847477b17..40bac091e 100644
--- a/share/completions/machinectl.fish
+++ b/share/completions/machinectl.fish
@@ -43,65 +43,65 @@ complete -f -c machinectl -l no-legend -d 'Do not print header and footer'
 complete -f -c machinectl -l no-ask-password -d "Don't ask for password for privileged operations" # might only be valid for certain commands, manpage is vague
 
 # Machine commands
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "list" -d "List running machines"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "list-images" -d "List startable machine images"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a list -d "List running machines"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a list-images -d "List startable machine images"
 complete -f -c machinectl -n "__fish_seen_subcommand_from list-images" -s a -l all -d "Also show machines starting with a '.'"
 
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "status" -d "Show information about machine"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a status -d "Show information about machine"
 complete -f -c machinectl -n "__fish_seen_subcommand_from status" -s l -l full -d "Do not ellipsize process tree entries"
 complete -x -c machinectl -n "__fish_seen_subcommand_from status" -s n -l lines -d "How many journal lines to show"
 complete -x -c machinectl -n "__fish_seen_subcommand_from status" -s o -l output -d "Formatting of journal output" -a \
     'short short-iso short-precise short-monotonic verbose export json json-pretty json-sse cat'
 
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "show" -d "Show properties of machines"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a show -d "Show properties of machines"
 complete -x -c machinectl -n "__fish_seen_subcommand_from show" -s p -l property -d "Limit to certain properties"
 complete -f -c machinectl -n "__fish_seen_subcommand_from show" -s a -l all -d "Show all properties, even if not set"
 
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "start" -d "Start machine"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "login" -d "Login to a machine"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "enable" -d "Enable machine to start at boot"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "disable" -d "Disable machine from starting at boot"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "poweroff" -d "Poweroff machine"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "reboot" -d "Reboot machine"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "terminate" -d "Terminate machine (without shutting down)"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a start -d "Start machine"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a login -d "Login to a machine"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a enable -d "Enable machine to start at boot"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a disable -d "Disable machine from starting at boot"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a poweroff -d "Poweroff machine"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a reboot -d "Reboot machine"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a terminate -d "Terminate machine (without shutting down)"
 
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "kill" -d "Send signal to process in a machine"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a kill -d "Send signal to process in a machine"
 complete -x -c machinectl -n "__fish_seen_subcommand_from kill" -l kill-who -d "Choose who to send the signal to" -a 'leader all'
 __fish_make_completion_signals
 complete -x -c machinectl -n "__fish_seen_subcommand_from kill" -s s -l signal -d "Signal to send" -a "$__kill_signals"
 
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "bind" -d "Bind-mount a directory to a machine"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a bind -d "Bind-mount a directory to a machine"
 complete -f -c machinectl -n "__fish_seen_subcommand_from bind" -l mkdir -d "Create destination directory"
 complete -f -c machinectl -n "__fish_seen_subcommand_from bind" -l read-only -d "Apply read-only mount"
 
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "copy-to" -d "Copy file or directory to a machine"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "copy-from" -d "Copy file or directory from a machine"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a copy-to -d "Copy file or directory to a machine"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a copy-from -d "Copy file or directory from a machine"
 
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "shell" -d "Open a shell on a machine"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a shell -d "Open a shell on a machine"
 
 # Image commands
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "list-images" -d "Show a list of locally installed machines"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "image-status" -d "Show information about machine images (human-readable)"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "show-image" -d "Show properties of machine images (machine-readable)"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "clone" -d "Clone a machine image"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "rename" -d "Rename a machine image"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "read-only" -d "Mark or unmark machine image as read-only"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "remove" -d "Remove machine images"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "set-limit" -d "Set size limit for machine image"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a list-images -d "Show a list of locally installed machines"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a image-status -d "Show information about machine images (human-readable)"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a show-image -d "Show properties of machine images (machine-readable)"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a clone -d "Clone a machine image"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a rename -d "Rename a machine image"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a read-only -d "Mark or unmark machine image as read-only"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a remove -d "Remove machine images"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a set-limit -d "Set size limit for machine image"
 
 # Image transfer commands
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "pull-tar" -d "Download a .tar container image"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "pull-raw" -d "Download a .raw container image"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "pull-dkr" -d "Download a .dkr container image"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "import-tar" -d "Import a .tar container image"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "import-raw" -d "Import a .raw container image"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "export-tar" -d "Export a .tar container image"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "export-raw" -d "Export a .raw container image"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a pull-tar -d "Download a .tar container image"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a pull-raw -d "Download a .raw container image"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a pull-dkr -d "Download a .dkr container image"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a import-tar -d "Import a .tar container image"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a import-raw -d "Import a .raw container image"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a export-tar -d "Export a .tar container image"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a export-raw -d "Export a .raw container image"
 complete -f -c machinectl -n "__fish_seen_subcommand_from export-tar export-raw" -l format -d "Specify compression format" -a 'uncompressed xz gzip bzip2'
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "list-transfers" -d "Show running downloads, imports and exports"
-complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "cancel-transfers" -d "Abort running downloads, imports or exports"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a list-transfers -d "Show running downloads, imports and exports"
+complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a cancel-transfers -d "Abort running downloads, imports or exports"
 complete -x -c machinectl -n "__fish_seen_subcommand_from pull-{tar,raw}" -l verify -a 'no checksum signature' -d "Verify image with specified method"
-complete -x -c machinectl -n "__fish_seen_subcommand_from pull-dkr" -l verify -a 'no' -d "Verify image (not available for dkr)"
+complete -x -c machinectl -n "__fish_seen_subcommand_from pull-dkr" -l verify -a no -d "Verify image (not available for dkr)"
 complete -x -c machinectl -n "__fish_seen_subcommand_from pull-dkr" -l dkr-index-url -d "Specify index server"
 complete -f -c machinectl -n "__fish_seen_subcommand_from pull-{tar,raw,dkr}" -l force -d "Overwrite existing machine image"
 
diff --git a/share/completions/magento.fish b/share/completions/magento.fish
index ee853377c..e76018698 100644
--- a/share/completions/magento.fish
+++ b/share/completions/magento.fish
@@ -18,7 +18,7 @@ function __fish_print_magento_modules -d "Lists all Magento modules"
     set -l modules (magento module:status)
 
     for i in $test
-        if test -n "$i" -a "$i" != "None"
+        if test -n "$i" -a "$i" != None
             echo $i
         end
     end
@@ -215,7 +215,7 @@ end
 #########################################################
 
 function __fish_magento_register_command -d "Adds a completion for a specific command"
-    complete -c magento -n "__fish_magento_not_in_command" -a $argv[1] $argv[2..-1]
+    complete -c magento -n __fish_magento_not_in_command -a $argv[1] $argv[2..-1]
 end
 
 #########################################################
@@ -346,11 +346,11 @@ __fish_magento_register_command_option list -f -l format -a "(__fish_print_magen
 #
 # admin:user:create
 #
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-user" -f -a "--admin-user" -d "(Required) Admin user"
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-password" -f -a "--admin-password" -d "(Required) Admin password"
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-email" -f -a "--admin-email" -d "(Required) Admin email"
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-firstname" -f -a "--admin-firstname" -d "(Required) Admin first name"
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-lastname" -f -a "--admin-lastname" -d "(Required) Admin last name"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-user" -f -a --admin-user -d "(Required) Admin user"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-password" -f -a --admin-password -d "(Required) Admin password"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-email" -f -a --admin-email -d "(Required) Admin email"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-firstname" -f -a --admin-firstname -d "(Required) Admin first name"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-lastname" -f -a --admin-lastname -d "(Required) Admin last name"
 __fish_magento_register_command_option admin:user:create -f -r -l admin-user -d "(Required) Admin user"
 __fish_magento_register_command_option admin:user:create -f -r -l admin-password -d "(Required) Admin password"
 __fish_magento_register_command_option admin:user:create -f -r -l admin-email -d "(Required) Admin email"
@@ -524,11 +524,11 @@ __fish_magento_register_command_option setup:config:set -f -l http-cache-hosts -
 #
 # setup:install
 #
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-user" -f -a "--admin-user" -d "(Required) Admin user"
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-password" -f -a "--admin-password" -d "(Required) Admin password"
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-email" -f -a "--admin-email" -d "(Required) Admin email"
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-firstname" -f -a "--admin-firstname" -d "(Required) Admin first name"
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-lastname" -f -a "--admin-lastname" -d "(Required) Admin last name"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-user" -f -a --admin-user -d "(Required) Admin user"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-password" -f -a --admin-password -d "(Required) Admin password"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-email" -f -a --admin-email -d "(Required) Admin email"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-firstname" -f -a --admin-firstname -d "(Required) Admin first name"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-lastname" -f -a --admin-lastname -d "(Required) Admin last name"
 __fish_magento_register_command_option setup:install -f -l backend-frontname -d "Backend frontname (will be autogenerated if missing)"
 __fish_magento_register_command_option setup:install -f -l key -d "Encryption key"
 __fish_magento_register_command_option setup:install -f -l session-save -d "Session save handler"
diff --git a/share/completions/make.fish b/share/completions/make.fish
index 11d425924..bc92ed668 100644
--- a/share/completions/make.fish
+++ b/share/completions/make.fish
@@ -47,8 +47,8 @@ end
 # This completion reenables file completion on
 # assignments, so e.g. 'make foo FILES=<tab>' will receive standard
 # filename completion.
-complete -c make -n 'commandline -ct | string match -q "*=*"' -a "(__fish_complete_make_targets (commandline -c))" -d "Target"
-complete -f -c make -n 'commandline -ct | not string match -q "*=*"' -a "(__fish_complete_make_targets (commandline -c))" -d "Target"
+complete -c make -n 'commandline -ct | string match -q "*=*"' -a "(__fish_complete_make_targets (commandline -c))" -d Target
+complete -f -c make -n 'commandline -ct | not string match -q "*=*"' -a "(__fish_complete_make_targets (commandline -c))" -d Target
 complete -c make -s f -d "Use file as makefile" -r
 complete -x -c make -s C -l directory -x -a "(__fish_complete_directories (commandline -ct))" -d "Change directory"
 complete -c make -s d -d "Debug mode"
diff --git a/share/completions/makedepend.fish b/share/completions/makedepend.fish
index f5455b8e1..e3162843d 100644
--- a/share/completions/makedepend.fish
+++ b/share/completions/makedepend.fish
@@ -1,4 +1,4 @@
-complete -c makedepend -s D -r -d "Define"
+complete -c makedepend -s D -r -d Define
 complete -c makedepend -s I -r -d "Include directory"
 complete -c makedepend -s Y -r -d "Replace include directories"
 complete -c makedepend -s a -d "Append dependencies to makefile"
diff --git a/share/completions/makepkg.fish b/share/completions/makepkg.fish
index 11e8d548e..48d846ebd 100644
--- a/share/completions/makepkg.fish
+++ b/share/completions/makepkg.fish
@@ -1,40 +1,40 @@
-complete -c makepkg -s A -l 'ignorearch' -d 'Ignore missing or incomplete arch field'
-complete -c makepkg -s c -l 'clean' -d 'Clean up work files after build'
-complete -c makepkg -l 'config' -d 'Use alternate config <file>'
-complete -c makepkg -s d -l 'nodeps' -d 'Do not perform dependency checks'
-complete -c makepkg -s e -l 'noextract' -d 'Do not extract source files'
-complete -c makepkg -l 'verifysource' -d 'Only perform integrity checks'
-complete -c makepkg -s f -l 'force' -d 'Force rebuild of the package'
-complete -c makepkg -s g -l 'geninteg' -d 'Generate integrity checks'
-complete -c makepkg -l 'skipinteg' -d 'Do not perform integrity checks'
-complete -c makepkg -l 'skipchecksums' -d 'Do not verify checksums'
-complete -c makepkg -l 'skippgpcheck' -d 'Do not verify PGP signatures'
-complete -c makepkg -s h -l 'help' -d 'Display syntax and command line options'
-complete -c makepkg -l 'holdver' -d 'No automatic bump of pkgver'
-complete -c makepkg -s i -l 'install' -d 'Install the package after build'
-complete -c makepkg -s L -l 'log' -d 'Enable makepkg build logging'
-complete -c makepkg -s m -l 'nocolor' -d 'Disable color in output messages'
-complete -c makepkg -s o -l 'nobuild' -d 'Only download and extract files'
+complete -c makepkg -s A -l ignorearch -d 'Ignore missing or incomplete arch field'
+complete -c makepkg -s c -l clean -d 'Clean up work files after build'
+complete -c makepkg -l config -d 'Use alternate config <file>'
+complete -c makepkg -s d -l nodeps -d 'Do not perform dependency checks'
+complete -c makepkg -s e -l noextract -d 'Do not extract source files'
+complete -c makepkg -l verifysource -d 'Only perform integrity checks'
+complete -c makepkg -s f -l force -d 'Force rebuild of the package'
+complete -c makepkg -s g -l geninteg -d 'Generate integrity checks'
+complete -c makepkg -l skipinteg -d 'Do not perform integrity checks'
+complete -c makepkg -l skipchecksums -d 'Do not verify checksums'
+complete -c makepkg -l skippgpcheck -d 'Do not verify PGP signatures'
+complete -c makepkg -s h -l help -d 'Display syntax and command line options'
+complete -c makepkg -l holdver -d 'No automatic bump of pkgver'
+complete -c makepkg -s i -l install -d 'Install the package after build'
+complete -c makepkg -s L -l log -d 'Enable makepkg build logging'
+complete -c makepkg -s m -l nocolor -d 'Disable color in output messages'
+complete -c makepkg -s o -l nobuild -d 'Only download and extract files'
 complete -c makepkg -s p -d 'Use alternative <buildscript>'
-complete -c makepkg -s r -l 'rmdeps' -d 'Remove installed deps after build'
-complete -c makepkg -s R -l 'repackage' -d 'Repackage without rebuilding'
-complete -c makepkg -s s -l 'syncdeps' -d 'Install missing dependencies'
-complete -c makepkg -s S -l 'source' -d 'Build a source-only tarball for AUR'
-complete -c makepkg -s V -l 'version' -d 'Display the version and exit'
-complete -c makepkg -s C -l 'cleanbuild' -d 'Remove the srcdir before building the package'
-complete -c makepkg -l 'allsource' -d 'Build a source-only GPL tarball for AUR'
-complete -c makepkg -l 'pkg' -d 'Only build <packages> from a split package'
-complete -c makepkg -l 'check' -d 'Run the check function in the PKGBUILD'
-complete -c makepkg -l 'noarchive' -d 'Do not create the archive'
-complete -c makepkg -l 'nocheck' -d 'Do not run the check function in the PKGBUILD'
-complete -c makepkg -l 'sign' -d 'Sign the resulting package with gpg'
-complete -c makepkg -l 'nosign' -d 'Do not create a signature for the package'
-complete -c makepkg -l 'key' -d 'Specify a <key> to use when signing'
-complete -c makepkg -l 'noconfirm' -d 'Passed to pacman: Do not ask for confirmation'
-complete -c makepkg -l 'needed' -d 'Passed to pacman: Only install what is needed'
-complete -c makepkg -l 'asdeps' -d 'Passed to pacman: Install as dependencies'
-complete -c makepkg -l 'noprogressbar' -d 'Passed to pacman: Do not display a progress bar'
+complete -c makepkg -s r -l rmdeps -d 'Remove installed deps after build'
+complete -c makepkg -s R -l repackage -d 'Repackage without rebuilding'
+complete -c makepkg -s s -l syncdeps -d 'Install missing dependencies'
+complete -c makepkg -s S -l source -d 'Build a source-only tarball for AUR'
+complete -c makepkg -s V -l version -d 'Display the version and exit'
+complete -c makepkg -s C -l cleanbuild -d 'Remove the srcdir before building the package'
+complete -c makepkg -l allsource -d 'Build a source-only GPL tarball for AUR'
+complete -c makepkg -l pkg -d 'Only build <packages> from a split package'
+complete -c makepkg -l check -d 'Run the check function in the PKGBUILD'
+complete -c makepkg -l noarchive -d 'Do not create the archive'
+complete -c makepkg -l nocheck -d 'Do not run the check function in the PKGBUILD'
+complete -c makepkg -l sign -d 'Sign the resulting package with gpg'
+complete -c makepkg -l nosign -d 'Do not create a signature for the package'
+complete -c makepkg -l key -d 'Specify a <key> to use when signing'
+complete -c makepkg -l noconfirm -d 'Passed to pacman: Do not ask for confirmation'
+complete -c makepkg -l needed -d 'Passed to pacman: Only install what is needed'
+complete -c makepkg -l asdeps -d 'Passed to pacman: Install as dependencies'
+complete -c makepkg -l noprogressbar -d 'Passed to pacman: Do not display a progress bar'
 
 # Since pacman 5
-complete -c makepkg -l 'packagelist' -d 'List all packages that would be built'
-complete -c makepkg -l 'printsrcinfo' -d 'Print SRCINFO to stdout'
+complete -c makepkg -l packagelist -d 'List all packages that would be built'
+complete -c makepkg -l printsrcinfo -d 'Print SRCINFO to stdout'
diff --git a/share/completions/man.fish b/share/completions/man.fish
index c7134ac91..a3ed418b0 100644
--- a/share/completions/man.fish
+++ b/share/completions/man.fish
@@ -17,12 +17,12 @@ complete -xc man -n 'not __fish_complete_man' -a p
 complete -xc man -n 'not __fish_complete_man' -a o -d 'Old section'
 
 complete -rc man -s C -d "Configuration file"
-complete -xc man -s M -a "(__fish_complete_directories (commandline -ct))" -d "Manpath"
-complete -rc man -s P -d "Pager"
+complete -xc man -s M -a "(__fish_complete_directories (commandline -ct))" -d Manpath
+complete -rc man -s P -d Pager
 complete -xc man -s S -d "Manual sections"
 complete -c man -s a -d "Display all matches"
 complete -c man -s c -d "Always reformat"
-complete -c man -s d -d "Debug"
+complete -c man -s d -d Debug
 complete -c man -s D -d "Debug and run"
 complete -c man -s f -d "Show whatis information"
 complete -c man -s F -l preformat -d "Format only"
@@ -30,7 +30,7 @@ complete -c man -s h -d "Display help and exit"
 complete -c man -s k -d "Show apropos information"
 complete -c man -s K -d "Search in all man pages"
 complete -xc man -s m -d "Set system"
-complete -xc man -s p -d "Preprocessors"
+complete -xc man -s p -d Preprocessors
 complete -c man -s t -d "Format for printing"
 complete -c man -s w -l path -d "Only print locations"
 complete -c man -s W -d "Only print locations"
diff --git a/share/completions/mdadm.fish b/share/completions/mdadm.fish
index 98d0cfcaf..bf417b446 100644
--- a/share/completions/mdadm.fish
+++ b/share/completions/mdadm.fish
@@ -44,43 +44,43 @@ function __fish_mdadm_level_options
 end
 
 function __fish_mdadm_layout_options # To be clarified
-    echo -e "left-asymmetric"
-    echo -e "left-symmetric"
-    echo -e "right-asymmetric"
-    echo -e "right-symmetric"
+    echo -e left-asymmetric
+    echo -e left-symmetric
+    echo -e right-asymmetric
+    echo -e right-symmetric
     echo -e "la\tAlias of left-asymmetric"
     echo -e "ra\tAlias of right-asymmetric"
     echo -e "ls\tAlias of left-symmetric"
     echo -e "rs\tAlias of right-symmetric"
-    echo -e "parity-first"
-    echo -e "parity-last"
-    echo -e "ddf-zero-restart"
-    echo -e "ddf-N-restart"
-    echo -e "ddf-N-continue"
-    echo -e "left-symmetric-6"
-    echo -e "right-symmetric-6"
-    echo -e "left-asymmetric-6"
-    echo -e "right-asymmetric-6"
-    echo -e "parity-first-6"
-    echo -e "write-transient"
+    echo -e parity-first
+    echo -e parity-last
+    echo -e ddf-zero-restart
+    echo -e ddf-N-restart
+    echo -e ddf-N-continue
+    echo -e left-symmetric-6
+    echo -e right-symmetric-6
+    echo -e left-asymmetric-6
+    echo -e right-asymmetric-6
+    echo -e parity-first-6
+    echo -e write-transient
     echo -e "wt\tAlias of write-transient"
-    echo -e "read-transient"
+    echo -e read-transient
     echo -e "rt\tAlias of read-transient"
-    echo -e "write-persistent"
+    echo -e write-persistent
     echo -e "wp\tAlias of write-persistent"
-    echo -e "read-persistent"
+    echo -e read-persistent
     echo -e "rp\tAlias of read-persistent"
-    echo -e "write-all"
-    echo -e "read-fixable"
+    echo -e write-all
+    echo -e read-fixable
     echo -e "rf\tAlias of read-fixable"
-    echo -e "clear"
-    echo -e "flush"
-    echo -e "none"
-    echo -e "n"
-    echo -e "o"
-    echo -e "f"
-    echo -e "normalise"
-    echo -e "preserve"
+    echo -e clear
+    echo -e flush
+    echo -e none
+    echo -e n
+    echo -e o
+    echo -e f
+    echo -e normalise
+    echo -e preserve
 end
 
 function __fish_mdadm_level_options
@@ -132,7 +132,7 @@ complete -c mdadm -s q -l quiet -d "Be quiet"
 complete -c mdadm -s f -l force -d "Force operation"
 complete -c mdadm -s c -l config -r -d "Specify config file or directory"
 complete -c mdadm -s s -l scan -d "Scan for missing information"
-complete -c mdadm -s e -l metadata -a "__fish_mdadm_metadata_options" -x -d "Set metadata style to use"
+complete -c mdadm -s e -l metadata -a __fish_mdadm_metadata_options -x -d "Set metadata style to use"
 complete -c mdadm -l homehost -x -d "Provide home host identity"
 complete -c mdadm -l prefer -x -d "Give name format preference"
 complete -c mdadm -l home-cluster -x -d "Give cluster name"
@@ -142,8 +142,8 @@ complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -s z
 complete -c mdadm -n '__fish_contains_opt -s G grow' -s Z -l array-size -x -d "Specify the size made available on the array"
 complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -s c -l chunk -x -d "Specify the chunk size"
 complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -l rounding -x -d "Specify rounding factor"
-complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -s l -l level -a "__fish_mdadm_level_options" -x -d "Specify RAID level"
-complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -s p -l layout -l parity -a "__fish_mdadm_layout_options" -x -d "Specify data layout"
+complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -s l -l level -a __fish_mdadm_level_options -x -d "Specify RAID level"
+complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -s p -l layout -l parity -a __fish_mdadm_layout_options -x -d "Specify data layout"
 complete -c mdadm -n '__fish_contains_opt -s A assemble -s B build -s C create -s G grow' -s b -l bitmap -r -d "Specify file for write-intent bitmap"
 complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -l bitmap-chunk -x -d "Specify chunksize of bitmap"
 complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow -s a add' -s W -l write-mostly -d "Prefer reading from other devices than these"
@@ -156,7 +156,7 @@ complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -l d
 complete -c mdadm -n '__fish_contains_opt -s G grow' -l continue -d "Resume frozen --grow command"
 complete -c mdadm -n '__fish_contains_opt -s A assemble -s B build -s C create' -s N -l name -x -d "Set array name"
 complete -c mdadm -n '__fish_contains_opt -s A assemble -s B build -s C create -s I incremental; or __fish_not_contain_opt -s F follow monitor -s G grow' -s R -l run -d "Run array despite warnings"
-complete -c mdadm -n '__fish_contains_opt -s A assemble -s B build -s C create' -s a -l auto -l level -a "__fish_mdadm_level_options" -x -d "Give instruction for device file" # May be improved with device numbers management
+complete -c mdadm -n '__fish_contains_opt -s A assemble -s B build -s C create' -s a -l auto -l level -a __fish_mdadm_level_options -x -d "Give instruction for device file" # May be improved with device numbers management
 complete -c mdadm -n '__fish_contains_opt -s A assemble -s G grow' -s a -l add -d "Add devices to array"
 complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -l nodes -d "Specify max nodes in the cluster"
 complete -c mdadm -n '__fish_contains_opt -s B build -s C create -s G grow' -l write-journal -d "Specify journal device for RAID-4/5/6 array"
@@ -164,7 +164,7 @@ complete -c mdadm -n '__fish_contains_opt -s A assemble' -s u -l uuid -x -d "UUI
 complete -c mdadm -n '__fish_contains_opt -s A assemble' -s m -l super-minor -x -d "Minor number of array device"
 complete -c mdadm -n '__fish_contains_opt -s A assemble; and __fish_contains_opt -s s scan' -l no-degraded -d "Refuse to start without all drives"
 complete -c mdadm -n '__fish_contains_opt -s A assemble' -l invalid-backup -d "Do not ask for backup file, unavailable"
-complete -c mdadm -n '__fish_contains_opt -s A assemble' -s U -l update -a "__fish_mdadm_update_options" -x -d "Update superblock properties"
+complete -c mdadm -n '__fish_contains_opt -s A assemble' -s U -l update -a __fish_mdadm_update_options -x -d "Update superblock properties"
 complete -c mdadm -n '__fish_contains_opt -s A assemble' -l freeze-reshape -d "Freeze --grow command"
 complete -c mdadm -n '__fish_contains_opt -s F follow monitor; or __fish_not_contain_opt -s A assemble -s B build -s C create -s G grow -s I incremental auto-detect' -s t -l test -d "Test mode" # To be clarified
 complete -c mdadm -n '__fish_contains_opt -s G grow; or __fish_not_contain_opt -s A assemble -s B build -s C create -s F follow monitor -s I incremental auto-detect' -s a -l add -d "Hot-add listed devices"
@@ -191,7 +191,7 @@ complete -c mdadm -n '__fish_not_contain_opt -s A assemble -s B build -s C creat
 complete -c mdadm -n '__fish_not_contain_opt -s A assemble -s B build -s C create -s F follow monitor -s G grow -s I incremental auto-detect' -l update-subarray -r -d "Update subarray" # To be clarified
 complete -c mdadm -n '__fish_not_contain_opt -s A assemble -s B build -s C create -s F follow monitor -s G grow -s I incremental auto-detect' -s W -l wait -d "Wait for pending operations"
 complete -c mdadm -l wait-clean -d "Mark array as clean ASAP"
-complete -c mdadm -n '__fish_not_contain_opt -s A assemble -s B build -s C create -s F follow monitor -s G grow -s I incremental auto-detect' -l action -a "__fish_mdadm_action_options" -x -d "Set sync action for md devices"
+complete -c mdadm -n '__fish_not_contain_opt -s A assemble -s B build -s C create -s F follow monitor -s G grow -s I incremental auto-detect' -l action -a __fish_mdadm_action_options -x -d "Set sync action for md devices"
 complete -c mdadm -n '__fish_contains_opt -s I incremental' -s r -l rebuild-map -d "Rebuild /run/mdadm/map"
 complete -c mdadm -n '__fish_contains_opt -s I incremental; and __fish_contains_opt -s f fail set-faulty' -l path -r -d "Automatically add eventually appearing device to array"
 complete -c mdadm -n '__fish_contains_opt -s F follow monitor' -s m -l mail -x -d "Mail address to send alerts to"
diff --git a/share/completions/meson.fish b/share/completions/meson.fish
index c05fa4e36..6a6bcd3b8 100644
--- a/share/completions/meson.fish
+++ b/share/completions/meson.fish
@@ -37,7 +37,7 @@ for arg in $dir_arguments
     complete -c meson -l "$parts[2]" -d "$parts[3]" -xa '(__fish_complete_directories)'
 end
 
-complete -c meson -s "D" -d "Set value of an option (-D foo=bar)"
+complete -c meson -s D -d "Set value of an option (-D foo=bar)"
 
 complete -c meson -l buildtype -xa 'plain debug debugoptimized release minsize' -d "Set build type [debug]"
 complete -c meson -l layout -xa 'mirror flat' -d "Build directory layout [mirror]"
@@ -49,4 +49,4 @@ complete -c meson -l cross-file -r -d "File describing cross-compilation environ
 complete -c meson -l wrap-mode -xa 'WrapMode.{default,nofallback,nodownload,forcefallback}' -d "Special wrap mode to use"
 
 # final parameter
-complete -c meson -n '__fish_is_first_token' -xa '(__fish_complete_directories)'
+complete -c meson -n __fish_is_first_token -xa '(__fish_complete_directories)'
diff --git a/share/completions/minikube.fish b/share/completions/minikube.fish
index fff7cf999..3977f8170 100644
--- a/share/completions/minikube.fish
+++ b/share/completions/minikube.fish
@@ -78,7 +78,7 @@ function __minikube_config_fields
 end
 
 # Sub-commands
-complete -c minikube -f -n "__minikube_no_command" -a "(__minikube_list_subcommands)"
+complete -c minikube -f -n __minikube_no_command -a "(__minikube_list_subcommands)"
 
 # Shared options
 complete -c minikube -l alsologtostderr -d "Log to standard error as well as files"
@@ -91,75 +91,75 @@ complete -c minikube -l v -s v -d "Log level for logs"
 complete -c minikube -l vmodule -d "Comma-separated list of pattern=N settings for file-filtered logging"
 
 # Sub-command: addons
-complete -c minikube -f -n "__minikube_using_command addons" -a "disable" -d "Disable the addon w/ADDON_NAME within minikube"
-complete -c minikube -f -n "__minikube_using_command addons" -a "enable" -d "Enable the addon w/ADDON_NAME within minikube"
-complete -c minikube -f -n "__minikube_using_command addons" -a "list" -d "List all available minikube addons as well as their current status"
-complete -c minikube -f -n "__minikube_using_command addons" -a "open" -d "Open the addon w/ADDON_NAME within minikube"
+complete -c minikube -f -n "__minikube_using_command addons" -a disable -d "Disable the addon w/ADDON_NAME within minikube"
+complete -c minikube -f -n "__minikube_using_command addons" -a enable -d "Enable the addon w/ADDON_NAME within minikube"
+complete -c minikube -f -n "__minikube_using_command addons" -a list -d "List all available minikube addons as well as their current status"
+complete -c minikube -f -n "__minikube_using_command addons" -a open -d "Open the addon w/ADDON_NAME within minikube"
 
-complete -c minikube -n "__minikube_using_command addons" -l "format" -d "Go template format string for the addon list output"
+complete -c minikube -n "__minikube_using_command addons" -l format -d "Go template format string for the addon list output"
 
-complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from open" -l "format" -d "Format to output addons URL in (default http://{{.IP}}:{{.Port}}"
-complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from open" -l "https" -d "Open the addons URL with https instead of http"
-complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from open" -l "url" -d "Display the kubernetes addons URL instead of opening it"
+complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from open" -l format -d "Format to output addons URL in (default http://{{.IP}}:{{.Port}}"
+complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from open" -l https -d "Open the addons URL with https instead of http"
+complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from open" -l url -d "Display the kubernetes addons URL instead of opening it"
 
-complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from enable" -a "(__minikube_list_addons disabled)" -d "Addon"
-complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from disable" -a "(__minikube_list_addons enabled)" -d "Addon"
-complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from open" -a "(__minikube_list_addons)" -d "Addon"
+complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from enable" -a "(__minikube_list_addons disabled)" -d Addon
+complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from disable" -a "(__minikube_list_addons enabled)" -d Addon
+complete -c minikube -n "__minikube_using_command addons; and __fish_seen_subcommand_from open" -a "(__minikube_list_addons)" -d Addon
 
 # Sub-command: completion
-complete -c minikube -f -n "__minikube_using_command completion" -a "bash" -d "Shell"
+complete -c minikube -f -n "__minikube_using_command completion" -a bash -d Shell
 
 # Sub-command: config
-complete -c minikube -f -n "__minikube_using_command config" -a "get" -d "Gets the value of PROPERTY_NAME from the minikube config file"
-complete -c minikube -f -n "__minikube_using_command config" -a "set" -d "Sets an individual value in a minikube config file"
-complete -c minikube -f -n "__minikube_using_command config" -a "unset" -d "Unsets an individual value in a minikube config file"
-complete -c minikube -f -n "__minikube_using_command config" -a "view" -d "Display values currently set in the minikube config file"
+complete -c minikube -f -n "__minikube_using_command config" -a get -d "Gets the value of PROPERTY_NAME from the minikube config file"
+complete -c minikube -f -n "__minikube_using_command config" -a set -d "Sets an individual value in a minikube config file"
+complete -c minikube -f -n "__minikube_using_command config" -a unset -d "Unsets an individual value in a minikube config file"
+complete -c minikube -f -n "__minikube_using_command config" -a view -d "Display values currently set in the minikube config file"
 
-complete -c minikube -n "__minikube_using_command config; and __fish_seen_subcommand_from get" -a "(__minikube_config_fields)" -d "Property"
-complete -c minikube -n "__minikube_using_command config; and __fish_seen_subcommand_from set" -a "(__minikube_config_fields)" -d "Property"
-complete -c minikube -n "__minikube_using_command config; and __fish_seen_subcommand_from unset" -a "(__minikube_config_fields)" -d "Property"
-complete -c minikube -n "__minikube_using_command config; and __fish_seen_subcommand_from view" -a "(__minikube_config_fields)" -d "Property"
-complete -c minikube -n "__minikube_using_command config; and __fish_seen_subcommand_from view" -l "format" -d "Go template format string for the config view output"
+complete -c minikube -n "__minikube_using_command config; and __fish_seen_subcommand_from get" -a "(__minikube_config_fields)" -d Property
+complete -c minikube -n "__minikube_using_command config; and __fish_seen_subcommand_from set" -a "(__minikube_config_fields)" -d Property
+complete -c minikube -n "__minikube_using_command config; and __fish_seen_subcommand_from unset" -a "(__minikube_config_fields)" -d Property
+complete -c minikube -n "__minikube_using_command config; and __fish_seen_subcommand_from view" -a "(__minikube_config_fields)" -d Property
+complete -c minikube -n "__minikube_using_command config; and __fish_seen_subcommand_from view" -l format -d "Go template format string for the config view output"
 
 # Sub-command: dashboard
-complete -c minikube -n "__minikube_using_command dashboard" -l "url" -d "Display the kubernetes dashboard URL instead of opening it"
+complete -c minikube -n "__minikube_using_command dashboard" -l url -d "Display the kubernetes dashboard URL instead of opening it"
 
 # Sub-command: docker-env
-complete -c minikube -n "__minikube_using_command docker-env" -l "no-proxy" -d "Add machine IP to NO_PROXY environment variable"
-complete -c minikube -f -n "__minikube_using_command docker-env" -l "shell" -d "Force environment to be configured for a specified shell"
-complete -c minikube -n "__minikube_using_command docker-env" -l "unset" -s "u" -d "Unset variables"
+complete -c minikube -n "__minikube_using_command docker-env" -l no-proxy -d "Add machine IP to NO_PROXY environment variable"
+complete -c minikube -f -n "__minikube_using_command docker-env" -l shell -d "Force environment to be configured for a specified shell"
+complete -c minikube -n "__minikube_using_command docker-env" -l unset -s u -d "Unset variables"
 
-complete -c minikube -f -n "__minikube_using_command docker-env; and __fish_seen_subcommand_from --shell" -a "fish cmd powershell tcsh bash zsh" -d "Shell"
+complete -c minikube -f -n "__minikube_using_command docker-env; and __fish_seen_subcommand_from --shell" -a "fish cmd powershell tcsh bash zsh" -d Shell
 
 # Sub-command: service
-complete -c minikube -f -n "__minikube_using_command config" -a "list" -d "List the URLs for the services in local cluster"
+complete -c minikube -f -n "__minikube_using_command config" -a list -d "List the URLs for the services in local cluster"
 
-complete -c minikube -n "__minikube_using_command service" -l "format" -d "Format to output service URL in (default http://{{.IP}}:{{.Port}})"
-complete -c minikube -n "__minikube_using_command service" -l "https" -d "Open the service URL with https instead of http"
-complete -c minikube -n "__minikube_using_command service" -l "namespace" -s "n" -d "The service namespace (default default)"
-complete -c minikube -n "__minikube_using_command service" -l "url" -d "Display the kubernetes service URL instead of opening it"
+complete -c minikube -n "__minikube_using_command service" -l format -d "Format to output service URL in (default http://{{.IP}}:{{.Port}})"
+complete -c minikube -n "__minikube_using_command service" -l https -d "Open the service URL with https instead of http"
+complete -c minikube -n "__minikube_using_command service" -l namespace -s n -d "The service namespace (default default)"
+complete -c minikube -n "__minikube_using_command service" -l url -d "Display the kubernetes service URL instead of opening it"
 
 # Sub-command: start
-complete -c minikube -n "__minikube_using_command start" -l "container-runtime" -d "The container runtime to be used"
-complete -c minikube -n "__minikube_using_command start" -l "cpus" -d "Number of CPUs allocated to the minikube VM (default 2)"
-complete -c minikube -n "__minikube_using_command start" -l "disk-size" -d "Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g) (default 20g)"
-complete -c minikube -n "__minikube_using_command start" -l "docker-env" -d "Environment variables to pass to the Docker daemon (format: key=value)"
-complete -c minikube -n "__minikube_using_command start" -l "extra-config" -d "A set of key=value pairs that describe configuration that may be passed to different components"
-complete -c minikube -n "__minikube_using_command start" -l "feature-gates" -d "A set of key=value pairs that describe feature gates for alpha/experimental features"
-complete -c minikube -n "__minikube_using_command start" -l "insecure-registry" -d "Insecure Docker registries to pass to the Docker daemon"
-complete -c minikube -n "__minikube_using_command start" -l "iso-url" -d "Location of the minikube iso"
-complete -c minikube -n "__minikube_using_command start" -l "keep-context" -d "Keep the existing kubectl context and create a minikube context instead"
-complete -c minikube -n "__minikube_using_command start" -l "kubernetes-version" -d "The kubernetes version that the minikube VM will use"
-complete -c minikube -n "__minikube_using_command start" -l "memory" -d "Amount of RAM allocated to the minikube VM (default 2048)"
-complete -c minikube -n "__minikube_using_command start" -l "network-plugin" -d "The name of the network plugin"
-complete -c minikube -n "__minikube_using_command start" -l "registry-mirror" -d "Registry mirrors to pass to the Docker daemon"
-complete -c minikube -f -n "__minikube_using_command start" -l "vm-driver" -d "VM driver to use (default virtualbox)"
+complete -c minikube -n "__minikube_using_command start" -l container-runtime -d "The container runtime to be used"
+complete -c minikube -n "__minikube_using_command start" -l cpus -d "Number of CPUs allocated to the minikube VM (default 2)"
+complete -c minikube -n "__minikube_using_command start" -l disk-size -d "Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g) (default 20g)"
+complete -c minikube -n "__minikube_using_command start" -l docker-env -d "Environment variables to pass to the Docker daemon (format: key=value)"
+complete -c minikube -n "__minikube_using_command start" -l extra-config -d "A set of key=value pairs that describe configuration that may be passed to different components"
+complete -c minikube -n "__minikube_using_command start" -l feature-gates -d "A set of key=value pairs that describe feature gates for alpha/experimental features"
+complete -c minikube -n "__minikube_using_command start" -l insecure-registry -d "Insecure Docker registries to pass to the Docker daemon"
+complete -c minikube -n "__minikube_using_command start" -l iso-url -d "Location of the minikube iso"
+complete -c minikube -n "__minikube_using_command start" -l keep-context -d "Keep the existing kubectl context and create a minikube context instead"
+complete -c minikube -n "__minikube_using_command start" -l kubernetes-version -d "The kubernetes version that the minikube VM will use"
+complete -c minikube -n "__minikube_using_command start" -l memory -d "Amount of RAM allocated to the minikube VM (default 2048)"
+complete -c minikube -n "__minikube_using_command start" -l network-plugin -d "The name of the network plugin"
+complete -c minikube -n "__minikube_using_command start" -l registry-mirror -d "Registry mirrors to pass to the Docker daemon"
+complete -c minikube -f -n "__minikube_using_command start" -l vm-driver -d "VM driver to use (default virtualbox)"
 
 complete -c minikube -f -n "__minikube_using_command start; and __minikube_using_option --vm-driver" -a "virtualbox kvm hyperv" -d "VM driver"
 
-complete -c minikube -n "__minikube_using_command start; and __minikube_using_option_value --vm-driver virtualbox" -l "host-only-cidr" -d "The CIDR to be used for the VM"
-complete -c minikube -n "__minikube_using_command start; and __minikube_using_option_value --vm-driver kvm" -l "kvm-network" -d "The KVM network name"
-complete -c minikube -n "__minikube_using_command start; and __minikube_using_option_value --vm-driver hyperv" -l "hyperv-virtual-switch" -d "The hyperv virtual switch name"
+complete -c minikube -n "__minikube_using_command start; and __minikube_using_option_value --vm-driver virtualbox" -l host-only-cidr -d "The CIDR to be used for the VM"
+complete -c minikube -n "__minikube_using_command start; and __minikube_using_option_value --vm-driver kvm" -l kvm-network -d "The KVM network name"
+complete -c minikube -n "__minikube_using_command start; and __minikube_using_option_value --vm-driver hyperv" -l hyperv-virtual-switch -d "The hyperv virtual switch name"
 
 # Sub-command: status
-complete -c minikube -n "__minikube_using_command status" -l "format" -d "Go template format string for the status output"
+complete -c minikube -n "__minikube_using_command status" -l format -d "Go template format string for the status output"
diff --git a/share/completions/mix.fish b/share/completions/mix.fish
index cce3fa542..3c0b8adbe 100644
--- a/share/completions/mix.fish
+++ b/share/completions/mix.fish
@@ -19,32 +19,32 @@ function __fish_mix_using_command
 end
 
 
-complete -f -c mix -n '__fish_mix_needs_command' -a app.start -d "Starts all registered apps"
-complete -f -c mix -n '__fish_mix_needs_command' -a archive -d "Lists all archives"
-complete -f -c mix -n '__fish_mix_needs_command' -a archive.build -d "Archives this project into a .ez file"
-complete -c mix -n '__fish_mix_needs_command' -a archive.install -d "Installs an archive locally"
-complete -c mix -n '__fish_mix_needs_command' -a archive.uninstall -d "Uninstalls archives"
-complete -f -c mix -n '__fish_mix_needs_command' -a clean -d "Deletes generated application files"
-complete -f -c mix -n '__fish_mix_needs_command' -a cmd -d "Executes the given command"
-complete -c mix -n '__fish_mix_needs_command' -a compile -d "Compiles source files"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps -d "Lists dependencies and their status"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.clean -d "Deletes the given dependencies' files"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.compile -d "Compiles dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.get -d "Gets all out of date dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.unlock -d "Unlocks the given dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.update -d "Updates the given dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a do -d "Executes the tasks separated by comma"
-complete -f -c mix -n '__fish_mix_needs_command' -a escript.build -d "Builds an escript for the project"
-complete -f -c mix -n '__fish_mix_needs_command' -a help -d "Prints help information for tasks"
-complete -c mix -n '__fish_mix_needs_command' -a loadconfig -d "Loads and persists the given configuration"
-complete -f -c mix -n '__fish_mix_needs_command' -a local -d "Lists local tasks"
-complete -f -c mix -n '__fish_mix_needs_command' -a local.hex -d "Installs Hex locally"
-complete -f -c mix -n '__fish_mix_needs_command' -a local.public_keys -d "Manages public keys"
-complete -f -c mix -n '__fish_mix_needs_command' -a local.rebar -d "Installs rebar locally"
-complete -c mix -n '__fish_mix_needs_command' -a new -d "Creates a new Elixir project"
-complete -c mix -n '__fish_mix_needs_command' -a profile.fprof -d "Profiles the given file or expression with fprof"
-complete -f -c mix -n '__fish_mix_needs_command' -a run -d "Runs the given file or expression"
-complete -f -c mix -n '__fish_mix_needs_command' -a test -d "Runs a project's tests"
+complete -f -c mix -n __fish_mix_needs_command -a app.start -d "Starts all registered apps"
+complete -f -c mix -n __fish_mix_needs_command -a archive -d "Lists all archives"
+complete -f -c mix -n __fish_mix_needs_command -a archive.build -d "Archives this project into a .ez file"
+complete -c mix -n __fish_mix_needs_command -a archive.install -d "Installs an archive locally"
+complete -c mix -n __fish_mix_needs_command -a archive.uninstall -d "Uninstalls archives"
+complete -f -c mix -n __fish_mix_needs_command -a clean -d "Deletes generated application files"
+complete -f -c mix -n __fish_mix_needs_command -a cmd -d "Executes the given command"
+complete -c mix -n __fish_mix_needs_command -a compile -d "Compiles source files"
+complete -f -c mix -n __fish_mix_needs_command -a deps -d "Lists dependencies and their status"
+complete -f -c mix -n __fish_mix_needs_command -a deps.clean -d "Deletes the given dependencies' files"
+complete -f -c mix -n __fish_mix_needs_command -a deps.compile -d "Compiles dependencies"
+complete -f -c mix -n __fish_mix_needs_command -a deps.get -d "Gets all out of date dependencies"
+complete -f -c mix -n __fish_mix_needs_command -a deps.unlock -d "Unlocks the given dependencies"
+complete -f -c mix -n __fish_mix_needs_command -a deps.update -d "Updates the given dependencies"
+complete -f -c mix -n __fish_mix_needs_command -a do -d "Executes the tasks separated by comma"
+complete -f -c mix -n __fish_mix_needs_command -a escript.build -d "Builds an escript for the project"
+complete -f -c mix -n __fish_mix_needs_command -a help -d "Prints help information for tasks"
+complete -c mix -n __fish_mix_needs_command -a loadconfig -d "Loads and persists the given configuration"
+complete -f -c mix -n __fish_mix_needs_command -a local -d "Lists local tasks"
+complete -f -c mix -n __fish_mix_needs_command -a local.hex -d "Installs Hex locally"
+complete -f -c mix -n __fish_mix_needs_command -a local.public_keys -d "Manages public keys"
+complete -f -c mix -n __fish_mix_needs_command -a local.rebar -d "Installs rebar locally"
+complete -c mix -n __fish_mix_needs_command -a new -d "Creates a new Elixir project"
+complete -c mix -n __fish_mix_needs_command -a profile.fprof -d "Profiles the given file or expression with fprof"
+complete -f -c mix -n __fish_mix_needs_command -a run -d "Runs the given file or expression"
+complete -f -c mix -n __fish_mix_needs_command -a test -d "Runs a project's tests"
 
 # archive.build subcommand
 complete -c mix -n '__fish_mix_using_command archive.build' -s i -d "specify input directory"
diff --git a/share/completions/mkdocs.fish b/share/completions/mkdocs.fish
index 90782f881..ab47cce35 100644
--- a/share/completions/mkdocs.fish
+++ b/share/completions/mkdocs.fish
@@ -6,7 +6,7 @@ complete -f -c mkdocs -s q -l quiet -d 'Silence warnings'
 complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -s V -l version -d 'Show the version and exit'
 
 ## build
-complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -a 'build' -d 'Build the MkDocs documentation'
+complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -a build -d 'Build the MkDocs documentation'
 complete -n 'contains build (commandline -poc)' -f -c mkdocs -s c -l clean -d 'Remove old site_dir before building (the default)'
 complete -n 'contains build (commandline -poc)' -c mkdocs -s f -l config-file -r -d 'Provide a specific MkDocs config'
 complete -n 'contains build (commandline -poc)' -f -c mkdocs -s s -l strict -d 'Enable strict mode. This will cause MkDocs to abort the build on any warnings'
@@ -15,7 +15,7 @@ complete -n 'contains build (commandline -poc)' -c mkdocs -s e -l theme-dir -r -
 complete -n 'contains build (commandline -poc)' -c mkdocs -s d -l site-dir -r -d 'The directory to output the result of the documentation build'
 
 ## gh-deploy
-complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -a 'gh-deploy' -d 'Deploy your documentation to GitHub Pages'
+complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -a gh-deploy -d 'Deploy your documentation to GitHub Pages'
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s c -l clean -d 'Remove old site_dir before building (the default)'
 complete -n 'contains gh-deploy (commandline -poc)' -c mkdocs -s f -l config-file -r -d 'Provide a specific MkDocs config'
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s m -l message -r -d 'A commit message to use when committing to the Github Pages remote branch'
@@ -24,10 +24,10 @@ complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s r -l remote-
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -l force -d 'Force the push to the repository'
 
 ## new
-complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -a 'new' -r -d 'Create a new MkDocs project'
+complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -a new -r -d 'Create a new MkDocs project'
 
 ## serve
-complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -a 'serve' -d 'Run the builtin development server'
+complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -a serve -d 'Run the builtin development server'
 complete -n 'contains serve (commandline -poc)' -c mkdocs -s f -l config-file -r -d 'Provide a specific MkDocs config'
 complete -n 'contains serve (commandline -poc)' -c mkdocs -s a -l dev-addr -r -d 'IP address and port to serve documentation locally (default: localhost:8000)'
 complete -n 'contains serve (commandline -poc)' -f -c mkdocs -s s -l strict -d 'Enable strict mode. This will cause MkDocs to abort the build on any warnings'
diff --git a/share/completions/mkvextract.fish b/share/completions/mkvextract.fish
index 94a141420..8ba17acdc 100644
--- a/share/completions/mkvextract.fish
+++ b/share/completions/mkvextract.fish
@@ -87,38 +87,38 @@ function __fish_mkvextract_print_tracks
 end
 
 # simple options
-complete -f -c mkvextract -s V -l 'version' -d 'Show version information'
-complete -f -c mkvextract -s h -l 'help' -d 'Show help'
-complete -f -c mkvextract -l 'check-for-updates' -d 'Check online for updates'
+complete -f -c mkvextract -s V -l version -d 'Show version information'
+complete -f -c mkvextract -s h -l help -d 'Show help'
+complete -f -c mkvextract -l check-for-updates -d 'Check online for updates'
 # extraction modes
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'tracks' -d 'Extract tracks to external files'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'tags' -d 'Extract tags as XML'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'attachments' -d 'Extract attachments'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'chapters' -d 'Extract chapters as XML'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'cuesheet' -d 'Extract chapters and tags as CUE sheet'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'timecodes_v2' -d 'Extract timecodes of a track as timecode v2 file'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'cues' -d 'Extract cue information as text file'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a tracks -d 'Extract tracks to external files'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a tags -d 'Extract tags as XML'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a attachments -d 'Extract attachments'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a chapters -d 'Extract chapters as XML'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a cuesheet -d 'Extract chapters and tags as CUE sheet'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a timecodes_v2 -d 'Extract timecodes of a track as timecode v2 file'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a cues -d 'Extract cue information as text file'
 # tracks/attachments when appropriate
 complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks timecodes_v2 cues' -a '(__fish_mkvextract_print_tracks)'
 complete -f -c mkvextract -n '__fish_mkvextract_using_mode attachments' -a '(__fish_mkvextract_print_attachments)'
 # these extraction modes have no parameters other than optional flags and the file
 complete -f -c mkvextract -n '__fish_mkvextract_using_mode tags chapters cuesheet'
 # general flags
-complete -c mkvextract -s f -l 'parse-fully' -d 'Parse the whole file instead of relying on the index'
-complete -c mkvextract -s v -l 'verbose' -d 'Increase verbosity'
-complete -c mkvextract -s q -l 'quiet' -d 'Suppress status output'
-complete -c mkvextract -r -l 'ui-language' -d 'Force a locale'
-complete -c mkvextract -r -l 'command-line-charset' -d 'Charset for strings on the command line'
-complete -c mkvextract -r -l 'output-charset' -d 'Outputs messages in specified charset'
-complete -c mkvextract -r -s r -l 'redirect-output' -d 'Redirect all messages into a file'
-complete -c mkvextract -r -l 'debug' -d 'Turn on debugging for a specific feature'
-complete -c mkvextract -r -l 'engage' -d 'Turn on an experimental feature'
-complete -c mkvextract -l 'gui-mode' -d 'Enable GUI mode'
+complete -c mkvextract -s f -l parse-fully -d 'Parse the whole file instead of relying on the index'
+complete -c mkvextract -s v -l verbose -d 'Increase verbosity'
+complete -c mkvextract -s q -l quiet -d 'Suppress status output'
+complete -c mkvextract -r -l ui-language -d 'Force a locale'
+complete -c mkvextract -r -l command-line-charset -d 'Charset for strings on the command line'
+complete -c mkvextract -r -l output-charset -d 'Outputs messages in specified charset'
+complete -c mkvextract -r -s r -l redirect-output -d 'Redirect all messages into a file'
+complete -c mkvextract -r -l debug -d 'Turn on debugging for a specific feature'
+complete -c mkvextract -r -l engage -d 'Turn on an experimental feature'
+complete -c mkvextract -l gui-mode -d 'Enable GUI mode'
 # mode-specific flags
 complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -r -s c -d 'Convert text subtitles to a charset'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l 'cuesheet' -d 'Also try to extract the CUE sheet'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -r -l 'blockadd' -d 'Keep only the BlockAdditions up to the specified level'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l 'raw' -d 'Extract the data to a raw file'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l 'fullraw' -d 'Extract the data to a raw file including the CodecPrivate as header'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters' -s s -l 'simple' -d 'Exports the chapter information in a simple format'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters' -r -l 'simple-language' -d 'Uses the chapter names of the specified language'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l cuesheet -d 'Also try to extract the CUE sheet'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -r -l blockadd -d 'Keep only the BlockAdditions up to the specified level'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l raw -d 'Extract the data to a raw file'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l fullraw -d 'Extract the data to a raw file including the CodecPrivate as header'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters' -s s -l simple -d 'Exports the chapter information in a simple format'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters' -r -l simple-language -d 'Uses the chapter names of the specified language'
diff --git a/share/completions/mocp.fish b/share/completions/mocp.fish
index cfb3b45da..ef1493563 100644
--- a/share/completions/mocp.fish
+++ b/share/completions/mocp.fish
@@ -18,8 +18,8 @@ complete -c mocp -s T -l theme -r -d "Use selected theme file (read from ~/.moc/
 complete -c mocp -s C -l config -r -d "Use the specified config file instead of the default"
 complete -c mocp -s O -l set-option -r -d "NAME=VALUE Override configuration option NAME with VALUE"
 complete -c mocp -s M -l moc-dir -r -d "Use the specified MOC directory instead of the default"
-complete -c mocp -s P -l pause -d "Pause"
-complete -c mocp -s U -l unpause -d "Unpause"
+complete -c mocp -s P -l pause -d Pause
+complete -c mocp -s U -l unpause -d Unpause
 complete -c mocp -s G -l toggle-pause -d "Toggle between play/pause"
 complete -c mocp -s v -l volume -d "(+/-)LEVEL Adjust PCM volume" -xa '+ -'
 complete -c mocp -s y -l sync -d "Synchronize the playlist with other clients"
diff --git a/share/completions/msgfmt.fish b/share/completions/msgfmt.fish
index 5a2746be2..422576db4 100644
--- a/share/completions/msgfmt.fish
+++ b/share/completions/msgfmt.fish
@@ -27,7 +27,7 @@ complete -c msgfmt -l check-domain -d "Check for conflicts between domain direct
 complete -c msgfmt -s C -l check-compatibility -d "Check that GNU msgfmt behaves like X/Open msgfmt"
 complete -c msgfmt -l check-accelerators -d "Check presence of keyboard accelerators for menu items"
 complete -c msgfmt -s f -l use-fuzzy -d "Use fuzzy entries in output"
-complete -c msgfmt -s a -l alignment -d "Alignment" -r
+complete -c msgfmt -s a -l alignment -d Alignment -r
 complete -c msgfmt -l no-hash -d "Binary file will not include the hash table"
 complete -c msgfmt -s h -l help -d "Display help and exit"
 complete -c msgfmt -s V -l version -d "Display version and exit"
diff --git a/share/completions/mupdf.fish b/share/completions/mupdf.fish
index d696ae7a1..fb5e346ff 100644
--- a/share/completions/mupdf.fish
+++ b/share/completions/mupdf.fish
@@ -1,7 +1,7 @@
 complete -c mupdf -x -a "(__fish_complete_suffix .pdf)"
 
-complete -c mupdf -s p -d "Description"
-complete -c mupdf -s r -d "Resolution"
+complete -c mupdf -s p -d Description
+complete -c mupdf -s r -d Resolution
 complete -c mupdf -x -s A -a "(seq 0 8)" -d "Set anti-aliasing quality in bits"
 complete -c mupdf -x -s C -d "Tint color in RRGGBB"
 complete -c mupdf -s I -d "Invert colors"
diff --git a/share/completions/mvn.fish b/share/completions/mvn.fish
index eeab023ea..a12de4b3e 100644
--- a/share/completions/mvn.fish
+++ b/share/completions/mvn.fish
@@ -742,8 +742,8 @@ complete -c mvn -a "android:emulator-stop-all" -d "EmulatorStopeAllMojo will sto
 complete -c mvn -a "android:generate-sources" -d "Generates R.java based on resources specified by the resources configuration parameter"
 complete -c mvn -a "android:help" -d "Display help information on android-maven-plugin"
 complete -c mvn -a "android:instrument" -d "Runs the instrumentation apk on device."
-complete -c mvn -a "android:internal-integration-test" -d "Internal"
-complete -c mvn -a "android:internal-pre-integration-test" -d "Internal"
+complete -c mvn -a "android:internal-integration-test" -d Internal
+complete -c mvn -a "android:internal-pre-integration-test" -d Internal
 complete -c mvn -a "android:lint" -d "LintMojo can run the lint command against the project"
 complete -c mvn -a "android:manifest-merger" -d "Manifest Merger V2 AndroidManifest.xml file"
 complete -c mvn -a "android:manifest-update" -d "Updates various version attributes present in the AndroidManifest.xml file."
diff --git a/share/completions/netctl-auto.fish b/share/completions/netctl-auto.fish
index 1b208d317..623519f7e 100644
--- a/share/completions/netctl-auto.fish
+++ b/share/completions/netctl-auto.fish
@@ -43,7 +43,7 @@ function __fish_print_netctl-auto_profile
             end
         else
             if test $show_other = true
-                printf "%s\t%s\n" $profile "Profile"
+                printf "%s\t%s\n" $profile Profile
             end
         end
     end
@@ -62,8 +62,8 @@ complete -c netctl-auto -n "not __fish_seen_subcommand_from $cmds" -a disable-al
 complete -c netctl-auto -n "not __fish_seen_subcommand_from $cmds" -a is-active -f -d "Check whether specified profile is active"
 complete -c netctl-auto -n "not __fish_seen_subcommand_from $cmds" -a is-enabled -f -d "Check whether specified profile is enabled"
 
-complete -c netctl-auto -n "__fish_seen_subcommand_from switch-to" -f -a "(__fish_print_netctl-auto_profile other disabled)" -d "Profile"
-complete -c netctl-auto -n "__fish_seen_subcommand_from enable" -f -a "(__fish_print_netctl-auto_profile disabled)" -d "Profile"
-complete -c netctl-auto -n "__fish_seen_subcommand_from disable" -f -a "(__fish_print_netctl-auto_profile active other)" -d "Profile"
+complete -c netctl-auto -n "__fish_seen_subcommand_from switch-to" -f -a "(__fish_print_netctl-auto_profile other disabled)" -d Profile
+complete -c netctl-auto -n "__fish_seen_subcommand_from enable" -f -a "(__fish_print_netctl-auto_profile disabled)" -d Profile
+complete -c netctl-auto -n "__fish_seen_subcommand_from disable" -f -a "(__fish_print_netctl-auto_profile active other)" -d Profile
 complete -c netctl-auto -n "__fish_seen_subcommand_from start stop" -f -a "(__fish_print_interfaces)"
 complete -c netctl-auto -n "__fish_seen_subcommand_from is-enabled is-active" -x -a "(__fish_print_netctl-auto_profile active disabled other)"
diff --git a/share/completions/netctl.fish b/share/completions/netctl.fish
index 9af298620..b2626a774 100644
--- a/share/completions/netctl.fish
+++ b/share/completions/netctl.fish
@@ -20,4 +20,4 @@ complete -f -c netctl -n "not __fish_seen_subcommand_from $cmds" -a disable -d '
 complete -f -c netctl -n "not __fish_seen_subcommand_from $cmds" -a reenable -d 'Reenable the systemd unit for a profile'
 complete -f -c netctl -n "not __fish_seen_subcommand_from $cmds" -a is-enabled -d 'Check whether the unit is enabled'
 complete -f -c netctl -n "not __fish_seen_subcommand_from $cmds" -a edit -d 'Open the specified profile in an editor'
-complete -f -c netctl -n "__fish_seen_subcommand_from start stop restart switch-to status enable disable reenable is-enabled edit" -a '(__fish_netctl_get_profiles)' -d 'Profile'
+complete -f -c netctl -n "__fish_seen_subcommand_from start stop restart switch-to status enable disable reenable is-enabled edit" -a '(__fish_netctl_get_profiles)' -d Profile
diff --git a/share/completions/ngrok.fish b/share/completions/ngrok.fish
index b3c754478..77d02990d 100644
--- a/share/completions/ngrok.fish
+++ b/share/completions/ngrok.fish
@@ -1,44 +1,44 @@
 # Commands
-complete -c ngrok -f -a "authtoken" -d "Save authtoken to configuration file"
-complete -c ngrok -f -a "credits" -d "Prints author and licensing information"
-complete -c ngrok -f -a "http" -d "Start an HTTP tunnel"
-complete -c ngrok -f -a "start" -d "Start tunnels by name from the configuration file"
-complete -c ngrok -f -a "tcp" -d "Start a TCP tunnel"
-complete -c ngrok -f -a "tls" -d "Start a TLS tunnel"
-complete -c ngrok -f -a "update" -d "Update ngrok to the latest version"
-complete -c ngrok -f -a "version" -d "Print the version string"
-complete -c ngrok -f -a "help" -d "Shows a list of commands or help for one command"
+complete -c ngrok -f -a authtoken -d "Save authtoken to configuration file"
+complete -c ngrok -f -a credits -d "Prints author and licensing information"
+complete -c ngrok -f -a http -d "Start an HTTP tunnel"
+complete -c ngrok -f -a start -d "Start tunnels by name from the configuration file"
+complete -c ngrok -f -a tcp -d "Start a TCP tunnel"
+complete -c ngrok -f -a tls -d "Start a TLS tunnel"
+complete -c ngrok -f -a update -d "Update ngrok to the latest version"
+complete -c ngrok -f -a version -d "Print the version string"
+complete -c ngrok -f -a help -d "Shows a list of commands or help for one command"
 
 # General Options
-complete -c ngrok -l "help" -e -f
-complete -c ngrok -l "authtoken" -r -d "ngrok.com authtoken identifying a user"
-complete -c ngrok -l "config" -r -d "path to config files; they are merged if multiple"
-complete -c ngrok -l "log" -x -a "false stderr stdout" -d "path to log file, 'stdout', 'stderr' or 'false'"
-complete -c ngrok -l "log-format" -x -a "term logfmt json" -d "log record format: 'term', 'logfmt', 'json'"
-complete -c ngrok -l "log-level" -r -a "info" -d "logging level"
-complete -c ngrok -l "region" -x -a "us eu au ap" -d "ngrok server region [us , eu, au, ap] (default: us)"
+complete -c ngrok -l help -e -f
+complete -c ngrok -l authtoken -r -d "ngrok.com authtoken identifying a user"
+complete -c ngrok -l config -r -d "path to config files; they are merged if multiple"
+complete -c ngrok -l log -x -a "false stderr stdout" -d "path to log file, 'stdout', 'stderr' or 'false'"
+complete -c ngrok -l log-format -x -a "term logfmt json" -d "log record format: 'term', 'logfmt', 'json'"
+complete -c ngrok -l log-level -r -a info -d "logging level"
+complete -c ngrok -l region -x -a "us eu au ap" -d "ngrok server region [us , eu, au, ap] (default: us)"
 
 # http & tls's options
-complete -c ngrok -l "hostname" -r -d "host tunnel on custom hostname (requires DNS CNAME)"
-complete -c ngrok -l "subdomain" -r -d "host tunnel on a custom subdomain"
+complete -c ngrok -l hostname -r -d "host tunnel on custom hostname (requires DNS CNAME)"
+complete -c ngrok -l subdomain -r -d "host tunnel on a custom subdomain"
 
 # http's optons
-complete -c ngrok -l "auth" -r -d "enforce basic auth on tunnel endpoint, 'user:password'"
-complete -c ngrok -l "bind-tls" -x -a "both https http" -d "listen for http, https or both: true/false/both"
-complete -c ngrok -l "host-header" -r -d "set Host header; if 'rewrite' use local address hostname"
-complete -c ngrok -l "inspect" -d "enable/disable http introspection"
+complete -c ngrok -l auth -r -d "enforce basic auth on tunnel endpoint, 'user:password'"
+complete -c ngrok -l bind-tls -x -a "both https http" -d "listen for http, https or both: true/false/both"
+complete -c ngrok -l host-header -r -d "set Host header; if 'rewrite' use local address hostname"
+complete -c ngrok -l inspect -d "enable/disable http introspection"
 
 # tls's options
-complete -c ngrok -l "client-cas" -r -d "path to TLS certificate authority to verify client certs"
-complete -c ngrok -l "crt" -r -d "path to a TLS certificate for TLS termination"
-complete -c ngrok -l "key" -r -d "path to a TLS key for TLS termination"
+complete -c ngrok -l client-cas -r -d "path to TLS certificate authority to verify client certs"
+complete -c ngrok -l crt -r -d "path to a TLS certificate for TLS termination"
+complete -c ngrok -l key -r -d "path to a TLS key for TLS termination"
 
 # start's options
-complete -c ngrok -l "all" -d "start all tunnels in the configuration file"
-complete -c ngrok -l "none" -d "start running no tunnels"
+complete -c ngrok -l all -d "start all tunnels in the configuration file"
+complete -c ngrok -l none -d "start running no tunnels"
 
 # tcp's options
-complete -c ngrok -l "remote-addr" -r -d "bind remote address (requires you reserve an address)"
+complete -c ngrok -l remote-addr -r -d "bind remote address (requires you reserve an address)"
 
 # update's options
-complete -c ngrok -l "channel" -x -a "stable beta" -d "update channel (stable, beta)"
+complete -c ngrok -l channel -x -a "stable beta" -d "update channel (stable, beta)"
diff --git a/share/completions/nice.fish b/share/completions/nice.fish
index e538d9a64..8b943a527 100644
--- a/share/completions/nice.fish
+++ b/share/completions/nice.fish
@@ -1,8 +1,8 @@
 
 
-complete -c nice -a "(__fish_complete_subcommand -- -n --adjustment)" -d "Command"
+complete -c nice -a "(__fish_complete_subcommand -- -n --adjustment)" -d Command
 
-complete -c nice -s n -l adjustment -n "__fish_no_arguments" -d "Add specified amount to niceness value" -x
-complete -c nice -l help -n "__fish_no_arguments" -d "Display help and exit"
-complete -c nice -l version -n "__fish_no_arguments" -d "Display version and exit"
+complete -c nice -s n -l adjustment -n __fish_no_arguments -d "Add specified amount to niceness value" -x
+complete -c nice -l help -n __fish_no_arguments -d "Display help and exit"
+complete -c nice -l version -n __fish_no_arguments -d "Display version and exit"
 
diff --git a/share/completions/nmcli.fish b/share/completions/nmcli.fish
index 15ebd07b9..3a8be8c40 100644
--- a/share/completions/nmcli.fish
+++ b/share/completions/nmcli.fish
@@ -27,38 +27,38 @@ complete -c nmcli -d 'Command-line tool to control NetworkManager'
 
 complete -c nmcli -n "not __fish_seen_subcommand_from $nmcli_commands" -xa "$nmcli_commands"
 
-complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa 'status' -d 'Show overall status of NetworkManager'
-complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa 'hostname' -d 'Get or change persistent system hostname'
-complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa 'permissions' -d 'Show caller permissions for authenticated operations'
-complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa 'logging' -d 'Get or change NetworkManager logging level and domains'
-complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa 'help'
+complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa status -d 'Show overall status of NetworkManager'
+complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa hostname -d 'Get or change persistent system hostname'
+complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa permissions -d 'Show caller permissions for authenticated operations'
+complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa logging -d 'Get or change NetworkManager logging level and domains'
+complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa help
 complete -c nmcli -n "contains_seq general logging -- (commandline -op)" -xa 'level domains help'
 
-complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa 'on' -d 'Switch networking on'
-complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa 'off' -d 'Switch networking off'
-complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa 'connectivity' -d 'Get network connectivity state'
-complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa 'help'
-complete -c nmcli -n "contains_seq networking connectivity -- (commandline -op)" -xa 'check' -d 'Re-check the connectivity'
+complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa on -d 'Switch networking on'
+complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa off -d 'Switch networking off'
+complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa connectivity -d 'Get network connectivity state'
+complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa help
+complete -c nmcli -n "contains_seq networking connectivity -- (commandline -op)" -xa check -d 'Re-check the connectivity'
 
-complete -c nmcli -n "__fish_seen_subcommand_from radio; and not __fish_seen_subcommand_from $nmcli_radio" -xa 'all' -d 'Get status of all radio switches; turn them on/off'
+complete -c nmcli -n "__fish_seen_subcommand_from radio; and not __fish_seen_subcommand_from $nmcli_radio" -xa all -d 'Get status of all radio switches; turn them on/off'
 complete -c nmcli -n "contains_seq radio all -- (commandline -op)" -xa 'on off help'
-complete -c nmcli -n "__fish_seen_subcommand_from radio; and not __fish_seen_subcommand_from $nmcli_radio" -xa 'wifi' -d 'Get status of Wi-Fi radio switch; turn it on/off'
+complete -c nmcli -n "__fish_seen_subcommand_from radio; and not __fish_seen_subcommand_from $nmcli_radio" -xa wifi -d 'Get status of Wi-Fi radio switch; turn it on/off'
 complete -c nmcli -n "contains_seq radio wifi -- (commandline -op)" -xa 'on off help'
-complete -c nmcli -n "__fish_seen_subcommand_from radio; and not __fish_seen_subcommand_from $nmcli_radio" -xa 'wwan' -d 'Get status of mobile broadband radio switch; turn it on/off'
+complete -c nmcli -n "__fish_seen_subcommand_from radio; and not __fish_seen_subcommand_from $nmcli_radio" -xa wwan -d 'Get status of mobile broadband radio switch; turn it on/off'
 complete -c nmcli -n "contains_seq radio wwan -- (commandline -op)" -xa 'on off help'
 
 complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_seen_subcommand_from $nmcli_connection" -xa "$nmcli_connection"
 # Connection subcommands are self-explanatory, I'm just highlighting a difference between edit and modify
-complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_seen_subcommand_from $nmcli_connection" -xa "modify" -d "Modify one or more properties"
-complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_seen_subcommand_from $nmcli_connection" -xa "edit" -d "Interactive edit"
+complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_seen_subcommand_from $nmcli_connection" -xa modify -d "Modify one or more properties"
+complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_seen_subcommand_from $nmcli_connection" -xa edit -d "Interactive edit"
 complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -l active -d 'List only active profiles'
 complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -l order -d 'Custom connection ordering'
 complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -xa "help $cname" -k
 complete -c nmcli -n "contains_seq connection up -- (commandline -op) && not contains -- (commandline -op)[-1] ifname ap" -xa "help $cname" -k
 complete -c nmcli -n "contains_seq connection up -- (commandline -op) && test (commandline -op)[-1] = ifname" -xa "$ifname" -k
 complete -c nmcli -n "contains_seq connection up -- (commandline -op) && test (commandline -op)[-1] = ap" -xa "$bssid"
-complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'nsp' -d 'Specify NSP to connect to (only for WiMAX)'
-complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'passwd-file' -d 'password file to activate the connection'
+complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa nsp -d 'Specify NSP to connect to (only for WiMAX)'
+complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa passwd-file -d 'password file to activate the connection'
 complete -c nmcli -n "contains_seq connection down -- (commandline -op)" -xa "help $cname" -k
 complete -c nmcli -n "contains_seq connection add -- (commandline -op)" -xa 'type ifname con-name autoconnect save master slave-type help'
 complete -c nmcli -n "contains_seq connection add -- (commandline -op) && test (commandline -op)[-1] = ifname" -xa "$ifname"
@@ -67,7 +67,7 @@ complete -c nmcli -n "contains_seq connection modify -- (commandline -op)" -xa "
 complete -c nmcli -n "contains_seq connection clone -- (commandline -op)" -l temporary
 complete -c nmcli -n "contains_seq connection clone -- (commandline -op)" -xa "help $cname" -k
 complete -c nmcli -n "contains_seq connection edit -- (commandline -op)" -xa "type help $cname" -k
-complete -c nmcli -n "contains_seq connection edit type -- (commandline -op)" -xa 'con-name'
+complete -c nmcli -n "contains_seq connection edit type -- (commandline -op)" -xa con-name
 complete -c nmcli -n "contains_seq connection delete -- (commandline -op)" -xa "help $cname" -k
 complete -c nmcli -n "contains_seq connection monitor -- (commandline -op)" -xa "help $cname" -k
 complete -c nmcli -n "contains_seq connection import -- (commandline -op)" -l temporary
@@ -89,8 +89,8 @@ complete -c nmcli -n "contains_seq device wifi hotspot ifname -- (commandline -o
 complete -c nmcli -n "contains_seq device wifi rescan -- (commandline -op)" -xa 'ifname ssid'
 complete -c nmcli -n "contains_seq device wifi rescan ifname -- (commandline -op)" -xa "$ifname"
 complete -c nmcli -n "contains_seq device wifi rescan ssid -- (commandline -op)" -xa "$ssid"
-complete -c nmcli -n "contains_seq device lldp -- (commandline -op)" -xa 'list'
+complete -c nmcli -n "contains_seq device lldp -- (commandline -op)" -xa list
 
-complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa "secret" -d "Register nmcli as NM secret agent"
-complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa "polkit" -d "Register nmcli as a polkit agent for user session"
-complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa "all" -d "Run nmcli as secret and polkit agent"
+complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa secret -d "Register nmcli as NM secret agent"
+complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa polkit -d "Register nmcli as a polkit agent for user session"
+complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa all -d "Run nmcli as secret and polkit agent"
diff --git a/share/completions/npm.fish b/share/completions/npm.fish
index 422e8848b..601f9c5b2 100644
--- a/share/completions/npm.fish
+++ b/share/completions/npm.fish
@@ -107,36 +107,36 @@ for c in run run-script
 end
 
 # cache
-complete -f -c npm -n '__fish_npm_needs_command' -a 'cache' -d "Manipulates package's cache"
-complete -f -c npm -n '__fish_npm_using_command cache' -a 'add' -d 'Add the specified package to the local cache'
-complete -f -c npm -n '__fish_npm_using_command cache' -a 'clean' -d 'Delete  data  out of the cache folder'
-complete -f -c npm -n '__fish_npm_using_command cache' -a 'ls' -d 'Show the data in the cache'
+complete -f -c npm -n __fish_npm_needs_command -a cache -d "Manipulates package's cache"
+complete -f -c npm -n '__fish_npm_using_command cache' -a add -d 'Add the specified package to the local cache'
+complete -f -c npm -n '__fish_npm_using_command cache' -a clean -d 'Delete  data  out of the cache folder'
+complete -f -c npm -n '__fish_npm_using_command cache' -a ls -d 'Show the data in the cache'
 
 # config
-for c in 'c' 'config'
-    complete -f -c npm -n "__fish_npm_needs_command" -a "$c" -d 'Manage the npm configuration files'
-    complete -f -c npm -n "__fish_npm_using_command $c" -a 'set' -d 'Sets the config key to the value'
-    complete -f -c npm -n "__fish_npm_using_command $c" -a 'get' -d 'Echo the config value to stdout'
-    complete -f -c npm -n "__fish_npm_using_command $c" -a 'delete' -d 'Deletes the key from all configuration files'
-    complete -f -c npm -n "__fish_npm_using_command $c" -a 'list' -d 'Show all the config settings'
-    complete -f -c npm -n "__fish_npm_using_command $c" -a 'ls' -d 'Show all the config settings'
-    complete -f -c npm -n "__fish_npm_using_command $c" -a 'edit' -d 'Opens the config file in an editor'
+for c in c config
+    complete -f -c npm -n __fish_npm_needs_command -a "$c" -d 'Manage the npm configuration files'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a set -d 'Sets the config key to the value'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a get -d 'Echo the config value to stdout'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a delete -d 'Deletes the key from all configuration files'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a list -d 'Show all the config settings'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a ls -d 'Show all the config settings'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a edit -d 'Opens the config file in an editor'
 end
 # get, set also exist as shorthands
-complete -f -c npm -n "__fish_npm_needs_command" -a 'get' -d 'Echo the config value to stdout'
-complete -f -c npm -n "__fish_npm_needs_command" -a 'set' -d 'Sets the config key to the value'
+complete -f -c npm -n __fish_npm_needs_command -a get -d 'Echo the config value to stdout'
+complete -f -c npm -n __fish_npm_needs_command -a set -d 'Sets the config key to the value'
 
 # install
-for c in 'install' 'isntall' 'i'
-    complete -c npm -n '__fish_npm_needs_command' -a "$c" -d 'install a package'
+for c in install isntall i
+    complete -c npm -n __fish_npm_needs_command -a "$c" -d 'install a package'
     complete -c npm -n "__fish_npm_using_command $c" -l save-dev -d 'Save to devDependencies in package.json'
     complete -c npm -n "__fish_npm_using_command $c" -l save -d 'Save to dependencies in package.json'
     complete -c npm -n "__fish_npm_using_command $c" -s g -l global -d 'Install package globally'
 end
 
 # list
-for c in 'la' 'list' 'll' 'ls'
-    complete -f -c npm -n '__fish_npm_needs_command' -a "$c" -d 'List installed packages'
+for c in la list ll ls
+    complete -f -c npm -n __fish_npm_needs_command -a "$c" -d 'List installed packages'
     complete -f -c npm -n "__fish_npm_using_command $c" -s g -l global -d 'List packages in the global install prefix instead of in the current project'
     complete -f -c npm -n "__fish_npm_using_command $c" -l json -d 'Show information in JSON format'
     complete -f -c npm -n "__fish_npm_using_command $c" -l long -d 'Show extended information'
@@ -145,14 +145,14 @@ for c in 'la' 'list' 'll' 'ls'
 end
 
 # owner
-complete -f -c npm -n '__fish_npm_needs_command' -a 'owner' -d 'Manage package owners'
-complete -f -c npm -n '__fish_npm_using_command owner' -a 'ls' -d 'List package owners'
-complete -f -c npm -n '__fish_npm_using_command owner' -a 'add' -d 'Add a new owner to package'
-complete -f -c npm -n '__fish_npm_using_command owner' -a 'rm' -d 'Remove an owner from package'
+complete -f -c npm -n __fish_npm_needs_command -a owner -d 'Manage package owners'
+complete -f -c npm -n '__fish_npm_using_command owner' -a ls -d 'List package owners'
+complete -f -c npm -n '__fish_npm_using_command owner' -a add -d 'Add a new owner to package'
+complete -f -c npm -n '__fish_npm_using_command owner' -a rm -d 'Remove an owner from package'
 
 # remove
-for c in 'r' 'remove' 'rm' 'un' 'uninstall' 'unlink'
-    complete -f -c npm -n '__fish_npm_needs_command' -a "$c" -d 'remove package' -xa '(__yarn_installed_packages)'
+for c in r remove rm un uninstall unlink
+    complete -f -c npm -n __fish_npm_needs_command -a "$c" -d 'remove package' -xa '(__yarn_installed_packages)'
     complete -x -c npm -n "__fish_npm_using_command $c" -s g -l global -d 'remove global package'
     complete -x -c npm -n "__fish_npm_using_command $c" -l save -d 'Package will be removed from your dependencies'
     complete -x -c npm -n "__fish_npm_using_command $c" -l save-dev -d 'Package will be removed from your devDependencies'
@@ -160,48 +160,48 @@ for c in 'r' 'remove' 'rm' 'un' 'uninstall' 'unlink'
 end
 
 # search
-for c in 'find' 's' 'se' 'search'
-    complete -f -c npm -n '__fish_npm_needs_command' -a "$c" -d 'Search for packages'
+for c in find s se search
+    complete -f -c npm -n __fish_npm_needs_command -a "$c" -d 'Search for packages'
     complete -x -c npm -n "__fish_npm_using_command $c" -l long -d 'Display full package descriptions and other long text across multiple lines'
 end
 
 # update
-for c in 'up' 'update'
-    complete -f -c npm -n '__fish_npm_needs_command' -a "$c" -d 'Update package(s)'
+for c in up update
+    complete -f -c npm -n __fish_npm_needs_command -a "$c" -d 'Update package(s)'
     complete -f -c npm -n "__fish_npm_using_command $c" -s g -l global -d 'Update global package(s)'
 end
 
 # misc shorter explanations
-complete -f -c npm -n '__fish_npm_needs_command' -a 'adduser add-user login' -d 'Add a registry user account'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'bin' -d 'Display npm bin folder'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'bugs issues' -d 'Bugs for a package in a web browser maybe'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'ddp dedupe find-dupes' -d 'Reduce duplication'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'deprecate' -d 'Deprecate a version of a package'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'docs home' -d 'Docs for a package in a web browser maybe'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'edit' -d 'Edit an installed package'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'explore' -d 'Browse an installed package'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'faq' -d 'Frequently Asked Questions'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'help-search' -d 'Search npm help documentation'
+complete -f -c npm -n __fish_npm_needs_command -a 'adduser add-user login' -d 'Add a registry user account'
+complete -f -c npm -n __fish_npm_needs_command -a bin -d 'Display npm bin folder'
+complete -f -c npm -n __fish_npm_needs_command -a 'bugs issues' -d 'Bugs for a package in a web browser maybe'
+complete -f -c npm -n __fish_npm_needs_command -a 'ddp dedupe find-dupes' -d 'Reduce duplication'
+complete -f -c npm -n __fish_npm_needs_command -a deprecate -d 'Deprecate a version of a package'
+complete -f -c npm -n __fish_npm_needs_command -a 'docs home' -d 'Docs for a package in a web browser maybe'
+complete -f -c npm -n __fish_npm_needs_command -a edit -d 'Edit an installed package'
+complete -f -c npm -n __fish_npm_needs_command -a explore -d 'Browse an installed package'
+complete -f -c npm -n __fish_npm_needs_command -a faq -d 'Frequently Asked Questions'
+complete -f -c npm -n __fish_npm_needs_command -a help-search -d 'Search npm help documentation'
 complete -f -c npm -n '__fish_npm_using_command help-search' -l long -d 'Display full package descriptions and other long text across multiple lines'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'info v view' -d 'View registry info'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'link ln' -d 'Symlink a package folder'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'outdated' -d 'Check for outdated packages'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'pack' -d 'Create a tarball from a package'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'prefix' -d 'Display NPM prefix'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'prune' -d 'Remove extraneous packages'
-complete -c npm -n '__fish_npm_needs_command' -a 'publish' -d 'Publish a package'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'rb rebuild' -d 'Rebuild a package'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'root ' -d 'Display npm root'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'run-script run' -d 'Run arbitrary package scripts'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'shrinkwrap' -d 'Lock down dependency versions'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'star' -d 'Mark your favorite packages'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'stars' -d 'View packages marked as favorites'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'start' -d 'Start a package'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'stop' -d 'Stop a package'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'submodule' -d 'Add a package as a git submodule'
-complete -f -c npm -n '__fish_npm_needs_command' -a 't tst test' -d 'Test a package'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'unpublish' -d 'Remove a package from the registry'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'unstar' -d 'Remove star from a package'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'version' -d 'Bump a package version'
-complete -f -c npm -n '__fish_npm_needs_command' -a 'whoami' -d 'Display npm username'
+complete -f -c npm -n __fish_npm_needs_command -a 'info v view' -d 'View registry info'
+complete -f -c npm -n __fish_npm_needs_command -a 'link ln' -d 'Symlink a package folder'
+complete -f -c npm -n __fish_npm_needs_command -a outdated -d 'Check for outdated packages'
+complete -f -c npm -n __fish_npm_needs_command -a pack -d 'Create a tarball from a package'
+complete -f -c npm -n __fish_npm_needs_command -a prefix -d 'Display NPM prefix'
+complete -f -c npm -n __fish_npm_needs_command -a prune -d 'Remove extraneous packages'
+complete -c npm -n __fish_npm_needs_command -a publish -d 'Publish a package'
+complete -f -c npm -n __fish_npm_needs_command -a 'rb rebuild' -d 'Rebuild a package'
+complete -f -c npm -n __fish_npm_needs_command -a 'root ' -d 'Display npm root'
+complete -f -c npm -n __fish_npm_needs_command -a 'run-script run' -d 'Run arbitrary package scripts'
+complete -f -c npm -n __fish_npm_needs_command -a shrinkwrap -d 'Lock down dependency versions'
+complete -f -c npm -n __fish_npm_needs_command -a star -d 'Mark your favorite packages'
+complete -f -c npm -n __fish_npm_needs_command -a stars -d 'View packages marked as favorites'
+complete -f -c npm -n __fish_npm_needs_command -a start -d 'Start a package'
+complete -f -c npm -n __fish_npm_needs_command -a stop -d 'Stop a package'
+complete -f -c npm -n __fish_npm_needs_command -a submodule -d 'Add a package as a git submodule'
+complete -f -c npm -n __fish_npm_needs_command -a 't tst test' -d 'Test a package'
+complete -f -c npm -n __fish_npm_needs_command -a unpublish -d 'Remove a package from the registry'
+complete -f -c npm -n __fish_npm_needs_command -a unstar -d 'Remove star from a package'
+complete -f -c npm -n __fish_npm_needs_command -a version -d 'Bump a package version'
+complete -f -c npm -n __fish_npm_needs_command -a whoami -d 'Display npm username'
 complete -f -c npm -n '__fish_seen_subcommand_from install; and not __fish_is_switch' -a "(__yarn_filtered_list_packages \"$npm_install\")"
diff --git a/share/completions/obnam.fish b/share/completions/obnam.fish
index 788722dbf..ff7822f73 100644
--- a/share/completions/obnam.fish
+++ b/share/completions/obnam.fish
@@ -8,31 +8,31 @@ function __fish_obnam_nosubcommand
     return 0
 end
 
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'add-key' -d 'Add a key to the repository'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'backup' -d 'Backup data to repository'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'client-keys' -d 'List clients and their keys in the repository'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'clients' -d 'List clients using the repository'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'diff' -d 'Show difference between two generations'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'dump-repo' -d 'Dump (some) data structures from a repository'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'force-lock' -d 'Force a locked repository to be open'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'forget' -d 'Forget (remove) specified backup generations'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'fsck' -d 'Verify internal consistency of backup repository'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'generations' -d 'List backup generations for client'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'genids' -d 'List generation ids for client'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'help' -d 'Print help'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'help-all' -d 'Print help, including hidden subcommands'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'kdirstat' -d 'List contents of a generation in kdirstat cache format'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'list-errors' -d 'List error codes and explanations'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'list-formats' -d 'List available repository formats'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'list-keys' -d 'List keys and repository toplevels they are used in'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'list-toplevels' -d 'List repository toplevel directories and their keys'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'ls' -d 'List contents of a generation'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'mount' -d 'Mount a backup repository as a FUSE filesystem'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'nagios-last-backup-age' -d 'Check if the most recent generation is recent enough'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'remove-client' -d 'Remove client and its key from repository'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'remove-key' -d 'Remove a key from the repository'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'restore' -d 'Restore some or all files from a generation'
-complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'verify' -d 'Verify that live data and backed up data match'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a add-key -d 'Add a key to the repository'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a backup -d 'Backup data to repository'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a client-keys -d 'List clients and their keys in the repository'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a clients -d 'List clients using the repository'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a diff -d 'Show difference between two generations'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a dump-repo -d 'Dump (some) data structures from a repository'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a force-lock -d 'Force a locked repository to be open'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a forget -d 'Forget (remove) specified backup generations'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a fsck -d 'Verify internal consistency of backup repository'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a generations -d 'List backup generations for client'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a genids -d 'List generation ids for client'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a help -d 'Print help'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a help-all -d 'Print help, including hidden subcommands'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a kdirstat -d 'List contents of a generation in kdirstat cache format'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a list-errors -d 'List error codes and explanations'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a list-formats -d 'List available repository formats'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a list-keys -d 'List keys and repository toplevels they are used in'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a list-toplevels -d 'List repository toplevel directories and their keys'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a ls -d 'List contents of a generation'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a mount -d 'Mount a backup repository as a FUSE filesystem'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a nagios-last-backup-age -d 'Check if the most recent generation is recent enough'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a remove-client -d 'Remove client and its key from repository'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a remove-key -d 'Remove a key from the repository'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a restore -d 'Restore some or all files from a generation'
+complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a verify -d 'Verify that live data and backed up data match'
 
 complete -c obnam --no-files -l always-restore-setuid -d 'Restore setuid/setgid bits in restored files'
 complete -c obnam --no-files -l no-always-restore-setuid -d 'Do not restore setuid/setgid bits in restored files'
@@ -125,7 +125,7 @@ complete -c obnam --no-files -l fsck-skip-shared-b-trees -d 'Do not check shared
 complete -c obnam --no-files -l no-fsck-skip-shared-b-trees -d 'Check shared B-trees'
 
 # Logging
-complete -c obnam -l log -a 'syslog' -d 'Write log to FILE or syslog'
+complete -c obnam -l log -a syslog -d 'Write log to FILE or syslog'
 complete -c obnam --no-files -l log-keep -d 'Keep last N logs (10)'
 complete -c obnam --no-files -l log-level -a 'debug info warning error critical fatal' -d 'Log at LEVEL'
 complete -c obnam --no-files -l log-max -d 'Rotate logs larger than SIZE'
diff --git a/share/completions/opam.fish b/share/completions/opam.fish
index e15e27a59..37bce6c01 100644
--- a/share/completions/opam.fish
+++ b/share/completions/opam.fish
@@ -11,7 +11,7 @@ end
 function __fish_opam_at_color
     set cmd (commandline -opc)
     if [ (count $cmd) -gt 2 ]
-        if [ $cmd[-1] = '--color' ]
+        if [ $cmd[-1] = --color ]
             return 0
         end
     end
@@ -28,12 +28,12 @@ end
 
 # general flags
 ## ones that work without any subcommand
-complete -f -c opam -l 'help' -d "Display the manual for an OPAM command."
+complete -f -c opam -l help -d "Display the manual for an OPAM command."
 complete -f -c opam -l version -d 'Show version information.'
 ## ones that require at least a subcommand (but are shared by all)
 ### colour
 complete -f -c opam -n 'not __fish_opam_needs_command' -l color -d 'Colorize the output.  WHEN must be `always\', `never\' or `auto\'.'
-complete -f -c opam -n '__fish_opam_at_color' -a 'always never auto'
+complete -f -c opam -n __fish_opam_at_color -a 'always never auto'
 ### rest
 complete -f -c opam -n 'not __fish_opam_needs_command' -l 'compat-mode-1.0' -d 'Compatibility mode with OPAM 1.0'
 complete -f -c opam -n 'not __fish_opam_needs_command' -l debug -d 'Print debug message on stdout.'
@@ -49,7 +49,7 @@ complete -f -c opam -n 'not __fish_opam_needs_command' -s y -l yes -d 'Disable i
 
 # subcommands
 ## config
-complete -f -c opam -n '__fish_opam_needs_command' -a config -d "Display configuration options for packages."
+complete -f -c opam -n __fish_opam_needs_command -a config -d "Display configuration options for packages."
 ### config flags
 complete -f -c opam -n '__fish_opam_using_command config' -s a -l all -d 'Enable all the global and user configuration options.'
 complete -f -c opam -n '__fish_opam_using_command config' -l csh -d 'Use csh-compatible mode for configuring OPAM.'
@@ -81,24 +81,24 @@ complete -f -c opam -n '__fish_opam_using_command config' -a bytelink -d 'return
 complete -f -c opam -n '__fish_opam_using_command config' -a report -d 'Prints a summary of your setup, useful for bug-reports.'
 
 # TODO all subcommands other than config (and admin?)
-complete -f -c opam -n '__fish_opam_needs_command' -a "help" -d "Display help about OPAM and OPAM commands."
-complete -f -c opam -n '__fish_opam_needs_command' -a "init" -d "Initialize OPAM state."
-complete -f -c opam -n '__fish_opam_needs_command' -a "install" -d "Install a list of packages."
-complete -f -c opam -n '__fish_opam_needs_command' -a "list" -d "Display the list of available packages."
-complete -f -c opam -n '__fish_opam_needs_command' -a "pin" -d "Pin a given package to a specific version."
-complete -f -c opam -n '__fish_opam_needs_command' -a "reinstall" -d "Reinstall a list of packages."
-complete -f -c opam -n '__fish_opam_needs_command' -a "remove uninstall" -d "Remove a list of packages."
-complete -f -c opam -n '__fish_opam_needs_command' -a "repository remote" -d "Manage OPAM repositories."
-complete -f -c opam -n '__fish_opam_needs_command' -a "search" -d "Search into the package list."
-complete -f -c opam -n '__fish_opam_needs_command' -a "show info" -d "Display information about specific packages."
-complete -f -c opam -n '__fish_opam_needs_command' -a switch -d "Manage multiple installation of compilers."
-complete -f -c opam -n '__fish_opam_needs_command' -a "update" -d "Update the list of available packages."
-complete -f -c opam -n '__fish_opam_needs_command' -a "upgrade" -d "Upgrade the installed package to latest version."
+complete -f -c opam -n __fish_opam_needs_command -a help -d "Display help about OPAM and OPAM commands."
+complete -f -c opam -n __fish_opam_needs_command -a init -d "Initialize OPAM state."
+complete -f -c opam -n __fish_opam_needs_command -a install -d "Install a list of packages."
+complete -f -c opam -n __fish_opam_needs_command -a list -d "Display the list of available packages."
+complete -f -c opam -n __fish_opam_needs_command -a pin -d "Pin a given package to a specific version."
+complete -f -c opam -n __fish_opam_needs_command -a reinstall -d "Reinstall a list of packages."
+complete -f -c opam -n __fish_opam_needs_command -a "remove uninstall" -d "Remove a list of packages."
+complete -f -c opam -n __fish_opam_needs_command -a "repository remote" -d "Manage OPAM repositories."
+complete -f -c opam -n __fish_opam_needs_command -a search -d "Search into the package list."
+complete -f -c opam -n __fish_opam_needs_command -a "show info" -d "Display information about specific packages."
+complete -f -c opam -n __fish_opam_needs_command -a switch -d "Manage multiple installation of compilers."
+complete -f -c opam -n __fish_opam_needs_command -a update -d "Update the list of available packages."
+complete -f -c opam -n __fish_opam_needs_command -a upgrade -d "Upgrade the installed package to latest version."
 ## admin
-complete -f -c opam -n '__fish_opam_needs_command' -a "admin" -d "Administration tool for local repositories."
-complete -c opam -n '__fish_opam_using_command admin' -l 'help' -d 'Show this help in format FMT (pager, plain or groff).'
-complete -c opam -n '__fish_opam_using_command admin' -l 'version' -d 'Show version information.'
-complete -f -c opam -n '__fish_opam_using_command admin' -a "check" -d "Check a local repo for errors."
-complete -f -c opam -n '__fish_opam_using_command admin' -a "depexts" -d "Add external dependencies."
-complete -f -c opam -n '__fish_opam_using_command admin' -a "make" -d "Initialize a repo for serving files."
-complete -f -c opam -n '__fish_opam_using_command admin' -a "stats" -d "Compute statistics."
+complete -f -c opam -n __fish_opam_needs_command -a admin -d "Administration tool for local repositories."
+complete -c opam -n '__fish_opam_using_command admin' -l help -d 'Show this help in format FMT (pager, plain or groff).'
+complete -c opam -n '__fish_opam_using_command admin' -l version -d 'Show version information.'
+complete -f -c opam -n '__fish_opam_using_command admin' -a check -d "Check a local repo for errors."
+complete -f -c opam -n '__fish_opam_using_command admin' -a depexts -d "Add external dependencies."
+complete -f -c opam -n '__fish_opam_using_command admin' -a make -d "Initialize a repo for serving files."
+complete -f -c opam -n '__fish_opam_using_command admin' -a stats -d "Compute statistics."
diff --git a/share/completions/open.fish b/share/completions/open.fish
index 6a3383c74..8ec76f4b7 100644
--- a/share/completions/open.fish
+++ b/share/completions/open.fish
@@ -1,4 +1,4 @@
-if test (uname) = 'Darwin' # OS X
+if test (uname) = Darwin # OS X
     complete -c open -s a -d 'specify app name' -r -a "(mdfind -onlyin /Applications -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemContentType==com.apple.application-*' | string replace -r '.+/(.+).app' '\$1')"
     complete -c open -s b -d 'specify app bundle id' -x -a "(mdls (mdfind -onlyin /Applications -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemContentType==com.apple.application-*') -name kMDItemCFBundleIdentifier | string replace -rf 'kMDItemCFBundleIdentifier = \"(.+)\"' '\$1')"
     complete -c open -s e -d 'open in TextEdit'
diff --git a/share/completions/openocd.fish b/share/completions/openocd.fish
index 1689284c5..3e4e614e5 100644
--- a/share/completions/openocd.fish
+++ b/share/completions/openocd.fish
@@ -7,7 +7,7 @@
 # Retrieve the likely compile-time PREFIX for openocd based off of where the binary
 # is located. e.g. if openocd is /usr/local/bin/openocd return /usr/local
 function __fish_openocd_prefix
-    string replace "/bin/openocd" "" (command -s openocd)
+    string replace /bin/openocd "" (command -s openocd)
 end
 
 # The results of this function are as if __fish_complete_suffix were called
diff --git a/share/completions/opkg.fish b/share/completions/opkg.fish
index 0dc30f5a8..a9fa787b6 100644
--- a/share/completions/opkg.fish
+++ b/share/completions/opkg.fish
@@ -27,36 +27,36 @@ function __fish_opkg_use_package_installed -d 'Test if opkg command should have
     return 1
 end
 
-complete -c opkg -n '__fish_opkg_use_package' -a '(__fish_print_packages)' -d 'Package'
+complete -c opkg -n __fish_opkg_use_package -a '(__fish_print_packages)' -d Package
 
-complete -c opkg -n '__fish_opkg_use_package_installed' -a '(__fish_print_packages --installed)' -d 'Package'
+complete -c opkg -n __fish_opkg_use_package_installed -a '(__fish_print_packages --installed)' -d Package
 
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'update' -d 'Update list of available packages'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'upgrade' -d 'Upgrade packages'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'install' -d 'Install package(s)'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'configure' -d 'Configure unpacked package(s)'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'remove' -d 'Remove package(s)'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'flag' -d 'Flag package(s)'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'list' -d 'List available packages'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'list-installed' -d 'List installed packages'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'list-upgradable' -d 'List installed and upgradable packages'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'list-changed-conffiles' -d 'List user modified configuration files'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'files' -d 'List files belonging to <pkg>'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'search' -d 'List package providing <file>'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'find' -d 'List packages whose name or description matches <regexp>'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'info' -d 'Display all info for <pkg>'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'status' -d 'Display all status for <pkg>'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'download' -d 'Download <pkg> to current directory'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'compare-versions' -d 'compare versions using <= < > >= = << >>'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'print-architecture' -d 'List installable package architectures'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'depends' -d 'list depends'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'whatdepends' -d 'list whatdepends'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'whatdependsrec' -d 'list whatdepends recursively'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'whatrecommends' -d 'list whatrecommends'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'whatsuggests' -d 'list whatsuggests'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'whatprovides' -d 'list whatprovides'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'whatconflicts' -d 'list whatconflicts'
-complete -f -n '__fish_opkg_no_subcommand' -c opkg -a 'whatreplaces' -d 'list whatreplaces'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a update -d 'Update list of available packages'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a upgrade -d 'Upgrade packages'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a install -d 'Install package(s)'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a configure -d 'Configure unpacked package(s)'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a remove -d 'Remove package(s)'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a flag -d 'Flag package(s)'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a list -d 'List available packages'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a list-installed -d 'List installed packages'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a list-upgradable -d 'List installed and upgradable packages'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a list-changed-conffiles -d 'List user modified configuration files'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a files -d 'List files belonging to <pkg>'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a search -d 'List package providing <file>'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a find -d 'List packages whose name or description matches <regexp>'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a info -d 'Display all info for <pkg>'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a status -d 'Display all status for <pkg>'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a download -d 'Download <pkg> to current directory'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a compare-versions -d 'compare versions using <= < > >= = << >>'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a print-architecture -d 'List installable package architectures'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a depends -d 'list depends'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a whatdepends -d 'list whatdepends'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a whatdependsrec -d 'list whatdepends recursively'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a whatrecommends -d 'list whatrecommends'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a whatsuggests -d 'list whatsuggests'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a whatprovides -d 'list whatprovides'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a whatconflicts -d 'list whatconflicts'
+complete -f -n __fish_opkg_no_subcommand -c opkg -a whatreplaces -d 'list whatreplaces'
 
 complete -c opkg -s A -d 'Query all packages not just those installed'
 complete -c opkg -s V -l verbosity -d 'Set verbosity level to <level>'
diff --git a/share/completions/optipng.fish b/share/completions/optipng.fish
index 03ef9b639..c036e14c0 100644
--- a/share/completions/optipng.fish
+++ b/share/completions/optipng.fish
@@ -2,39 +2,39 @@ complete -x -c optipng
 complete -x -c optipng -n '__fish_should_complete_switches; and __fish_is_first_arg' -a '-?\t"show help"'
 complete -x -c optipng -n '__fish_should_complete_switches; and __fish_is_first_arg' -a '-h\t"show help"'
 complete -x -c optipng -n '__fish_should_complete_switches; and __fish_is_first_arg' -a '-help\t"show help"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-v\t"run in verbose mode"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-backup\t"keep a backup of the modified files"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-keep\t"keep a backup of the modified files"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-clobber\t"overwrite existing files"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-fix\t"enable error recovery"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-force\t"enforce writing of a new output file"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-preserve\t"preserve file attributes if possible"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-quiet\t"run in quiet mode"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-silent\t"run in quiet mode"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-simulate\t"run in simulation mode"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-full\t"produce a full IDAT report (might reduce speed)"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-nb\t"no bit depth reduction"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-nc\t"no color type reduction"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-np\t"no palette reduction"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-nx\t"no reductions"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-nz\t"no IDAT recoding"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-snip\t"cut one image out of multi-image or animation files"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-strip\t"strip specified metadata objects (e.g. "all")"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-v\t"run in verbose mode"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-backup\t"keep a backup of the modified files"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-keep\t"keep a backup of the modified files"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-clobber\t"overwrite existing files"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-fix\t"enable error recovery"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-force\t"enforce writing of a new output file"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-preserve\t"preserve file attributes if possible"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-quiet\t"run in quiet mode"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-silent\t"run in quiet mode"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-simulate\t"run in simulation mode"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-full\t"produce a full IDAT report (might reduce speed)"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-nb\t"no bit depth reduction"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-nc\t"no color type reduction"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-np\t"no palette reduction"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-nx\t"no reductions"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-nz\t"no IDAT recoding"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-snip\t"cut one image out of multi-image or animation files"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-strip\t"strip specified metadata objects (e.g. "all")"'
 
 for n in (seq 0 9)
-    complete -x -c optipng -n '__fish_should_complete_switches' -a "-o$n\t\"PNG optimization level $n\""
+    complete -x -c optipng -n __fish_should_complete_switches -a "-o$n\t\"PNG optimization level $n\""
 end
 
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-i0\t"PNG interlace type 0"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-i1\t"PNG interlace type 1"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-i0\t"PNG interlace type 0"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-i1\t"PNG interlace type 1"'
 
 for n in (seq 0 5)
-    complete -x -c optipng -n '__fish_should_complete_switches' -a "-f$n\t'PNG delta filters $n'"
+    complete -x -c optipng -n __fish_should_complete_switches -a "-f$n\t'PNG delta filters $n'"
 end
 
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-out\t"write output file to <file>"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-dir\t"write output file(s) to <directory>"'
-complete -x -c optipng -n '__fish_should_complete_switches' -a '-log\t"log messages to <file>"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-out\t"write output file to <file>"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-dir\t"write output file(s) to <directory>"'
+complete -x -c optipng -n __fish_should_complete_switches -a '-log\t"log messages to <file>"'
 
 complete -x -c optipng -n 'not __fish_prev_arg_in -out -dir -log' \
     -a '(__fish_complete_suffix .png;  __fish_complete_suffix .pnm;  __fish_complete_suffix .tiff;  __fish_complete_suffix .bmp)'
diff --git a/share/completions/p4.fish b/share/completions/p4.fish
index 6e2250122..d5de08778 100644
--- a/share/completions/p4.fish
+++ b/share/completions/p4.fish
@@ -134,7 +134,7 @@ end
 
 function __fish_print_p4_pending_changelists -d "Lists all *pending* changelists. If 'default' argument is provided, default changelist will also be listed"
     if set -q argv[1]
-        and test $argv[1] = "default"
+        and test $argv[1] = default
         echo default\tDefault changelist
     end
     __fish_print_p4_workspace_changelists -s pending
@@ -310,7 +310,7 @@ end
 #########################################################
 
 function __fish_p4_register_command -d "Adds a completion for a specific command"
-    complete -c p4 -n "__fish_p4_not_in_command" -a $argv[1] $argv[2..-1]
+    complete -c p4 -n __fish_p4_not_in_command -a $argv[1] $argv[2..-1]
 end
 
 #########################################################
@@ -465,12 +465,12 @@ __fish_p4_register_command_option clean -s l -d "Display output in local file sy
 __fish_p4_register_command_option clean -s n -d "Preview the results of the operation without performing any action"
 
 # client, workspace @TODO: -Fs (only in -f), -c (only in -S stream)
-for a in 'client' 'workspace'
+for a in client workspace
     __fish_p4_register_command_option $a -x -a '(__fish_print_p4_workspaces)'
     __fish_p4_register_command_option $a -s f -d "Allows the last modification date, which is normally read-only, to be set"
     __fish_p4_register_command_option $a -s d -f -a '(__fish_print_p4_workspaces)' -d "Delete the specified client workspace whether or not the workspace is owned by the user"
     # __fish_p4_register_command_option $a -a '-Fs' -d 'Deletes client with shelves (must follow -f)'
-    __fish_p4_register_command_option $a -s F -a 's' -d 'Deletes client with shelves (must follow -f)'
+    __fish_p4_register_command_option $a -s F -a s -d 'Deletes client with shelves (must follow -f)'
     __fish_p4_register_command_option $a -s o -d "Write the client workspace spec to standard output"
     __fish_p4_register_command_option $a -s i -d "Read the client workspace spec from standard input"
     __fish_p4_register_command_option $a -s c -x -a '(__fish_print_p4_workspace_changelists)' -d "When used with -S stream, displays the workspace spec that would have been created for a stream at the moment the change was submitted"
@@ -481,7 +481,7 @@ for a in 'client' 'workspace'
 end
 
 # clients, workspaces @TODO -U and others are mutually exclusive
-for a in 'clients' 'workspaces'
+for a in clients workspaces
     __fish_p4_register_command_option $a -s a -d "List all client workspaces, not just workspaces bound to this server"
     __fish_p4_register_command_option $a -s e -x -d "List only client workspaces matching filter (case-sensitive)"
     __fish_p4_register_command_option $a -s E -x -d "List only client workspaces matching filter (case-insensitive)"
@@ -556,7 +556,7 @@ __fish_p4_register_command_option edit -s t -x -a '(__fish_print_p4_file_types)'
 #-----------------------------------------------------
 
 # change, changelist
-for a in 'change' 'changelist'
+for a in change changelist
     __fish_p4_register_command_option $a -x -a '(__fish_print_p4_pending_changelists)'
     __fish_p4_register_command_option $a -s s -d "Allows jobs to be assigned arbitrary status values on submission of the changelist, rather than the default status of closed"
     __fish_p4_register_command_option $a -s f -d "Force operation (The -u and the -f options are mutually exclusive)"
@@ -570,7 +570,7 @@ for a in 'change' 'changelist'
 end
 
 # changes, changelists
-for a in 'changes' 'changelists'
+for a in changes changelists
     __fish_p4_register_command_option $a -s i -d "Include changelists that affected files that were integrated with the specified files"
     __fish_p4_register_command_option $a -s t -d "Display the time as well as the date of each change"
     __fish_p4_register_command_option $a -s l -d "List long output, with the full text of each changelist description"
@@ -589,7 +589,7 @@ __fish_p4_register_command_option describe -s f -d 'Force the display of descrip
 __fish_p4_register_command_option describe -s O -d 'Specify the original changelist number'
 __fish_p4_register_command_option describe -s s -d 'Short output without diffs'
 __fish_p4_register_command_option describe -s S -d 'Display shelved files with diffs'
-__fish_p4_register_command_option describe -s d -x -a '(__fish_print_p4_diff_options)' -d 'Diff'
+__fish_p4_register_command_option describe -s d -x -a '(__fish_print_p4_diff_options)' -d Diff
 
 # filelog @TODO
 
@@ -660,13 +660,13 @@ __fish_p4_register_command_option unshelve -s S -x -a '(__fish_print_p4_streams)
 # cstat @TODO
 
 # integ, integrate @TODO -s fromFile is based on -b branchname, try resolving
-for a in 'integ' 'integrate'
+for a in integ integrate
     __fish_p4_register_command_option $a -s b -x -a '(__fish_print_p4_branches)' -d "Integrate the files using the sourceFile/targetFile mappings included in the branch view of branchname. If the toFiles argument is included, include only those target files in the branch view that match the pattern specified by toFiles"
     __fish_p4_register_command_option $a -s n -d "Display the integrations this command would perform without actually performing them"
     __fish_p4_register_command_option $a -s v -d "Open files for branching without copying toFiles into the client workspace"
     __fish_p4_register_command_option $a -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Open the toFiles for branch, integrate, or delete in the specified pending changelist"
     __fish_p4_register_command_option $a -s q -d "Quiet mode"
-    __fish_p4_register_command_option $a -a '-Di' -d "f the source file has been deleted and re-added, revisions that precede the deletion will be considered to be part of the same source file"
+    __fish_p4_register_command_option $a -a -Di -d "f the source file has been deleted and re-added, revisions that precede the deletion will be considered to be part of the same source file"
     __fish_p4_register_command_option $a -s f -d "Force the integration on all revisions of fromFile and toFile, even if some revisions have been integrated in the past"
     __fish_p4_register_command_option $a -s h -d "Use the have revision"
     __fish_p4_register_command_option $a -s O -x -a '(__fish_print_p4_integrate_output_options)' -d "Specify output options"
diff --git a/share/completions/pacaur.fish b/share/completions/pacaur.fish
index b2700d029..cd44922df 100644
--- a/share/completions/pacaur.fish
+++ b/share/completions/pacaur.fish
@@ -25,9 +25,9 @@ set -l upgrade '__fish_contains_opt -s U upgrade'
 set -l files '__fish_contains_opt -s F files'
 
 # HACK: We only need these three to coerce fish to stop file completion and complete options
-complete -c $progname -n $noopt -a "-D" -d "Modify the package database"
-complete -c $progname -n $noopt -a "-Q" -d "Query the package database"
-complete -c $progname -n $noopt -a "-C" -d "Manage .pac* files"
+complete -c $progname -n $noopt -a -D -d "Modify the package database"
+complete -c $progname -n $noopt -a -Q -d "Query the package database"
+complete -c $progname -n $noopt -a -C -d "Manage .pac* files"
 # Primary operations
 complete -c $progname -s D -f -l database -n $noopt -d 'Modify the package database'
 complete -c $progname -s Q -f -l query -n $noopt -d 'Query the package database'
diff --git a/share/completions/pacman-key.fish b/share/completions/pacman-key.fish
index 53bdc6408..942a09a7c 100644
--- a/share/completions/pacman-key.fish
+++ b/share/completions/pacman-key.fish
@@ -1,22 +1,22 @@
 
-complete -c pacman-key -s a -l 'add' -d 'Add or update keys from <file>'
-complete -c pacman-key -l 'config' -d 'Use an alternate config <file>'
-complete -c pacman-key -s d -l 'delete' -d 'Remove the <keys> from the keyring'
-complete -c pacman-key -s e -l 'export' -d 'Export <keys> to stdout'
-complete -c pacman-key -l 'edit-key' -d 'Present a menu on specified <keys>'
-complete -c pacman-key -s f -l 'finger' -d 'List a fingerprint for each specified <key>'
-complete -c pacman-key -l 'gpgdir' -d 'Alternate home <dir> for GnuPG'
-complete -c pacman-key -s h -l 'help' -d 'Output syntax and command line options'
-complete -c pacman-key -l 'import' -d 'Imports keys from <dir>/pubring.gpg'
-complete -c pacman-key -l 'import-trustdb' -d 'Imports ownertrust values from <dir>/trustdb.gpg'
-complete -c pacman-key -l 'init' -d 'Initialize the keyring'
-complete -c pacman-key -l 'keyserver' -d 'Use the specified <keyserver>'
-complete -c pacman-key -s l -l 'list-keys' -d 'Lists all or specified <keys> from the keyring'
-complete -c pacman-key -l 'list-sigs' -d 'Same as --list-keys, but with signatures'
-complete -c pacman-key -l 'lsign-key' -d 'Locally sign the given <key>'
-complete -c pacman-key -s r -l 'recv-keys' -d 'Equivalent to --recv-keys in GnuPG'
-complete -c pacman-key -l 'refresh-keys' -d 'Equivalent to --refresh-keys in GnuPG'
-complete -c pacman-key -l 'populate' -d 'Reload the default keys'
-complete -c pacman-key -s u -l 'updatedb' -d 'Equivalent to --check-trustdb in GnuPG'
-complete -c pacman-key -s v -l 'verify' -d 'Verify the given <signature> file'
-complete -c pacman-key -s V -l 'version' -d 'Displays the program version'
+complete -c pacman-key -s a -l add -d 'Add or update keys from <file>'
+complete -c pacman-key -l config -d 'Use an alternate config <file>'
+complete -c pacman-key -s d -l delete -d 'Remove the <keys> from the keyring'
+complete -c pacman-key -s e -l export -d 'Export <keys> to stdout'
+complete -c pacman-key -l edit-key -d 'Present a menu on specified <keys>'
+complete -c pacman-key -s f -l finger -d 'List a fingerprint for each specified <key>'
+complete -c pacman-key -l gpgdir -d 'Alternate home <dir> for GnuPG'
+complete -c pacman-key -s h -l help -d 'Output syntax and command line options'
+complete -c pacman-key -l import -d 'Imports keys from <dir>/pubring.gpg'
+complete -c pacman-key -l import-trustdb -d 'Imports ownertrust values from <dir>/trustdb.gpg'
+complete -c pacman-key -l init -d 'Initialize the keyring'
+complete -c pacman-key -l keyserver -d 'Use the specified <keyserver>'
+complete -c pacman-key -s l -l list-keys -d 'Lists all or specified <keys> from the keyring'
+complete -c pacman-key -l list-sigs -d 'Same as --list-keys, but with signatures'
+complete -c pacman-key -l lsign-key -d 'Locally sign the given <key>'
+complete -c pacman-key -s r -l recv-keys -d 'Equivalent to --recv-keys in GnuPG'
+complete -c pacman-key -l refresh-keys -d 'Equivalent to --refresh-keys in GnuPG'
+complete -c pacman-key -l populate -d 'Reload the default keys'
+complete -c pacman-key -s u -l updatedb -d 'Equivalent to --check-trustdb in GnuPG'
+complete -c pacman-key -s v -l verify -d 'Verify the given <signature> file'
+complete -c pacman-key -s V -l version -d 'Displays the program version'
diff --git a/share/completions/pacman.fish b/share/completions/pacman.fish
index d89314e4c..6f565d86f 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -21,8 +21,8 @@ set -l files '__fish_contains_opt -s F files'
 complete -c $progname -e
 complete -c $progname -f
 # HACK: We only need these two to coerce fish to stop file completion and complete options
-complete -c $progname -n "$noopt" -a "-D" -d "Modify the package database"
-complete -c $progname -n "$noopt" -a "-Q" -d "Query the package database"
+complete -c $progname -n "$noopt" -a -D -d "Modify the package database"
+complete -c $progname -n "$noopt" -a -Q -d "Query the package database"
 
 # Primary operations
 complete -c $progname -s D -f -l database -n "$noopt" -d 'Modify the package database'
@@ -105,7 +105,7 @@ complete -c $progname -n "$has_db_opt; and $database" -xa "$listinstalled"
 # File options - since pacman 5
 complete -c $progname -n "$files" -s x -l regex -d 'Interpret each query as a regular expression' -f
 complete -c $progname -n "$files" -l machinereadable -d 'Print each match in a machine readable output format' -f
-complete -c $progname -n "$files" -d 'Package' -xa "$listall"
+complete -c $progname -n "$files" -d Package -xa "$listall"
 
 # Query options
 complete -c $progname -n "$query" -s c -l changelog -d 'View the change log of PACKAGE' -f
diff --git a/share/completions/pacmd.fish b/share/completions/pacmd.fish
index c3ad1ef25..664578813 100644
--- a/share/completions/pacmd.fish
+++ b/share/completions/pacmd.fish
@@ -17,5 +17,5 @@ for t in client sink-input source-output
     complete -f -c pacmd -n "__fish_seen_subcommand_from kill-$t" -a '(__fish_pa_complete_type '$t's | string match -r "^[0-9].*")' # match because this only takes an index
 end
 
-complete -f -c pactl -n "__fish_seen_subcommand_from suspend" -a '0 false off' -d "Resume"
-complete -f -c pactl -n "__fish_seen_subcommand_from suspend" -a '1 true on' -d "Suspend"
+complete -f -c pactl -n "__fish_seen_subcommand_from suspend" -a '0 false off' -d Resume
+complete -f -c pactl -n "__fish_seen_subcommand_from suspend" -a '1 true on' -d Suspend
diff --git a/share/completions/pactl.fish b/share/completions/pactl.fish
index dce2a3b9f..895faa764 100644
--- a/share/completions/pactl.fish
+++ b/share/completions/pactl.fish
@@ -54,7 +54,7 @@ complete -f -c pactl -n "not __fish_seen_subcommand_from $commands" -a stat -d '
 complete -f -c pactl -n "not __fish_seen_subcommand_from $commands" -a info -d 'Show info about the daemon'
 complete -f -c pactl -n "not __fish_seen_subcommand_from $commands" -a list -d 'Show all loaded things of the specified type'
 complete -f -c pactl -n "__fish_seen_subcommand_from list" -a "modules sinks sources sink-inputs source-outputs clients samples cards"
-complete -f -c pactl -n "__fish_seen_subcommand_from list" -a "short" -d "Show shorter output"
+complete -f -c pactl -n "__fish_seen_subcommand_from list" -a short -d "Show shorter output"
 complete -f -c pactl -n "not __fish_seen_subcommand_from $commands" -a exit -d 'Ask the daemon to exit'
 
 complete -c pactl -n "not __fish_seen_subcommand_from $commands" -a upload-sample -d 'Upload a file to the sample cache'
@@ -79,9 +79,9 @@ for t in source sink
     complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
         -a "(__fish_pa_complete_type "$t"s)"
     complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-        -a '0 false off' -d "Resume"
+        -a '0 false off' -d Resume
     complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-        -a '1 true on' -d "Suspend"
+        -a '1 true on' -d Suspend
     complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-port; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
         -a "(__fish_pa_complete_type "$t"s)"
     complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-port; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
@@ -97,11 +97,11 @@ for t in source sink source-output sink-input
     complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
         -a "(__fish_pa_complete_type "$t"s)"
     complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-        -a "1 true on" -d "Muted"
+        -a "1 true on" -d Muted
     complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-        -a "0 false off" -d "Unmuted"
+        -a "0 false off" -d Unmuted
     complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-        -a "toggle"
+        -a toggle
 end
 
 complete -f -c pactl -n "__fish_seen_subcommand_from set-card-profile; and not __fish_seen_subcommand_from (__fish_pa_print_type cards)" \
diff --git a/share/completions/patool.fish b/share/completions/patool.fish
index 00c97e983..a3fd2e52e 100644
--- a/share/completions/patool.fish
+++ b/share/completions/patool.fish
@@ -2,19 +2,19 @@
 
 # Global options
 complete -f -c patool -s h -l help -d "Show help message"
-complete -f -c patool -n "__fish_no_arguments" -s v -l verbose -d "Be verbose"
-complete -f -c patool -n "__fish_no_arguments" -l non-interactive -d "Run in batch mode"
+complete -f -c patool -n __fish_no_arguments -s v -l verbose -d "Be verbose"
+complete -f -c patool -n __fish_no_arguments -l non-interactive -d "Run in batch mode"
 
 # Commands
-complete -f -c patool -n "__fish_use_subcommand" -a extract -d "Extract archive(s)"
-complete -f -c patool -n "__fish_use_subcommand" -a list -d "List files in archive(s)"
-complete -f -c patool -n "__fish_use_subcommand" -a create -d "Create archive"
-complete -f -c patool -n "__fish_use_subcommand" -a test -d "Test archive(s)"
-complete -f -c patool -n "__fish_use_subcommand" -a repack -d "Repackage archive to different format"
-complete -f -c patool -n "__fish_use_subcommand" -a recompress -d "Recompress archive to smaller"
-complete -f -c patool -n "__fish_use_subcommand" -a diff -d "Differences between two archives"
-complete -f -c patool -n "__fish_use_subcommand" -a search -d "Search contents of archive"
-complete -f -c patool -n "__fish_use_subcommand" -a formats -d "Show supported formats"
+complete -f -c patool -n __fish_use_subcommand -a extract -d "Extract archive(s)"
+complete -f -c patool -n __fish_use_subcommand -a list -d "List files in archive(s)"
+complete -f -c patool -n __fish_use_subcommand -a create -d "Create archive"
+complete -f -c patool -n __fish_use_subcommand -a test -d "Test archive(s)"
+complete -f -c patool -n __fish_use_subcommand -a repack -d "Repackage archive to different format"
+complete -f -c patool -n __fish_use_subcommand -a recompress -d "Recompress archive to smaller"
+complete -f -c patool -n __fish_use_subcommand -a diff -d "Differences between two archives"
+complete -f -c patool -n __fish_use_subcommand -a search -d "Search contents of archive"
+complete -f -c patool -n __fish_use_subcommand -a formats -d "Show supported formats"
 
 # extract option
 complete -c patool -n "__fish_seen_subcommand_from extract" -l outdir -d "Specify output directory"
diff --git a/share/completions/perl.fish b/share/completions/perl.fish
index b9af0d2d4..779c95eae 100644
--- a/share/completions/perl.fish
+++ b/share/completions/perl.fish
@@ -24,7 +24,7 @@ begin
     complete -c perl -s Co -n $unicode -d 'Filehandles written to are UTF-8'
     complete -c perl -s CO -n $unicode -d 'STDOUT is UTF-8'
     complete -c perl -s CS -n $unicode -d 'STDOUT, STDIN, and STDERR are UTF-8'
-    complete -c perl -s d -n $noopt -d 'Debugger'
+    complete -c perl -s d -n $noopt -d Debugger
     complete -c perl -s dt -n 'commandline | string match -qr "d\$"' -d 'Debugger, with threads'
     complete -c perl -s D -n $noopt -x -d 'Debug option'
     complete -c perl -s e -n $noopt -x -d 'Execute command'
diff --git a/share/completions/pg_restore.fish b/share/completions/pg_restore.fish
index 68d1cd4a4..18abf654e 100644
--- a/share/completions/pg_restore.fish
+++ b/share/completions/pg_restore.fish
@@ -1,6 +1,6 @@
 # General options:
 complete -c pg_restore -s d -l dbname -x -a '(__fish_complete_pg_database)' -d "Connect to database name"
-complete -c pg_restore -s f -l file -a '-' -r -d "Output file name (- for stdout)"
+complete -c pg_restore -s f -l file -a - -r -d "Output file name (- for stdout)"
 complete -c pg_restore -s F -l format -x -a "c\t'Custom format (pg_dump)' d\t'Directory archive' t\t'Tar archive'" -d "Backup file format (should be automatic)"
 complete -c pg_restore -s l -l list -d "Print summarized TOC of the archive"
 complete -c pg_restore -s v -l verbose -d "Verbose mode"
diff --git a/share/completions/phpunit.fish b/share/completions/phpunit.fish
index 1fb82a632..8cb18caaf 100644
--- a/share/completions/phpunit.fish
+++ b/share/completions/phpunit.fish
@@ -64,7 +64,7 @@ complete -f -c phpunit -l globals-backup -d 'Backup and restore $GLOBALS for eac
 complete -f -c phpunit -l static-backup -d 'Backup and restore static attributes for each test'
 
 complete -f -c phpunit -l colors -a 'never auto always' -d 'Use colors in output'
-complete -x -c phpunit -l columns -a 'max' -d 'Number of columns to use for progress output'
+complete -x -c phpunit -l columns -a max -d 'Number of columns to use for progress output'
 complete -f -c phpunit -l stderr -d 'Write to STDERR instead of STDOUT'
 complete -f -c phpunit -l stop-on-defect -d 'Stop execution upon first not-passed test'
 complete -f -c phpunit -l stop-on-error -d 'Stop execution upon first error'
diff --git a/share/completions/pkg_delete.fish b/share/completions/pkg_delete.fish
index 772e7fac7..f5cd2d972 100644
--- a/share/completions/pkg_delete.fish
+++ b/share/completions/pkg_delete.fish
@@ -1,7 +1,7 @@
 #completion for pkg_delete
 
 
-complete -c pkg_delete -a '(__fish_print_packages)' --description 'Package'
+complete -c pkg_delete -a '(__fish_print_packages)' --description Package
 
 complete -c pkg_delete -o a -d 'Delete unused deps'
 complete -c pkg_delete -o V -d 'Turn on stats'
diff --git a/share/completions/pkg_info.fish b/share/completions/pkg_info.fish
index 87cb65d52..4a2d2d9a7 100644
--- a/share/completions/pkg_info.fish
+++ b/share/completions/pkg_info.fish
@@ -1,5 +1,5 @@
 #completion for pkg_info
 
 
-complete -c pkg_info -a '(__fish_print_packages)' --description 'Package'
+complete -c pkg_info -a '(__fish_print_packages)' --description Package
 
diff --git a/share/completions/pkgadd.fish b/share/completions/pkgadd.fish
index a4b0d7e86..69452488a 100644
--- a/share/completions/pkgadd.fish
+++ b/share/completions/pkgadd.fish
@@ -1,6 +1,6 @@
 #completion for pkgadd
 
-complete -c pkgadd -o u -l upgrade -d 'Upgrade'
+complete -c pkgadd -o u -l upgrade -d Upgrade
 complete -c pkgadd -o f -l force -d 'Force installation, overwriting'
 complete -c pkgadd -o r -l root -d 'Alternative installation root'
 complete -c pkgadd -o v -l version -d 'Print version'
diff --git a/share/completions/pkginfo.fish b/share/completions/pkginfo.fish
index d8e7bbc4b..c346621ca 100644
--- a/share/completions/pkginfo.fish
+++ b/share/completions/pkginfo.fish
@@ -1,5 +1,5 @@
 # completions for Python pkginfo
-if pkginfo --help | string match -qr 'Python'
+if pkginfo --help | string match -qr Python
     complete -f -c pkginfo -s h -l help -d 'Print help'
     complete -x -c pkginfo -s m -l metadata-version -d 'Override metadata version'
     complete -x -c pkginfo -s f -l field -d 'Specify an output field (repeatable)'
diff --git a/share/completions/port.fish b/share/completions/port.fish
index 18f0f8ddc..5290ee06c 100644
--- a/share/completions/port.fish
+++ b/share/completions/port.fish
@@ -8,70 +8,70 @@ set -l subcommands activate archive build cat cd checksum clean configure \
     selfupdate setrequested setunrequested sync test unarchive uninstall \
     unload unsetrequested upgrade url usage variants version work
 
-complete -c port -n "__fish_seen_subcommand_from $subcommands" -a '(__fish_print_packages)' --description 'Package'
+complete -c port -n "__fish_seen_subcommand_from $subcommands" -a '(__fish_print_packages)' --description Package
 
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'activate' --description 'Set  version of a port to active'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'archive' --description "Create image for port without installing"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'build' --description 'Run build phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'cat' --description 'Print the Portfile of the given port(s)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'cd' --description 'Change directory to that containing portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'checksum' --description 'Compute checksums of distribution files'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'clean' --description 'Remove temporary files used to build a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'configure' --description 'Run configure phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'contents' --description 'List the files installed by a given port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'deactivate' --description 'Set the status of a port to inactive'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dependents' --description 'List ports that depend on a given port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'deps' --description 'Display a dependency listing for given port(s)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'destroot' --description 'Run destroot phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dir' --description 'print directory with Portfile for port expression'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'distcheck' --description 'Check if port can be fetched from all mirrors'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dmg' --description 'Create binary archives of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'echo' --description 'Print the list of ports the argument expands to'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'edit' --description 'Open the Portfile in an editor'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'extract' --description 'Run extract phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'fetch' --description 'Run fetch phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'file' --description 'Display the path to the Portfile for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'help' --description 'Get help on MacPorts commands'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'gohome' --description 'Load home page for given portname in web browser'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'info' --description 'Return information about the given ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'install' --description 'Install a new port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'installed' --description 'List installed versions (of port)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'lint' --description 'Verifies Portfile for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'list' --description 'List latest available version for given ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'livecheck' --description 'Check if new version of software is available'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'location' --description 'Print location of archive used for (de)activation'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'load' --description "load a port's daemon"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'log' --description 'Parse and show log files for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'logfile' --description 'Display the path to the log file for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mirror' --description 'Create/update local mirror of distfiles'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mdmg' --description 'Create disk image of portname and dependencies'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mpkg' --description 'Create binary archives of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'notes' --description 'Displays notes for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'outdated' --description 'List outdated ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'patch' --description 'Run patch phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'pkg' --description 'Create binary archives of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'provides' --description 'Find the port that installed a file'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rdependents' --description 'Recursively list ports depending on given port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rdeps' --description 'Display a recursive dependency listing of port(s)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'reload' --description "reload a port's daemon"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rev-upgrade' --description 'Rebuild ports containing broken binaries'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'search' --description 'Search for a port using keywords'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'select' --description 'Selects a version to be the default'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'selfupdate' --description 'Upgrade MacPorts and update list of ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'setrequested' --description 'Mark portname as requested'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'setunrequested' --description 'Mark portname as unrequested'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'sync' --description 'Update the port definition files'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'test' --description 'Run test phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unarchive' --description 'Extract destroot of given ports from archive'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'uninstall' --description 'Remove a previously installed port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unload' --description "Unload a port's daemon"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unsetrequested' --description 'Mark portname as unrequested'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'upgrade' --description 'Upgrade a port to the latest version'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'url' --description 'Display URL for path of given portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'usage' --description 'Displays a condensed usage summary'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'variants' --description 'Print list of variants with descriptions'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'version' --description 'Print the MacPorts version'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'work' --description 'Displays path to work directory for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a activate --description 'Set  version of a port to active'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a archive --description "Create image for port without installing"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a build --description 'Run build phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a cat --description 'Print the Portfile of the given port(s)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a cd --description 'Change directory to that containing portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a checksum --description 'Compute checksums of distribution files'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a clean --description 'Remove temporary files used to build a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a configure --description 'Run configure phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a contents --description 'List the files installed by a given port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a deactivate --description 'Set the status of a port to inactive'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a dependents --description 'List ports that depend on a given port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a deps --description 'Display a dependency listing for given port(s)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a destroot --description 'Run destroot phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a dir --description 'print directory with Portfile for port expression'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a distcheck --description 'Check if port can be fetched from all mirrors'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a dmg --description 'Create binary archives of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a echo --description 'Print the list of ports the argument expands to'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a edit --description 'Open the Portfile in an editor'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a extract --description 'Run extract phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a fetch --description 'Run fetch phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a file --description 'Display the path to the Portfile for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a help --description 'Get help on MacPorts commands'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a gohome --description 'Load home page for given portname in web browser'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a info --description 'Return information about the given ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a install --description 'Install a new port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a installed --description 'List installed versions (of port)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a lint --description 'Verifies Portfile for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a list --description 'List latest available version for given ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a livecheck --description 'Check if new version of software is available'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a location --description 'Print location of archive used for (de)activation'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a load --description "load a port's daemon"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a log --description 'Parse and show log files for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a logfile --description 'Display the path to the log file for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a mirror --description 'Create/update local mirror of distfiles'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a mdmg --description 'Create disk image of portname and dependencies'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a mpkg --description 'Create binary archives of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a notes --description 'Displays notes for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a outdated --description 'List outdated ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a patch --description 'Run patch phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a pkg --description 'Create binary archives of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a provides --description 'Find the port that installed a file'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a rdependents --description 'Recursively list ports depending on given port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a rdeps --description 'Display a recursive dependency listing of port(s)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a reload --description "reload a port's daemon"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a rev-upgrade --description 'Rebuild ports containing broken binaries'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a search --description 'Search for a port using keywords'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a select --description 'Selects a version to be the default'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a selfupdate --description 'Upgrade MacPorts and update list of ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a setrequested --description 'Mark portname as requested'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a setunrequested --description 'Mark portname as unrequested'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a sync --description 'Update the port definition files'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a test --description 'Run test phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a unarchive --description 'Extract destroot of given ports from archive'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a uninstall --description 'Remove a previously installed port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a unload --description "Unload a port's daemon"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a unsetrequested --description 'Mark portname as unrequested'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a upgrade --description 'Upgrade a port to the latest version'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a url --description 'Display URL for path of given portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a usage --description 'Displays a condensed usage summary'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a variants --description 'Print list of variants with descriptions'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a version --description 'Print the MacPorts version'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a work --description 'Displays path to work directory for portname'
 
 complete -c port -s v --description 'Verbose mode, generates verbose messages'
 complete -c port -s d --description 'Debug mode, implies -v'
diff --git a/share/completions/prt-get.fish b/share/completions/prt-get.fish
index 3b7f71580..4d2020fac 100644
--- a/share/completions/prt-get.fish
+++ b/share/completions/prt-get.fish
@@ -42,41 +42,41 @@ function __fish_prt_use_port -d 'Test if prt-get should have ports as potential
     return 1
 end
 
-complete -f -c prt-get -n '__fish_prt_use_package' -a '(__fish_prt_packages)' -d 'Package'
-complete -f -c prt-get -n '__fish_prt_use_port' -a '(__fish_prt_ports)' -d 'Port'
+complete -f -c prt-get -n __fish_prt_use_package -a '(__fish_prt_packages)' -d Package
+complete -f -c prt-get -n __fish_prt_use_port -a '(__fish_prt_ports)' -d Port
 
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'install' -d 'Install listed ports'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'depinst' -d 'Install listed ports and their deps'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'grpinst' -d 'Install listed ports, stop if one fails'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'update' -d 'Update listed packages'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'remove' -d 'Remove listed packages'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'sysup' -d 'Update all outdated installed packages'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'lock' -d 'Do not update this in sysup'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'unlock' -d 'Remove this from lock'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'diff' -d 'Print differences between installed packages and ports in the port tree'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'search' -d 'Search for an expr in port names'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'dsearch' -d 'Search for an expr in port names and descriptions'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'info' -d 'Print info on a port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'fsearch' -d 'Search for a pattern in the footprints in the ports tree'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'path' -d 'Print the path of a port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'readme' -d 'Print the eventual README of a port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'depends' -d 'Print a list of deps for the listed ports'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'quickdeo' -d 'Print a simple list of deps for the listed ports'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'deptree' -d 'Print a deptree for the port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'dup' -d 'List ports in multiple directories'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'list' -d 'List all the ports'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'printf' -d 'Print formatted list of ports'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'listinst' -d 'List installed packages'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'listorphans' -d 'List installed packages which have no dependent packages'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'isinst' -d 'Check if a port is installed'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'current' -d 'Print the version of an installed package'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'ls' -d 'Print the listing of the directory of a port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'cat' -d 'Print a file in a port to stdout'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'edit' -d 'Edit a file in a port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'help' -d 'Shows a help screen'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'dumpconfig' -d 'Print the configuration of prt-get'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'version' -d 'Show the current version of prt-get'
-complete -f -n '__fish_prt_no_subcommand' -c prt-get -a 'cache' -d 'Create a cache for prt-get'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a install -d 'Install listed ports'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a depinst -d 'Install listed ports and their deps'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a grpinst -d 'Install listed ports, stop if one fails'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a update -d 'Update listed packages'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a remove -d 'Remove listed packages'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a sysup -d 'Update all outdated installed packages'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a lock -d 'Do not update this in sysup'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a unlock -d 'Remove this from lock'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a diff -d 'Print differences between installed packages and ports in the port tree'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a search -d 'Search for an expr in port names'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a dsearch -d 'Search for an expr in port names and descriptions'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a info -d 'Print info on a port'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a fsearch -d 'Search for a pattern in the footprints in the ports tree'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a path -d 'Print the path of a port'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a readme -d 'Print the eventual README of a port'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a depends -d 'Print a list of deps for the listed ports'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a quickdeo -d 'Print a simple list of deps for the listed ports'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a deptree -d 'Print a deptree for the port'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a dup -d 'List ports in multiple directories'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a list -d 'List all the ports'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a printf -d 'Print formatted list of ports'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a listinst -d 'List installed packages'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a listorphans -d 'List installed packages which have no dependent packages'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a isinst -d 'Check if a port is installed'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a current -d 'Print the version of an installed package'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a ls -d 'Print the listing of the directory of a port'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a cat -d 'Print a file in a port to stdout'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a edit -d 'Edit a file in a port'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a help -d 'Shows a help screen'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a dumpconfig -d 'Print the configuration of prt-get'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a version -d 'Show the current version of prt-get'
+complete -f -n __fish_prt_no_subcommand -c prt-get -a cache -d 'Create a cache for prt-get'
 complete -c prt-get -o f -o i -d 'Force install'
 complete -c prt-get -o fr -d 'Force rebuild'
 complete -c prt-get -o um -d 'Update md5sum'
@@ -105,39 +105,39 @@ complete -c prt-get -l config -r -d 'Use alternative config file'
 complete -c prt-get -l install-root -r -d 'Use this alternative root for installation'
 complete -c prt-get -l log -d 'Write output to log file'
 
-complete -f -c prt-cache -n '__fish_prt_use_package' -a '(__fish_prt_packages)' -d 'Port'
-complete -f -c prt-cache -n '__fish_prt_use_port' -a '(__fish_prt_ports)' -d 'Package'
+complete -f -c prt-cache -n __fish_prt_use_package -a '(__fish_prt_packages)' -d Port
+complete -f -c prt-cache -n __fish_prt_use_port -a '(__fish_prt_ports)' -d Package
 
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'install' -d 'Install listed ports'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'depinst' -d 'Install listed ports and their deps'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'grpinst' -d 'Install listed ports, stop if one fails'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'update' -d 'Update listed packages'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'remove' -d 'Remove listed packages'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'sysup' -d 'Update all outdated installed packages'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'lock' -d 'Do not update this in sysup'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'unlock' -d 'Remove this from lock'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'diff' -d 'Print differences between installed packages and ports in the port tree'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'search' -d 'Search for an expr in port names'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'dsearch' -d 'Search for an expr in port names and descriptions'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'info' -d 'Print info on a port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'fsearch' -d 'Search for a pattern in the footprints in the ports tree'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'path' -d 'Print the path of a port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'readme' -d 'Print the eventual README of a port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'depends' -d 'Print a list of deps for the listed ports'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'quickdeo' -d 'Print a simple list of deps for the listed ports'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'deptree' -d 'Print a deptree for the port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'list' -d 'List all the ports'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'printf' -d 'Print formatted list of ports'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'listinst' -d 'List installed packages'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'listorphans' -d 'List installed packages which have no dependent packages'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'current' -d 'Print the version of an installed package'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'ls' -d 'Print the listing of the directory of a port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'cat' -d 'Print a file in a port to stdout'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'edit' -d 'Edit a file in a port'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'help' -d 'Shows a help screen'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'dumpconfig' -d 'Print the configuration of prt-get'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'version' -d 'Show the current version of prt-get'
-complete -f -n '__fish_prt_no_subcommand' -c prt-cache -a 'cache' -d 'Create a cache for prt-get'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a install -d 'Install listed ports'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a depinst -d 'Install listed ports and their deps'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a grpinst -d 'Install listed ports, stop if one fails'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a update -d 'Update listed packages'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a remove -d 'Remove listed packages'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a sysup -d 'Update all outdated installed packages'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a lock -d 'Do not update this in sysup'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a unlock -d 'Remove this from lock'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a diff -d 'Print differences between installed packages and ports in the port tree'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a search -d 'Search for an expr in port names'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a dsearch -d 'Search for an expr in port names and descriptions'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a info -d 'Print info on a port'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a fsearch -d 'Search for a pattern in the footprints in the ports tree'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a path -d 'Print the path of a port'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a readme -d 'Print the eventual README of a port'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a depends -d 'Print a list of deps for the listed ports'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a quickdeo -d 'Print a simple list of deps for the listed ports'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a deptree -d 'Print a deptree for the port'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a list -d 'List all the ports'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a printf -d 'Print formatted list of ports'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a listinst -d 'List installed packages'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a listorphans -d 'List installed packages which have no dependent packages'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a current -d 'Print the version of an installed package'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a ls -d 'Print the listing of the directory of a port'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a cat -d 'Print a file in a port to stdout'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a edit -d 'Edit a file in a port'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a help -d 'Shows a help screen'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a dumpconfig -d 'Print the configuration of prt-get'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a version -d 'Show the current version of prt-get'
+complete -f -n __fish_prt_no_subcommand -c prt-cache -a cache -d 'Create a cache for prt-get'
 complete -c prt-cache -o f -o i -d 'Force install'
 complete -c prt-cache -o fr -d 'Force rebuild'
 complete -c prt-cache -o um -d 'Update md5sum'
diff --git a/share/completions/pyenv.fish b/share/completions/pyenv.fish
index 6a0858d15..f0332dc93 100644
--- a/share/completions/pyenv.fish
+++ b/share/completions/pyenv.fish
@@ -37,80 +37,80 @@ function __fish_pyenv_prefixes
 end
 
 ### commands
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a commands -d 'List all available pyenv commands'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a commands -d 'List all available pyenv commands'
 complete -f -c pyenv -n '__fish_pyenv_using_command commands' -a '--sh --no-sh'
 
 ### completions
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a completions
+complete -f -c pyenv -n __fish_pyenv_needs_command -a completions
 
 ### exec
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a exec
+complete -f -c pyenv -n __fish_pyenv_needs_command -a exec
 complete -f -c pyenv -n '__fish_pyenv_using_command exec' -a '(__fish_pyenv_executables)'
 
 ### global
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a global -d 'Set or show the global Python version'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a global -d 'Set or show the global Python version'
 complete -f -c pyenv -n '__fish_pyenv_using_command global' -a '(__fish_pyenv_installed_versions)'
 
 ### help
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a help
+complete -f -c pyenv -n __fish_pyenv_needs_command -a help
 
 ### hooks
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a hooks -d 'List hook scripts for a given pyenv command'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a hooks -d 'List hook scripts for a given pyenv command'
 
 ### init
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a init -d 'Configure the shell environment for pyenv'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a init -d 'Configure the shell environment for pyenv'
 
 ### install
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a install -d 'Install a Python version'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a install -d 'Install a Python version'
 complete -f -c pyenv -n '__fish_pyenv_using_command install' -a '(__fish_pyenv_available_versions)'
 
 ### local
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a local -d 'Set or show the local application-specific Python version'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a local -d 'Set or show the local application-specific Python version'
 complete -f -c pyenv -n '__fish_pyenv_using_command local' -a '(__fish_pyenv_installed_versions)'
 
 ### prefix
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a prefix -d 'Display the directory where a Python version is installed'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a prefix -d 'Display the directory where a Python version is installed'
 complete -f -c pyenv -n '__fish_pyenv_using_command prefix' -a '(__fish_pyenv_prefixes)'
 
 ### rehash
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a rehash -d 'Rehash pyenv shims (run this after installing executables)'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a rehash -d 'Rehash pyenv shims (run this after installing executables)'
 
 ### root
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a root -d 'Display the root directory where versions and shims are kept'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a root -d 'Display the root directory where versions and shims are kept'
 
 ### shell
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a shell -d 'Set or show the shell-specific Python version'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a shell -d 'Set or show the shell-specific Python version'
 complete -f -c pyenv -n '__fish_pyenv_using_command shell' -a '--unset (__fish_pyenv_installed_versions)'
 
 ### shims
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a shims -d 'List existing pyenv shims'
-complete -f -c pyenv -n '__fish_pyenv_using_command shims' -a '--short'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a shims -d 'List existing pyenv shims'
+complete -f -c pyenv -n '__fish_pyenv_using_command shims' -a --short
 
 ### version
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version -d 'Show the current Python version & how it was selected'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a version -d 'Show the current Python version & how it was selected'
 
 ### version-file
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version-file -d 'Detect the file that sets the current pyenv version'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a version-file -d 'Detect the file that sets the current pyenv version'
 
 ### version-file-read
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version-file-read
+complete -f -c pyenv -n __fish_pyenv_needs_command -a version-file-read
 
 ### version-file-write
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version-file-write
+complete -f -c pyenv -n __fish_pyenv_needs_command -a version-file-write
 
 ### version-name
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version-name -d 'Show the current Python version'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a version-name -d 'Show the current Python version'
 
 ### version-origin
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version-origin -d 'Explain how the current Python version is set'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a version-origin -d 'Explain how the current Python version is set'
 
 ### versions
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a versions -d 'List all Python versions known by pyenv'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a versions -d 'List all Python versions known by pyenv'
 
 ### whence
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a whence -d 'List all Python versions that contain the given executable'
-complete -f -c pyenv -n '__fish_pyenv_using_command whence' -a '--path'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a whence -d 'List all Python versions that contain the given executable'
+complete -f -c pyenv -n '__fish_pyenv_using_command whence' -a --path
 
 ### which
-complete -f -c pyenv -n '__fish_pyenv_needs_command' -a which -d 'Show the full path for the given Python executable'
+complete -f -c pyenv -n __fish_pyenv_needs_command -a which -d 'Show the full path for the given Python executable'
 complete -f -c pyenv -n '__fish_pyenv_using_command which' -a '(__fish_pyenv_executables)'
diff --git a/share/completions/python.fish b/share/completions/python.fish
index cfbea007d..8a7710fcf 100644
--- a/share/completions/python.fish
+++ b/share/completions/python.fish
@@ -16,8 +16,8 @@ complete -c python -o vv -d "Even more verbose mode"
 complete -c python -s V -l version -d "Display version and exit"
 complete -c python -s W -x -d "Warning control" -a "ignore default all module once error"
 complete -c python -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
-complete -c python -f -n '__fish_is_first_token' -a "(__fish_complete_suffix .py)"
-complete -c python -f -n '__fish_is_first_token' -a '-' -d 'Read program from stdin'
+complete -c python -f -n __fish_is_first_token -a "(__fish_complete_suffix .py)"
+complete -c python -f -n __fish_is_first_token -a - -d 'Read program from stdin'
 
 # Version-specific completions
 # We have to detect this at runtime because pyenv etc can change
diff --git a/share/completions/python2.fish b/share/completions/python2.fish
index 39950b6c9..76dff0340 100644
--- a/share/completions/python2.fish
+++ b/share/completions/python2.fish
@@ -13,8 +13,8 @@ complete -c python2 -s v -d "Verbose mode"
 complete -c python2 -s V -d "Display version and exit"
 complete -c python2 -s W -x -d "Warning control" -a "ignore default all module once error"
 complete -c python2 -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
-complete -c python2 -f -n '__fish_is_first_token' -a "(__fish_complete_suffix .py)"
-complete -c python2 -f -n '__fish_is_first_token' -a '-' -d 'Read program from stdin'
+complete -c python2 -f -n __fish_is_first_token -a "(__fish_complete_suffix .py)"
+complete -c python2 -f -n __fish_is_first_token -a - -d 'Read program from stdin'
 complete -c python2 -s 3 -d 'Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix'
 complete -c python2 -s t -d "Warn on mixed tabs and spaces"
 complete -c python2 -s Q -x -a "old new warn warnall" -d "Division control"
diff --git a/share/completions/python3.fish b/share/completions/python3.fish
index 2113bd0dd..357a2e373 100644
--- a/share/completions/python3.fish
+++ b/share/completions/python3.fish
@@ -13,8 +13,8 @@ complete -c python3 -s v -d "Verbose mode"
 complete -c python3 -s V -d "Display version and exit"
 complete -c python3 -s W -x -d "Warning control" -a "ignore default all module once error"
 complete -c python3 -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
-complete -c python3 -n '__fish_is_first_token' -fa "(__fish_complete_suffix .py)"
-complete -c python3 -f -n '__fish_is_first_token' -a '-' -d 'Read program from stdin'
+complete -c python3 -n __fish_is_first_token -fa "(__fish_complete_suffix .py)"
+complete -c python3 -f -n __fish_is_first_token -a - -d 'Read program from stdin'
 complete -c python3 -s q -d 'Don\'t print version and copyright messages on interactive startup'
 complete -c python3 -s X -x -d 'Set implementation-specific option'
 complete -c python3 -s b -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
diff --git a/share/completions/pzstd.fish b/share/completions/pzstd.fish
index ea532a35f..5544b95db 100644
--- a/share/completions/pzstd.fish
+++ b/share/completions/pzstd.fish
@@ -1,6 +1,6 @@
 # Completions for pzstd
 
-complete -c pzstd -s d -l decompress -d "Decompress" -x -a "
+complete -c pzstd -s d -l decompress -d Decompress -x -a "
 (
     __fish_complete_suffix .zst
 )
diff --git a/share/completions/rbenv.fish b/share/completions/rbenv.fish
index ed9c6f336..8e962470f 100644
--- a/share/completions/rbenv.fish
+++ b/share/completions/rbenv.fish
@@ -42,80 +42,80 @@ function __fish_rbenv_prefixes
 end
 
 ### commands
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a commands -d 'List all available rbenv commands'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a commands -d 'List all available rbenv commands'
 complete -f -c rbenv -n '__fish_rbenv_using_command commands' -a '--sh --no-sh'
 
 ### completions
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a completions
+complete -f -c rbenv -n __fish_rbenv_needs_command -a completions
 
 ### exec
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a exec
+complete -f -c rbenv -n __fish_rbenv_needs_command -a exec
 complete -f -c rbenv -n '__fish_rbenv_using_command exec' -a '(__fish_rbenv_executables)'
 
 ### global
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a global -d 'Set or show the global Ruby version'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a global -d 'Set or show the global Ruby version'
 complete -f -c rbenv -n '__fish_rbenv_using_command global' -a '(__fish_rbenv_installed_rubies)'
 
 ### help
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a help
+complete -f -c rbenv -n __fish_rbenv_needs_command -a help
 
 ### hooks
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a hooks -d 'List hook scripts for a given rbenv command'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a hooks -d 'List hook scripts for a given rbenv command'
 
 ### init
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a init -d 'Configure the shell environment for rbenv'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a init -d 'Configure the shell environment for rbenv'
 
 ### install
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a install -d 'Install a Ruby version'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a install -d 'Install a Ruby version'
 complete -f -c rbenv -n '__fish_rbenv_using_command install' -a '(__fish_rbenv_official_rubies)'
 
 ### local
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a local -d 'Set or show the local application-specific Ruby version'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a local -d 'Set or show the local application-specific Ruby version'
 complete -f -c rbenv -n '__fish_rbenv_using_command local' -a '(__fish_rbenv_installed_rubies)'
 
 ### prefix
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a prefix -d 'Display the directory where a Ruby version is installed'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a prefix -d 'Display the directory where a Ruby version is installed'
 complete -f -c rbenv -n '__fish_rbenv_using_command prefix' -a '(__fish_rbenv_prefixes)'
 
 ### rehash
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a rehash -d 'Rehash rbenv shims (run this after installing executables)'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a rehash -d 'Rehash rbenv shims (run this after installing executables)'
 
 ### root
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a root -d 'Display the root directory where versions and shims are kept'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a root -d 'Display the root directory where versions and shims are kept'
 
 ### shell
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a shell -d 'Set or show the shell-specific Ruby version'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a shell -d 'Set or show the shell-specific Ruby version'
 complete -f -c rbenv -n '__fish_rbenv_using_command shell' -a '--unset (__fish_rbenv_installed_rubies)'
 
 ### shims
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a shims -d 'List existing rbenv shims'
-complete -f -c rbenv -n '__fish_rbenv_using_command shims' -a '--short'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a shims -d 'List existing rbenv shims'
+complete -f -c rbenv -n '__fish_rbenv_using_command shims' -a --short
 
 ### version
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version -d 'Show the current Ruby version & how it was selected'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a version -d 'Show the current Ruby version & how it was selected'
 
 ### version-file
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-file -d 'Detect the file that sets the current rbenv version'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a version-file -d 'Detect the file that sets the current rbenv version'
 
 ### version-file-read
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-file-read
+complete -f -c rbenv -n __fish_rbenv_needs_command -a version-file-read
 
 ### version-file-write
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-file-write
+complete -f -c rbenv -n __fish_rbenv_needs_command -a version-file-write
 
 ### version-name
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-name -d 'Show the current Ruby version'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a version-name -d 'Show the current Ruby version'
 
 ### version-origin
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-origin -d 'Explain how the current Ruby version is set'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a version-origin -d 'Explain how the current Ruby version is set'
 
 ### versions
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a versions -d 'List all Ruby versions known by rbenv'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a versions -d 'List all Ruby versions known by rbenv'
 
 ### whence
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a whence -d 'List all Ruby versions that contain the given executable'
-complete -f -c rbenv -n '__fish_rbenv_using_command whence' -a '--path'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a whence -d 'List all Ruby versions that contain the given executable'
+complete -f -c rbenv -n '__fish_rbenv_using_command whence' -a --path
 
 ### which
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a which -d 'Show the full path for the given Ruby executable'
+complete -f -c rbenv -n __fish_rbenv_needs_command -a which -d 'Show the full path for the given Ruby executable'
 complete -f -c rbenv -n '__fish_rbenv_using_command which' -a '(__fish_rbenv_executables)'
diff --git a/share/completions/ruby-build.fish b/share/completions/ruby-build.fish
index f596dc693..5414f75ea 100644
--- a/share/completions/ruby-build.fish
+++ b/share/completions/ruby-build.fish
@@ -10,10 +10,10 @@ function __fish_ruby-build_definitions
     ruby-build --definitions
 end
 
-complete -f -c ruby-build -n '__fish_ruby-build_needs_command' -a '(__fish_ruby-build_definitions)' -d 'Definition'
+complete -f -c ruby-build -n __fish_ruby-build_needs_command -a '(__fish_ruby-build_definitions)' -d Definition
 
-complete -f -c ruby-build -n '__fish_ruby-build_needs_command' -l keep -s k -d 'Do not remove source tree after installation'
-complete -f -c ruby-build -n '__fish_ruby-build_needs_command' -l verbose -s v -d 'Verbose mode: print compilation status to stdout'
-complete -f -c ruby-build -n '__fish_ruby-build_needs_command' -l definitions -d 'List all built-in definitions'
+complete -f -c ruby-build -n __fish_ruby-build_needs_command -l keep -s k -d 'Do not remove source tree after installation'
+complete -f -c ruby-build -n __fish_ruby-build_needs_command -l verbose -s v -d 'Verbose mode: print compilation status to stdout'
+complete -f -c ruby-build -n __fish_ruby-build_needs_command -l definitions -d 'List all built-in definitions'
 
-complete -f -c ruby-build -n '__fish_ruby-build_needs_command' -l help -s h -d 'Display help information'
+complete -f -c ruby-build -n __fish_ruby-build_needs_command -l help -s h -d 'Display help information'
diff --git a/share/completions/ruby.fish b/share/completions/ruby.fish
index 979607f09..cc2586554 100644
--- a/share/completions/ruby.fish
+++ b/share/completions/ruby.fish
@@ -3,7 +3,7 @@ complete -c ruby -s 0 -d 'Specify record separator'
 complete -c ruby -s a -d 'Turn on autosplit mode'
 complete -c ruby -s c -d 'Check syntax'
 complete -c ruby -s K -d 'Kanji code-set'
-complete -c ruby -s d -l debug -d 'Debugger'
+complete -c ruby -s d -l debug -d Debugger
 complete -c ruby -s e -x -d 'Execute command'
 complete -c ruby -s h -l help -d 'Display help and exit'
 complete -c ruby -s F -d 'Set regexp used to split input'
@@ -20,6 +20,6 @@ complete -c ruby -s v -l verbose -d 'Verbose mode'
 complete -c ruby -s w -d 'Verbose mode without message'
 complete -c ruby -l version -d 'Display version and exit'
 complete -c ruby -s x -d 'Extract script'
-complete -c ruby -s X -x -a '(__fish_complete_directories (commandline -ct))' -d 'Directory'
+complete -c ruby -s X -x -a '(__fish_complete_directories (commandline -ct))' -d Directory
 complete -c ruby -s y -l yydebug -d 'Compiler debug mode'
 
diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
index fac9fb143..2b3a91eaf 100644
--- a/share/completions/rustup.fish
+++ b/share/completions/rustup.fish
@@ -1,31 +1,31 @@
 complete -c rustup -e
 
 set -l subcmds \
-    "show" \
-    "update" \
-    "default" \
-    "toolchain" \
-    "target" \
-    "component" \
-    "override" \
-    "run" \
-    "which" \
-    "doc" \
-    "man" \
-    "self" \
-    "set" \
+    show \
+    update \
+    default \
+    toolchain \
+    target \
+    component \
+    override \
+    run \
+    which \
+    doc \
+    man \
+    self \
+    set \
     # "completions" \
-    "help"
+    help
 
 set -l rustup_show \
-    "active-toolchain" \
-    "home" \
-    "profile" \
-    "help"
+    active-toolchain \
+    home \
+    profile \
+    help
 
 # rustup does not really expose a mechanism of retrieving a list of all valid components without the archs appended
 function __rustup_components
-    rustup component list | string match -r "^\S+" | string replace -f -- "-x86_64-unknown-linux-gnu" ""
+    rustup component list | string match -r "^\S+" | string replace -f -- -x86_64-unknown-linux-gnu ""
 end
 
 # function __rustup_installable_components
@@ -37,110 +37,110 @@ end
 function __rustup_triples
     # The list below must be kept sorted alphabetically
     printf "%s\n" \
-        "aarch64-apple-ios" \
-        "aarch64-linux-android" \
-        "aarch64-pc-windows-msvc" \
-        "aarch64-unknown-cloudabi" \
-        "aarch64-unknown-fuchsia" \
-        "aarch64-unknown-linux-gnu" \
-        "aarch64-unknown-linux-musl" \
-        "aarch64-unknown-redox" \
-        "armebv7r-none-eabi" \
-        "armebv7r-none-eabihf" \
-        "arm-linux-androideabi" \
-        "arm-unknown-linux-gnueabi" \
-        "arm-unknown-linux-gnueabihf" \
-        "arm-unknown-linux-musleabi" \
-        "arm-unknown-linux-musleabihf" \
-        "armv5te-unknown-linux-gnueabi" \
-        "armv5te-unknown-linux-musleabi" \
-        "armv7-apple-ios" \
-        "armv7-linux-androideabi" \
-        "armv7r-none-eabi" \
-        "armv7r-none-eabihf" \
-        "armv7s-apple-ios" \
-        "armv7-unknown-cloudabi-eabihf" \
-        "armv7-unknown-linux-gnueabi" \
-        "armv7-unknown-linux-gnueabihf" \
-        "armv7-unknown-linux-musleabi" \
-        "armv7-unknown-linux-musleabihf" \
-        "asmjs-unknown-emscripten" \
-        "i386-apple-ios" \
-        "i586-pc-windows-msvc" \
-        "i586-unknown-linux-gnu" \
-        "i586-unknown-linux-musl" \
-        "i686-apple-darwin" \
-        "i686-linux-android" \
-        "i686-pc-windows-gnu" \
-        "i686-pc-windows-msvc" \
-        "i686-unknown-cloudabi" \
-        "i686-unknown-freebsd" \
-        "i686-unknown-haiku" \
-        "i686-unknown-linux-gnu" \
-        "i686-unknown-linux-musl" \
-        "i686-unknown-netbsd" \
-        "le32-unknown-nacl" \
-        "mips64el-unknown-linux-gnuabi64" \
-        "mips64-unknown-linux-gnuabi64" \
-        "mipsel-unknown-linux-gnu" \
-        "mipsel-unknown-linux-musl" \
-        "mipsel-unknown-linux-uclibc" \
-        "mipsisa32r6el-unknown-linux-gnu" \
-        "mipsisa32r6-unknown-linux-gnu" \
-        "mipsisa64r6el-unknown-linux-gnuabi64" \
-        "mipsisa64r6-unknown-linux-gnuabi64" \
-        "mips-unknown-linux-gnu" \
-        "mips-unknown-linux-musl" \
-        "mips-unknown-linux-uclibc" \
-        "msp430-none-elf" \
-        "nvptx64-nvidia-cuda" \
-        "powerpc64le-unknown-linux-gnu" \
-        "powerpc64-unknown-linux-gnu" \
-        "powerpc-unknown-linux-gnu" \
-        "powerpc-unknown-linux-gnuspe" \
-        "riscv32imac-unknown-none-elf" \
-        "riscv32imc-unknown-none-elf" \
-        "riscv32i-unknown-none-elf" \
-        "riscv64gc-unknown-none-elf" \
-        "riscv64imac-unknown-none-elf" \
-        "s390x-unknown-linux-gnu" \
-        "sparc64-unknown-linux-gnu" \
-        "sparc64-unknown-netbsd" \
-        "sparc-unknown-linux-gnu" \
-        "sparcv9-sun-solaris" \
-        "thumbv6m-none-eabi" \
-        "thumbv7em-none-eabi" \
-        "thumbv7em-none-eabihf" \
-        "thumbv7m-none-eabi" \
-        "thumbv7neon-linux-androideabi" \
-        "thumbv7neon-unknown-linux-gnueabihf" \
+        aarch64-apple-ios \
+        aarch64-linux-android \
+        aarch64-pc-windows-msvc \
+        aarch64-unknown-cloudabi \
+        aarch64-unknown-fuchsia \
+        aarch64-unknown-linux-gnu \
+        aarch64-unknown-linux-musl \
+        aarch64-unknown-redox \
+        armebv7r-none-eabi \
+        armebv7r-none-eabihf \
+        arm-linux-androideabi \
+        arm-unknown-linux-gnueabi \
+        arm-unknown-linux-gnueabihf \
+        arm-unknown-linux-musleabi \
+        arm-unknown-linux-musleabihf \
+        armv5te-unknown-linux-gnueabi \
+        armv5te-unknown-linux-musleabi \
+        armv7-apple-ios \
+        armv7-linux-androideabi \
+        armv7r-none-eabi \
+        armv7r-none-eabihf \
+        armv7s-apple-ios \
+        armv7-unknown-cloudabi-eabihf \
+        armv7-unknown-linux-gnueabi \
+        armv7-unknown-linux-gnueabihf \
+        armv7-unknown-linux-musleabi \
+        armv7-unknown-linux-musleabihf \
+        asmjs-unknown-emscripten \
+        i386-apple-ios \
+        i586-pc-windows-msvc \
+        i586-unknown-linux-gnu \
+        i586-unknown-linux-musl \
+        i686-apple-darwin \
+        i686-linux-android \
+        i686-pc-windows-gnu \
+        i686-pc-windows-msvc \
+        i686-unknown-cloudabi \
+        i686-unknown-freebsd \
+        i686-unknown-haiku \
+        i686-unknown-linux-gnu \
+        i686-unknown-linux-musl \
+        i686-unknown-netbsd \
+        le32-unknown-nacl \
+        mips64el-unknown-linux-gnuabi64 \
+        mips64-unknown-linux-gnuabi64 \
+        mipsel-unknown-linux-gnu \
+        mipsel-unknown-linux-musl \
+        mipsel-unknown-linux-uclibc \
+        mipsisa32r6el-unknown-linux-gnu \
+        mipsisa32r6-unknown-linux-gnu \
+        mipsisa64r6el-unknown-linux-gnuabi64 \
+        mipsisa64r6-unknown-linux-gnuabi64 \
+        mips-unknown-linux-gnu \
+        mips-unknown-linux-musl \
+        mips-unknown-linux-uclibc \
+        msp430-none-elf \
+        nvptx64-nvidia-cuda \
+        powerpc64le-unknown-linux-gnu \
+        powerpc64-unknown-linux-gnu \
+        powerpc-unknown-linux-gnu \
+        powerpc-unknown-linux-gnuspe \
+        riscv32imac-unknown-none-elf \
+        riscv32imc-unknown-none-elf \
+        riscv32i-unknown-none-elf \
+        riscv64gc-unknown-none-elf \
+        riscv64imac-unknown-none-elf \
+        s390x-unknown-linux-gnu \
+        sparc64-unknown-linux-gnu \
+        sparc64-unknown-netbsd \
+        sparc-unknown-linux-gnu \
+        sparcv9-sun-solaris \
+        thumbv6m-none-eabi \
+        thumbv7em-none-eabi \
+        thumbv7em-none-eabihf \
+        thumbv7m-none-eabi \
+        thumbv7neon-linux-androideabi \
+        thumbv7neon-unknown-linux-gnueabihf \
         "thumbv8m.base-none-eabi" \
         "thumbv8m.main-none-eabi" \
         "thumbv8m.main-none-eabihf" \
-        "wasm32-unknown-emscripten" \
-        "wasm32-unknown-unknown" \
-        "x86_64-apple-darwin" \
-        "x86_64-apple-ios" \
-        "x86_64-fortanix-unknown-sgx" \
-        "x86_64-linux-android" \
-        "x86_64-pc-solaris" \
-        "x86_64-pc-windows-gnu" \
-        "x86_64-pc-windows-msvc" \
-        "x86_64-rumprun-netbsd" \
-        "x86_64-sun-solaris" \
-        "x86_64-unknown-bitrig" \
-        "x86_64-unknown-cloudabi" \
-        "x86_64-unknown-dragonfly" \
-        "x86_64-unknown-freebsd" \
-        "x86_64-unknown-fuchsia" \
-        "x86_64-unknown-haiku" \
-        "x86_64-unknown-linux-gnu" \
-        "x86_64-unknown-linux-gnu" \
-        "x86_64-unknown-linux-gnux32" \
-        "x86_64-unknown-linux-musl" \
-        "x86_64-unknown-netbsd" \
-        "x86_64-unknown-openbsd" \
-        "x86_64-unknown-redox"
+        wasm32-unknown-emscripten \
+        wasm32-unknown-unknown \
+        x86_64-apple-darwin \
+        x86_64-apple-ios \
+        x86_64-fortanix-unknown-sgx \
+        x86_64-linux-android \
+        x86_64-pc-solaris \
+        x86_64-pc-windows-gnu \
+        x86_64-pc-windows-msvc \
+        x86_64-rumprun-netbsd \
+        x86_64-sun-solaris \
+        x86_64-unknown-bitrig \
+        x86_64-unknown-cloudabi \
+        x86_64-unknown-dragonfly \
+        x86_64-unknown-freebsd \
+        x86_64-unknown-fuchsia \
+        x86_64-unknown-haiku \
+        x86_64-unknown-linux-gnu \
+        x86_64-unknown-linux-gnu \
+        x86_64-unknown-linux-gnux32 \
+        x86_64-unknown-linux-musl \
+        x86_64-unknown-netbsd \
+        x86_64-unknown-openbsd \
+        x86_64-unknown-redox
 end
 
 # Given n arguments, return the longest suffix common to all
@@ -194,7 +194,7 @@ function __rustup_strip_common_suffix_strict
 end
 
 function __rustup_all_toolchains
-    set -l __rustup_channels "beta" "stable" "nightly"
+    set -l __rustup_channels beta stable nightly
     printf "%s\n" $__rustup_channels
     printf "%s\n" $__rustup_channels-(__rustup_triples)
 end
@@ -224,13 +224,13 @@ set -l __rustup_toolchains (rustup toolchain list | string replace -r "\s+.*" ''
 # but a shorter version can be used if it is unambiguous.
 set -l __rustup_toolchains_short (__rustup_strip_common_suffix_strict $__rustup_toolchains)
 
-set -l rustup_profiles "minimal" "default" "complete"
+set -l rustup_profiles minimal default complete
 
-complete -c rustup -n "__fish_should_complete_switches" -s v -l verbose
-complete -c rustup -n "__fish_should_complete_switches" -s h -l help
-complete -c rustup -n "__fish_should_complete_switches" -s V -l version
+complete -c rustup -n __fish_should_complete_switches -s v -l verbose
+complete -c rustup -n __fish_should_complete_switches -s h -l help
+complete -c rustup -n __fish_should_complete_switches -s V -l version
 
-complete -c rustup -n "__fish_is_first_token" -xa "$subcmds"
+complete -c rustup -n __fish_is_first_token -xa "$subcmds"
 
 complete -c rustup -n "__fish_prev_arg_in default" -xa "$__rustup_toolchains_short $__rustup_toolchains"
 complete -c rustup -n "__fish_prev_arg_in toolchain" -xa "add install list remove uninstall link help"
diff --git a/share/completions/s3cmd.fish b/share/completions/s3cmd.fish
index 9e5bcba23..77b33a961 100644
--- a/share/completions/s3cmd.fish
+++ b/share/completions/s3cmd.fish
@@ -9,53 +9,53 @@ function __s3cmd_is_valid_remote_path
 end
 
 # Completions to allow for autocomplete of remote paths
-complete -c s3cmd -f -n "__s3cmd_is_valid_remote_path" -a "(s3cmd ls (commandline -ct) 2>/dev/null | string match -r -- 's3://.*')"
-complete -c s3cmd -f -n "__s3cmd_is_remote_path"
+complete -c s3cmd -f -n __s3cmd_is_valid_remote_path -a "(s3cmd ls (commandline -ct) 2>/dev/null | string match -r -- 's3://.*')"
+complete -c s3cmd -f -n __s3cmd_is_remote_path
 
 # Suppress file completions for initial command
-complete -c s3cmd -n "__fish_is_first_token" -f
+complete -c s3cmd -n __fish_is_first_token -f
 
 # Available commands
-complete -c s3cmd -n "__fish_is_first_token" -a 'mb' -d 'Make bucket'
-complete -c s3cmd -n "__fish_is_first_token" -a 'rb' -d 'Remove bucket'
-complete -c s3cmd -n "__fish_is_first_token" -a 'ls' -d 'List objects or buckets'
-complete -c s3cmd -n "__fish_is_first_token" -a 'la' -d 'List all object in all buckets'
-complete -c s3cmd -n "__fish_is_first_token" -a 'put' -d 'Put file into bucket'
-complete -c s3cmd -n "__fish_is_first_token" -a 'get' -d 'Get file from bucket'
-complete -c s3cmd -n "__fish_is_first_token" -a 'del' -d 'Delete file from bucket'
-complete -c s3cmd -n "__fish_is_first_token" -a 'rm' -d 'Delete file from bucket (alias for del)'
-complete -c s3cmd -n "__fish_is_first_token" -a 'restore' -d 'Restore file from Glacier storage'
-complete -c s3cmd -n "__fish_is_first_token" -a 'sync' -d 'Synchronize a directory tree to S3'
-complete -c s3cmd -n "__fish_is_first_token" -a 'du' -d 'Disk usage by buckets'
-complete -c s3cmd -n "__fish_is_first_token" -a 'info' -d 'Get various information about Buckets or Files'
-complete -c s3cmd -n "__fish_is_first_token" -a 'cp' -d 'Copy object'
-complete -c s3cmd -n "__fish_is_first_token" -a 'modify' -d 'Modify object metadata'
-complete -c s3cmd -n "__fish_is_first_token" -a 'mv' -d 'Move object'
-complete -c s3cmd -n "__fish_is_first_token" -a 'setacl' -d 'Modify Access control list for Bucket or Files'
-complete -c s3cmd -n "__fish_is_first_token" -a 'setpolicy' -d 'Modify Bucket Policy'
-complete -c s3cmd -n "__fish_is_first_token" -a 'delpolicy' -d 'Delete Bucket Policy'
-complete -c s3cmd -n "__fish_is_first_token" -a 'setcors' -d 'Modify Bucket CORS'
-complete -c s3cmd -n "__fish_is_first_token" -a 'delcors' -d 'Delete Bucket CORS'
-complete -c s3cmd -n "__fish_is_first_token" -a 'payer' -d 'Modify Bucket Requester Pays policy'
-complete -c s3cmd -n "__fish_is_first_token" -a 'multipart' -d 'Show multipart uploads'
-complete -c s3cmd -n "__fish_is_first_token" -a 'abortmp' -d 'Abort a multipart upload'
-complete -c s3cmd -n "__fish_is_first_token" -a 'listmp' -d 'List parts of a multipart upload'
-complete -c s3cmd -n "__fish_is_first_token" -a 'accesslog' -d 'Enable/disable bucket access logging'
-complete -c s3cmd -n "__fish_is_first_token" -a 'sign' -d 'Sign arbitrary string using the secret key'
-complete -c s3cmd -n "__fish_is_first_token" -a 'signurl' -d 'Sign an S3 URL to provide limited public access with expiry'
-complete -c s3cmd -n "__fish_is_first_token" -a 'fixbucket' -d 'Fix invalid file names in a bucket'
-complete -c s3cmd -n "__fish_is_first_token" -a 'ws-create' -d 'Create Website from bucket'
-complete -c s3cmd -n "__fish_is_first_token" -a 'ws-delete' -d 'Delete Website'
-complete -c s3cmd -n "__fish_is_first_token" -a 'ws-info' -d 'Info about Website'
-complete -c s3cmd -n "__fish_is_first_token" -a 'expire' -d 'Set or delete expiration rule for the bucket'
-complete -c s3cmd -n "__fish_is_first_token" -a 'setlifecycle' -d 'Upload a lifecycle policy for the bucket'
-complete -c s3cmd -n "__fish_is_first_token" -a 'dellifecycle' -d 'Remove a lifecycle policy for the bucket'
-complete -c s3cmd -n "__fish_is_first_token" -a 'cflist' -d 'List CloudFront distribution points'
-complete -c s3cmd -n "__fish_is_first_token" -a 'cfinfo' -d 'Display CloudFront distribution point parameters'
-complete -c s3cmd -n "__fish_is_first_token" -a 'cfcreate' -d 'Create CloudFront distribution point'
-complete -c s3cmd -n "__fish_is_first_token" -a 'cfdelete' -d 'Delete CloudFront distribution point'
-complete -c s3cmd -n "__fish_is_first_token" -a 'cfmodify' -d 'Change CloudFront distribution point parameters'
-complete -c s3cmd -n "__fish_is_first_token" -a 'cfinvalinfo' -d 'Display CloudFront invalidation request(s) status'
+complete -c s3cmd -n __fish_is_first_token -a mb -d 'Make bucket'
+complete -c s3cmd -n __fish_is_first_token -a rb -d 'Remove bucket'
+complete -c s3cmd -n __fish_is_first_token -a ls -d 'List objects or buckets'
+complete -c s3cmd -n __fish_is_first_token -a la -d 'List all object in all buckets'
+complete -c s3cmd -n __fish_is_first_token -a put -d 'Put file into bucket'
+complete -c s3cmd -n __fish_is_first_token -a get -d 'Get file from bucket'
+complete -c s3cmd -n __fish_is_first_token -a del -d 'Delete file from bucket'
+complete -c s3cmd -n __fish_is_first_token -a rm -d 'Delete file from bucket (alias for del)'
+complete -c s3cmd -n __fish_is_first_token -a restore -d 'Restore file from Glacier storage'
+complete -c s3cmd -n __fish_is_first_token -a sync -d 'Synchronize a directory tree to S3'
+complete -c s3cmd -n __fish_is_first_token -a du -d 'Disk usage by buckets'
+complete -c s3cmd -n __fish_is_first_token -a info -d 'Get various information about Buckets or Files'
+complete -c s3cmd -n __fish_is_first_token -a cp -d 'Copy object'
+complete -c s3cmd -n __fish_is_first_token -a modify -d 'Modify object metadata'
+complete -c s3cmd -n __fish_is_first_token -a mv -d 'Move object'
+complete -c s3cmd -n __fish_is_first_token -a setacl -d 'Modify Access control list for Bucket or Files'
+complete -c s3cmd -n __fish_is_first_token -a setpolicy -d 'Modify Bucket Policy'
+complete -c s3cmd -n __fish_is_first_token -a delpolicy -d 'Delete Bucket Policy'
+complete -c s3cmd -n __fish_is_first_token -a setcors -d 'Modify Bucket CORS'
+complete -c s3cmd -n __fish_is_first_token -a delcors -d 'Delete Bucket CORS'
+complete -c s3cmd -n __fish_is_first_token -a payer -d 'Modify Bucket Requester Pays policy'
+complete -c s3cmd -n __fish_is_first_token -a multipart -d 'Show multipart uploads'
+complete -c s3cmd -n __fish_is_first_token -a abortmp -d 'Abort a multipart upload'
+complete -c s3cmd -n __fish_is_first_token -a listmp -d 'List parts of a multipart upload'
+complete -c s3cmd -n __fish_is_first_token -a accesslog -d 'Enable/disable bucket access logging'
+complete -c s3cmd -n __fish_is_first_token -a sign -d 'Sign arbitrary string using the secret key'
+complete -c s3cmd -n __fish_is_first_token -a signurl -d 'Sign an S3 URL to provide limited public access with expiry'
+complete -c s3cmd -n __fish_is_first_token -a fixbucket -d 'Fix invalid file names in a bucket'
+complete -c s3cmd -n __fish_is_first_token -a ws-create -d 'Create Website from bucket'
+complete -c s3cmd -n __fish_is_first_token -a ws-delete -d 'Delete Website'
+complete -c s3cmd -n __fish_is_first_token -a ws-info -d 'Info about Website'
+complete -c s3cmd -n __fish_is_first_token -a expire -d 'Set or delete expiration rule for the bucket'
+complete -c s3cmd -n __fish_is_first_token -a setlifecycle -d 'Upload a lifecycle policy for the bucket'
+complete -c s3cmd -n __fish_is_first_token -a dellifecycle -d 'Remove a lifecycle policy for the bucket'
+complete -c s3cmd -n __fish_is_first_token -a cflist -d 'List CloudFront distribution points'
+complete -c s3cmd -n __fish_is_first_token -a cfinfo -d 'Display CloudFront distribution point parameters'
+complete -c s3cmd -n __fish_is_first_token -a cfcreate -d 'Create CloudFront distribution point'
+complete -c s3cmd -n __fish_is_first_token -a cfdelete -d 'Delete CloudFront distribution point'
+complete -c s3cmd -n __fish_is_first_token -a cfmodify -d 'Change CloudFront distribution point parameters'
+complete -c s3cmd -n __fish_is_first_token -a cfinvalinfo -d 'Display CloudFront invalidation request(s) status'
 
 # Created against s3cmd version 2.0
 complete -c s3cmd -s h -l help -d 'Show help and exit'
diff --git a/share/completions/sbt.fish b/share/completions/sbt.fish
index 341700eea..babdbb52f 100644
--- a/share/completions/sbt.fish
+++ b/share/completions/sbt.fish
@@ -33,8 +33,8 @@ complete -c sbt -f -a '(string split "\n" "
     and not contains -- "client" (commandline -cpo)'
 
 # These cannot be combined with any other commands and require an argument
-complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a 'new' -d 'Create a new sbt project from the given template'
-complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a 'client' -d 'Connect to a server with an interactive sbt prompt'
+complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a new -d 'Create a new sbt project from the given template'
+complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a client -d 'Connect to a server with an interactive sbt prompt'
 
 
 ###########
diff --git a/share/completions/scons.fish b/share/completions/scons.fish
index a9dc0a6a3..c261a315c 100644
--- a/share/completions/scons.fish
+++ b/share/completions/scons.fish
@@ -40,7 +40,7 @@ complete -c scons -l profile -d 'Run SCons under the Python profiler and save th
 complete -c scons -s q -l question -d 'Do not run any commands, or print anything'
 complete -c scons -s Q -d 'Quiets SCons status messages about reading SConscript files, building targets and entering directories'
 complete -c scons -l random -d 'Build dependencies in a random order'
-complete -c scons -s s -l silent -l quiet -d 'Silent'
+complete -c scons -s s -l silent -l quiet -d Silent
 complete -c scons -l taskmastertrace -d 'Prints trace information to the specified file about how the internal Taskmaster object evaluates and controls the order in which Nodes are built'
 complete -c scons -s u -l up -l search-up -d 'Walks up the directory structure until an SConstruct , Scon struct or sconstruct file is found, and uses that as the top of the directory tree'
 complete -c scons -s U -d 'Works exactly the same way as the -u option except for the way default targets are handled'
diff --git a/share/completions/scp.fish b/share/completions/scp.fish
index 5754b0933..3c7a006e4 100644
--- a/share/completions/scp.fish
+++ b/share/completions/scp.fish
@@ -60,7 +60,7 @@ complete -c scp -d "Remote Path" -f -n "commandline -ct | string match -e ':'" -
 "
 complete -c scp -s B -d "Batch mode"
 complete -c scp -s l -x -d "Bandwidth limit"
-complete -c scp -s P -x -d "Port"
+complete -c scp -s P -x -d Port
 complete -c scp -s p -d "Preserves modification times, access times, and modes from the original file"
 complete -c scp -s q -d "Do not display progress bar"
 complete -c scp -s r -d "Recursively copy"
diff --git a/share/completions/screen.fish b/share/completions/screen.fish
index 392ec44ea..cc766ab84 100644
--- a/share/completions/screen.fish
+++ b/share/completions/screen.fish
@@ -10,9 +10,9 @@ function __fish_complete_screen_general_list_mac -d "Get the socket list on mac"
     set -l sockets (ls)
     if test (count $sockets) -ne 0
         switch $argv
-            case "Detached"
+            case Detached
                 stat -f "%Lp %SB %N" -t "%D %T" $sockets | string match -r '^6\d{2} .*$' | string replace -r '^6\d{2} (\S+ \S+) (\S+)' '$2\t$1 Detached'
-            case "Attached"
+            case Attached
                 stat -f "%Lp %SB %N" -t "%D %T" $sockets | string match -r '^7\d{2} .*$' | string replace -r '^7\d{2} (\S+ \S+) (\S+)' '$2\t$1 Attached'
         end
     end
diff --git a/share/completions/service.fish b/share/completions/service.fish
index fbf16dd22..390d326ab 100644
--- a/share/completions/service.fish
+++ b/share/completions/service.fish
@@ -1,5 +1,5 @@
 # First argument is the names of the service, i.e. a file in /etc/init.d
-complete -c service -n "__fish_is_first_token" -xa "(__fish_print_service_names)" -d "Service"
+complete -c service -n __fish_is_first_token -xa "(__fish_print_service_names)" -d Service
 
 # as found in __fish_print_service_names.fish
 if test -d /run/systemd/system # Systemd systems
diff --git a/share/completions/set.fish b/share/completions/set.fish
index 8284f0598..8a687c619 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -67,18 +67,18 @@ end
 # Regular switches, set only accepts these before the variable name,
 # so we need to test using __fish_is_first_token
 
-complete -c set -n '__fish_is_first_token' -s e -l erase -d "Erase variable"
-complete -c set -n '__fish_is_first_token' -s x -l export -d "Export variable to subprocess"
-complete -c set -n '__fish_is_first_token' -s u -l unexport -d "Do not export variable to subprocess"
-complete -c set -n '__fish_is_first_token' -s g -l global -d "Make variable scope global"
-complete -c set -n '__fish_is_first_token' -s l -l local -d "Make variable scope local"
-complete -c set -n '__fish_is_first_token' -s U -l universal -d "Share variable persistently across sessions"
-complete -c set -n '__fish_is_first_token' -s q -l query -d "Test if variable is defined"
-complete -c set -n '__fish_is_first_token' -s h -l help -d "Display help and exit"
-complete -c set -n '__fish_is_first_token' -s n -l names -d "List the names of the variables, but not their value"
-complete -c set -n '__fish_is_first_token' -s a -l append -d "Append value to a list"
-complete -c set -n '__fish_is_first_token' -s p -l prepend -d "Prepend value to a list"
-complete -c set -n '__fish_is_first_token' -s S -l show -d "Show variable"
+complete -c set -n __fish_is_first_token -s e -l erase -d "Erase variable"
+complete -c set -n __fish_is_first_token -s x -l export -d "Export variable to subprocess"
+complete -c set -n __fish_is_first_token -s u -l unexport -d "Do not export variable to subprocess"
+complete -c set -n __fish_is_first_token -s g -l global -d "Make variable scope global"
+complete -c set -n __fish_is_first_token -s l -l local -d "Make variable scope local"
+complete -c set -n __fish_is_first_token -s U -l universal -d "Share variable persistently across sessions"
+complete -c set -n __fish_is_first_token -s q -l query -d "Test if variable is defined"
+complete -c set -n __fish_is_first_token -s h -l help -d "Display help and exit"
+complete -c set -n __fish_is_first_token -s n -l names -d "List the names of the variables, but not their value"
+complete -c set -n __fish_is_first_token -s a -l append -d "Append value to a list"
+complete -c set -n __fish_is_first_token -s p -l prepend -d "Prepend value to a list"
+complete -c set -n __fish_is_first_token -s S -l show -d "Show variable"
 
 #TODO: add CPP code to generate list of read-only variables and exclude them from the following completions
 
@@ -103,10 +103,10 @@ complete -c set -n '__fish_seen_argument -s e -l erase; and __fish_seen_argument
 complete -c set -n '__fish_seen_argument -s e -l erase; and __fish_seen_argument -s l -l local' -f -a "(set -l | string match -rv '^_|^fish_' | string replace ' ' \t'Local Variable: ')"
 
 # Color completions
-complete -c set -n '__fish_set_is_color' -x -a '(set_color --print-colors)'
-complete -c set -n '__fish_set_is_color' -s b -l background -x -a '(set_color --print-colors)' -d "Change background color"
-complete -c set -n '__fish_set_is_color' -s o -l bold -d 'Make font bold'
+complete -c set -n __fish_set_is_color -x -a '(set_color --print-colors)'
+complete -c set -n __fish_set_is_color -s b -l background -x -a '(set_color --print-colors)' -d "Change background color"
+complete -c set -n __fish_set_is_color -s o -l bold -d 'Make font bold'
 
 # Locale completions
-complete -c set -n '__fish_set_is_locale; and not __fish_seen_argument -s e -l erase' -x -a '(command -sq locale; and locale -a)' -d "Locale"
+complete -c set -n '__fish_set_is_locale; and not __fish_seen_argument -s e -l erase' -x -a '(command -sq locale; and locale -a)' -d Locale
 complete -c set -s L -l long -d 'Do not truncate long lines'
diff --git a/share/completions/set_color.fish b/share/completions/set_color.fish
index 8d589b69a..3d0173189 100644
--- a/share/completions/set_color.fish
+++ b/share/completions/set_color.fish
@@ -1,7 +1,7 @@
-complete -c set_color -x -d "Color" -a '(set_color --print-colors)'
+complete -c set_color -x -d Color -a '(set_color --print-colors)'
 complete -c set_color -s b -l background -x -a '(set_color --print-colors)' -d "Change background color"
 complete -c set_color -s o -l bold -d 'Make font bold'
-complete -c set_color -s i -l italics -d 'Italicise'
+complete -c set_color -s i -l italics -d Italicise
 complete -c set_color -s d -l dim -d 'Dim text'
 complete -c set_color -s r -l reverse -d 'Reverse color text'
 complete -c set_color -s u -l underline -d 'Underline text'
diff --git a/share/completions/setfacl.fish b/share/completions/setfacl.fish
index f1cf0e0c4..9c4e34af8 100644
--- a/share/completions/setfacl.fish
+++ b/share/completions/setfacl.fish
@@ -16,8 +16,8 @@ function __fish_facl_extract_acl
     commandline -ct | string replace -ar '.*(\w*:).*' '$1'
 end
 
-complete -c setfacl -s m -s x -l modify -l remove -l set -n '__fish_facl_starts_with_spec_user' -a '(__fish_facl_extract_acl)(__fish_complete_users  | string replace -a "\t" ":\t")'
-complete -c setfacl -s m -s x -l modify -l remove -l set -n '__fish_facl_starts_with_spec_group' -a '(__fish_facl_extract_acl)(__fish_complete_groups | string replace -a "\t" ":\t")'
+complete -c setfacl -s m -s x -l modify -l remove -l set -n __fish_facl_starts_with_spec_user -a '(__fish_facl_extract_acl)(__fish_complete_users  | string replace -a "\t" ":\t")'
+complete -c setfacl -s m -s x -l modify -l remove -l set -n __fish_facl_starts_with_spec_group -a '(__fish_facl_extract_acl)(__fish_complete_groups | string replace -a "\t" ":\t")'
 complete -c setfacl -f -s m -s x -l modify -l remove -l set -a '(__fish_facl_list_spec_keyword)'
 
 complete -c setfacl -s b -l remove-all -d 'Remove all extended ACL entries'
diff --git a/share/completions/setsid.fish b/share/completions/setsid.fish
index a380787f4..cb2b63191 100644
--- a/share/completions/setsid.fish
+++ b/share/completions/setsid.fish
@@ -3,7 +3,7 @@
 # See: https://www.kernel.org/pub/linux/utils/util-linux
 
 complete -c setsid -x -d 'Command to run' -a '(__fish_complete_subcommand)'
-complete -c setsid -n '__fish_no_arguments' -l ctty -s c -d 'Set controlling terminal to current one'
-complete -c setsid -n '__fish_no_arguments' -l wait -s w -d 'Wait until program ends and return its exit value'
-complete -c setsid -n '__fish_no_arguments' -l version -s V -d 'Display version and exit'
-complete -c setsid -n '__fish_no_arguments' -l help -s h -d 'Display help and exit'
+complete -c setsid -n __fish_no_arguments -l ctty -s c -d 'Set controlling terminal to current one'
+complete -c setsid -n __fish_no_arguments -l wait -s w -d 'Wait until program ends and return its exit value'
+complete -c setsid -n __fish_no_arguments -l version -s V -d 'Display version and exit'
+complete -c setsid -n __fish_no_arguments -l help -s h -d 'Display help and exit'
diff --git a/share/completions/sfdx.fish b/share/completions/sfdx.fish
index b5c98cffa..f2b878383 100644
--- a/share/completions/sfdx.fish
+++ b/share/completions/sfdx.fish
@@ -15,7 +15,7 @@ function __fish_sfdx_find_packagexml
     printf '%s\n' (find . -type f -regex ".*/package.xml" | string sub -s 3)
 end
 
-set -l sfdx_looking -c sfdx -n '__fish_use_subcommand'
+set -l sfdx_looking -c sfdx -n __fish_use_subcommand
 
 set -l sfdx_loglevels 'trace debug info warn error fatal TRACE DEBUG INFO WARN ERROR FATAL'
 
@@ -494,7 +494,7 @@ complete $sfdx_looking -xa force:org:clone -d 'clone a sandbox org'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s a -l setalias -d 'alias for the created org'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s f -l definitionfile -d 'path to an org definition file'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s s -l setdefaultusername -d 'set the created org as the default username'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s t -l type -d '(required) type of org to create' -xa 'sandbox'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s t -l type -d '(required) type of org to create' -xa sandbox
 complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s w -l wait -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -l apiversion -d 'override the api version used for api requests made by this command'
diff --git a/share/completions/signify.fish b/share/completions/signify.fish
index 6b5aac144..01abaad21 100644
--- a/share/completions/signify.fish
+++ b/share/completions/signify.fish
@@ -1,4 +1,4 @@
-complete -c signify -n '__fish_seen_subcommand_from' -s C --description 'Verify a signed checksum list'
-complete -c signify -n '__fish_seen_subcommand_from' -s G --description 'Generate a new key pair'
-complete -c signify -n '__fish_seen_subcommand_from' -s S --description 'Sign specified message'
-complete -c signify -n '__fish_seen_subcommand_from' -s V --description 'Verify a signed message and sig'
+complete -c signify -n __fish_seen_subcommand_from -s C --description 'Verify a signed checksum list'
+complete -c signify -n __fish_seen_subcommand_from -s G --description 'Generate a new key pair'
+complete -c signify -n __fish_seen_subcommand_from -s S --description 'Sign specified message'
+complete -c signify -n __fish_seen_subcommand_from -s V --description 'Verify a signed message and sig'
diff --git a/share/completions/snap.fish b/share/completions/snap.fish
index 9923a5c52..924f60986 100644
--- a/share/completions/snap.fish
+++ b/share/completions/snap.fish
@@ -41,7 +41,7 @@ end
 function __fish_snap_subcommand
     set subcommand $argv[1]
     set -e argv[1]
-    complete -f -c snap -n '__fish_snap_no_subcommand' -a $subcommand $argv
+    complete -f -c snap -n __fish_snap_no_subcommand -a $subcommand $argv
 end
 
 function __fish_snap_option
@@ -103,7 +103,7 @@ function __fish_snap_assertion
     set -e argv[1]
     complete -f -c snap -n '__fish_snap_using_subcommand known; and __fish_snap_no_assertion' -a $assertion
     complete -f -c snap -n "__fish_snap_using_assertion $assertion" -a "(__fish_snap_filters $assertion)"\
- -d "Filter"
+ -d Filter
 end
 
 function __fish_snap_filters -d 'List assertion filters'
@@ -114,7 +114,7 @@ end
 #complete -c snap -n '__fish_snap_use_package' -a '(__fish_print_packages)' -d 'Package'
 
 # Enable file completions where appropriate
-complete -c snap -n '__fish_snap_use_file' -a '(__fish_complete_path)'
+complete -c snap -n __fish_snap_use_file -a '(__fish_complete_path)'
 
 # Support flags
 complete -x -f -c snap -s h -l help -d 'Show this help message'
@@ -128,7 +128,7 @@ __fish_snap_subcommand ack -r -d "Adds an assertion to the system"
 
 # Alias
 __fish_snap_subcommand alias -r -d "Sets up a manual alias"
-__fish_snap_option alias -a '(__fish_snap_installed_snaps)' -d "Snap"
+__fish_snap_option alias -a '(__fish_snap_installed_snaps)' -d Snap
 
 # Aliases
 __fish_snap_subcommand aliases -d "Lists aliases in the system"
@@ -174,7 +174,7 @@ __fish_snap_option find -l section -d "Restrict the search to a given section"
 __fish_snap_subcommand get -r -d "Prints configuration options"
 __fish_snap_option get -s t -d "Strict typing with nulls and quoted strings"
 __fish_snap_option get -s d -d "Always return documents, even with single key"
-__fish_snap_option get -a '(__fish_snap_installed_snaps)' -d "Snap"
+__fish_snap_option get -a '(__fish_snap_installed_snaps)' -d Snap
 
 # Help
 __fish_snap_subcommand help -d "The help command shows useful information"
@@ -183,7 +183,7 @@ __fish_snap_option help -l man -d "Generates the manpage"
 # Info
 __fish_snap_subcommand info -r -d "Show detailed information about a snap"
 __fish_snap_option info -l verbose -d "Include a verbose list of snap's notes"
-__fish_snap_option info -a '(__fish_snap_installed_snaps)' -d "Snap"
+__fish_snap_option info -a '(__fish_snap_installed_snaps)' -d Snap
 
 # Install
 __fish_snap_subcommand install -r -d "Installs a snap to the system"
@@ -200,7 +200,7 @@ __fish_snap_option install -l dangerous -d "Install the given snap file even if
 
 # Interfaces
 __fish_snap_subcommand interfaces -d "Lists interfaces in the system"
-complete -f -c snap -n '__fish_snap_using_subcommand interfaces' -a '(__fish_snap_installed_snaps)' -d "Snap"
+complete -f -c snap -n '__fish_snap_using_subcommand interfaces' -a '(__fish_snap_installed_snaps)' -d Snap
 __fish_snap_option interfaces -s i -d "Constrain listing to specific interfaces"
 
 # Known
@@ -228,7 +228,7 @@ __fish_snap_subcommand logout -d "Log out of the store"
 
 # Prefer
 __fish_snap_subcommand prefer -r -d "Prefes aliases from a snap and disable conflicts"
-__fish_snap_option prefer -a '(__fish_snap_installed_snaps)' -d "Snap"
+__fish_snap_option prefer -a '(__fish_snap_installed_snaps)' -d Snap
 
 # Refresh
 __fish_snap_subcommand refresh -r -d "Refreshes a snap in the system"
@@ -242,12 +242,12 @@ __fish_snap_option refresh -l devmode -d "Put snap in development mode and disab
 __fish_snap_option refresh -l jailmode -d "Put snap in enforced confinement mode"
 __fish_snap_option refresh -l classic -d "Put snap in classic mode and disable security confinement"
 __fish_snap_option refresh -l ignore-validation -d "Ignore validation by other snaps blocking the refresh"
-__fish_snap_option refresh -a '(__fish_snap_installed_snaps)' -d "Snap"
+__fish_snap_option refresh -a '(__fish_snap_installed_snaps)' -d Snap
 
 # Remove
 __fish_snap_subcommand remove -r -d "Removes a snap from the system"
 __fish_snap_option remove -l revision -d "Removes only the given revision"
-__fish_snap_option remove -a '(__fish_snap_installed_snaps)' -d "Snap"
+__fish_snap_option remove -a '(__fish_snap_installed_snaps)' -d Snap
 
 # Revert
 __fish_snap_subcommand revert -r -d "Revert the given snap to the previous state"
@@ -255,21 +255,21 @@ __fish_snap_option refresh -l revision -d "Revert to the given revision"
 __fish_snap_option refresh -l devmode -d "Put snap in development mode and disable security confinement"
 __fish_snap_option refresh -l jailmode -d "Put snap in enforced confinement mode"
 __fish_snap_option refresh -l classic -d "Put snap in classic mode and disable security confinement"
-__fish_snap_option revert -a '(__fish_snap_installed_snaps)' -d "Snap"
+__fish_snap_option revert -a '(__fish_snap_installed_snaps)' -d Snap
 
 # Run
 __fish_snap_subcommand run -r -d "Run the given snap command"
 __fish_snap_option run -l shell -d "Run a shell instead of the command (useful for debugging)"
-__fish_snap_option run -a '(__fish_snap_installed_snaps)' -d "Snap"
+__fish_snap_option run -a '(__fish_snap_installed_snaps)' -d Snap
 
 # There seems to be no programmatic way of getting configuration options
 # Set
 __fish_snap_subcommand set -r -d "Changes configuration options"
-__fish_snap_option set -a '(__fish_snap_installed_snaps)' -d "Snap"
+__fish_snap_option set -a '(__fish_snap_installed_snaps)' -d Snap
 
 # Tasks
 __fish_snap_subcommand tasks -d "List a change's tasks"
-__fish_snap_option tasks -a '(__fish_snap_change_id)' -d "ID"
+__fish_snap_option tasks -a '(__fish_snap_change_id)' -d ID
 
 # Try
 __fish_snap_subcommand try -r -d "Tests a snap in the system"
@@ -286,4 +286,4 @@ __fish_snap_subcommand version -d "Shows version details"
 
 # Watch
 __fish_snap_subcommand watch -d "Watch a change in progress"
-__fish_snap_option watch -a '(__fish_snap_change_id)' -d "ID"
+__fish_snap_option watch -a '(__fish_snap_change_id)' -d ID
diff --git a/share/completions/src.fish b/share/completions/src.fish
index 469201204..1ca9b2eb4 100644
--- a/share/completions/src.fish
+++ b/share/completions/src.fish
@@ -3,27 +3,27 @@
 # TODO?: add short synonyms like ci, am
 # TODO: extract tag/branch names and feed to -a for tag delete, branch delete, rename
 
-complete -c src -f -n '__fish_use_subcommand' -a help -d 'Displays help for commands'
+complete -c src -f -n __fish_use_subcommand -a help -d 'Displays help for commands'
 complete -c src -f -n '__fish_seen_subcommand_from help' -a 'intro revisions commands commit amend checkout cat status log list diff fast-export fast-import ignores'
 
-complete -c src -n '__fish_use_subcommand' -a commit -d 'Enters a commit for the specified files'
+complete -c src -n __fish_use_subcommand -a commit -d 'Enters a commit for the specified files'
 complete -c src -x -n '__fish_seen_subcommand_from commit' -s m -d 'Enter commit message as a string'
 complete -c src -r -n '__fish_seen_subcommand_from commit' -s f -d 'Enter file containing commit message'
 complete -c src -n '__fish_seen_subcommand_from commit' -s e -d 'Further edit commit message'
 
-complete -c src -r -n '__fish_use_subcommand' -a amend -d 'Amends the stored comment for a specified revision'
+complete -c src -r -n __fish_use_subcommand -a amend -d 'Amends the stored comment for a specified revision'
 complete -c src -x -n '__fish_seen_subcommand_from amend' -s m -d 'Enter commit message as a string'
 complete -c src -r -n '__fish_seen_subcommand_from amend' -s f -d 'Enter file containing commit message'
 complete -c src -n '__fish_seen_subcommand_from amend' -s e -d 'Further edit commit message'
 
-complete -c src -r -n '__fish_use_subcommand' -a checkout -d 'Refresh working copy from history'
+complete -c src -r -n __fish_use_subcommand -a checkout -d 'Refresh working copy from history'
 
-complete -c src -r -n '__fish_use_subcommand' -a cat -d 'Send the specified revision of the files to standard output'
+complete -c src -r -n __fish_use_subcommand -a cat -d 'Send the specified revision of the files to standard output'
 
-complete -c src -r -n '__fish_use_subcommand' -a status -d 'Show status of files'
+complete -c src -r -n __fish_use_subcommand -a status -d 'Show status of files'
 complete -c src -n '__fish_seen_subcommand_from status' -s a -d 'Show all files'
 
-complete -c src -r -n '__fish_use_subcommand' -a tag -d 'List/create/delete tags'
+complete -c src -r -n __fish_use_subcommand -a tag -d 'List/create/delete tags'
 complete -c src -n '__fish_seen_subcommand_from tag' -a list -d 'List tags'
 complete -c src -n '__fish_seen_subcommand_from tag' -s l -d 'List tags'
 complete -c src -r -n '__fish_seen_subcommand_from tag' -a create -d 'Create tag'
@@ -31,7 +31,7 @@ complete -c src -r -n '__fish_seen_subcommand_from tag' -s c -d 'Create tag'
 complete -c src -r -n '__fish_seen_subcommand_from tag' -a delete -d 'Delete tag'
 complete -c src -r -n '__fish_seen_subcommand_from tag' -s d -d 'Delete tag'
 
-complete -c src -r -n '__fish_use_subcommand' -a branch -d 'List/create/delete branches'
+complete -c src -r -n __fish_use_subcommand -a branch -d 'List/create/delete branches'
 complete -c src -n '__fish_seen_subcommand_from branch' -a list -d 'List branches'
 complete -c src -n '__fish_seen_subcommand_from branch' -s l -d 'List branches'
 complete -c src -r -n '__fish_seen_subcommand_from branch' -a create -d 'Create branch'
@@ -39,15 +39,15 @@ complete -c src -r -n '__fish_seen_subcommand_from branch' -s c -d 'Create branc
 complete -c src -r -n '__fish_seen_subcommand_from branch' -a delete -d 'Delete branch'
 complete -c src -r -n '__fish_seen_subcommand_from branch' -s d -d 'Delete branch'
 
-complete -c src -r -n '__fish_use_subcommand' -a rename -d 'Rename tag/branch'
+complete -c src -r -n __fish_use_subcommand -a rename -d 'Rename tag/branch'
 
-complete -c src -r -n '__fish_use_subcommand' -a list -d 'List information about commits'
+complete -c src -r -n __fish_use_subcommand -a list -d 'List information about commits'
 # TODO: support `src list -<n>`
 complete -c src -x -n '__fish_seen_subcommand_from list' -s l -d 'Limit per-file commit count'
 complete -c src -x -n '__fish_seen_subcommand_from list' -s f -d 'Specify format string'
 
 # NOTE: pretending -b and -w are old-style options means they won’t be suggested as, say, “-pb” (which src can’t handle)
-complete -c src -r -n '__fish_use_subcommand' -a log -d 'List information about commits'
+complete -c src -r -n __fish_use_subcommand -a log -d 'List information about commits'
 complete -c src -x -n '__fish_seen_subcommand_from log' -s v -d 'Be more verbose'
 # TODO: support `src log -<n>`
 complete -c src -x -n '__fish_seen_subcommand_from log' -s l -d 'Limit per-file log entries'
@@ -59,26 +59,26 @@ complete -c src -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s
 complete -c src -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u' -o w -d 'Ignore all whitespace'
 
 # NOTE: pretending -b and -w are old-style options means they won’t be suggested as, say, “-pb” (which src can’t handle)
-complete -c src -r -n '__fish_use_subcommand' -a diff -d 'Print diff'
+complete -c src -r -n __fish_use_subcommand -a diff -d 'Print diff'
 complete -c src -n '__fish_seen_subcommand_from diff' -s u -d 'Print unified-format diff'
 complete -c src -n '__fish_seen_subcommand_from diff' -s c -d 'Print context diff'
 complete -c src -n '__fish_seen_subcommand_from diff' -o b -d 'Ignore whitespace changes'
 complete -c src -n '__fish_seen_subcommand_from diff' -o w -d 'Ignore all whitespace'
 
-complete -c src -r -n '__fish_use_subcommand' -a ls -d 'List all registered files'
+complete -c src -r -n __fish_use_subcommand -a ls -d 'List all registered files'
 
-complete -c src -r -n '__fish_use_subcommand' -a visualize -d 'Emit DOT visualization'
+complete -c src -r -n __fish_use_subcommand -a visualize -d 'Emit DOT visualization'
 
-complete -c src -r -n '__fish_use_subcommand' -a move -d 'Rename a workfile and its history'
+complete -c src -r -n __fish_use_subcommand -a move -d 'Rename a workfile and its history'
 
-complete -c src -r -n '__fish_use_subcommand' -a copy -d 'Copy a file and its master'
+complete -c src -r -n __fish_use_subcommand -a copy -d 'Copy a file and its master'
 
-complete -c src -r -n '__fish_use_subcommand' -a fast-export -d 'Export as a Git fast-import stream'
+complete -c src -r -n __fish_use_subcommand -a fast-export -d 'Export as a Git fast-import stream'
 
-complete -c src -r -n '__fish_use_subcommand' -a fast-import -d 'Parse a git-fast-import stream from stdin'
+complete -c src -r -n __fish_use_subcommand -a fast-import -d 'Parse a git-fast-import stream from stdin'
 complete -c src -n '__fish_seen_subcommand_from fast-import' -s p -d 'Discards metadata'
 
-complete -c src -r -n '__fish_use_subcommand' -a release -d 'Release locks on files'
+complete -c src -r -n __fish_use_subcommand -a release -d 'Release locks on files'
 
 complete -c src -s d -d 'Enable debugging output'
 complete -c src -r -s S -d 'Set repository directory'
diff --git a/share/completions/ssh.fish b/share/completions/ssh.fish
index ff3876737..7aa624b94 100644
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -6,7 +6,7 @@ __fish_complete_ssh ssh
 #
 # ssh specific completions
 #
-complete -x -c ssh -d "Remote" -a "(__fish_complete_user_at_hosts)"
+complete -x -c ssh -d Remote -a "(__fish_complete_user_at_hosts)"
 
 # Disable as username completion is not very useful.
 # complete -x -c ssh -d User -a "
@@ -37,13 +37,13 @@ complete -c ssh -s f -d "Go to background"
 complete -c ssh -s g -d "Allow remote host to connect to local forwarded ports"
 complete -c ssh -s I -d "Smartcard device"
 complete -c ssh -s k -d "Disable forwarding of Kerberos tickets"
-complete -c ssh -s l -x -a "(__fish_complete_users)" -d "User"
+complete -c ssh -s l -x -a "(__fish_complete_users)" -d User
 complete -c ssh -s m -d "MAC algorithm"
 complete -c ssh -s n -d "Prevent reading from stdin"
 complete -c ssh -s N -d "Do not execute remote command"
-complete -c ssh -s p -x -d "Port"
+complete -c ssh -s p -x -d Port
 complete -c ssh -s q -d "Quiet mode"
-complete -c ssh -s s -d "Subsystem"
+complete -c ssh -s s -d Subsystem
 complete -c ssh -s t -d "Force pseudo-tty allocation"
 complete -c ssh -s T -d "Disable pseudo-tty allocation"
 complete -c ssh -s x -d "Disable X11 forwarding"
@@ -62,4 +62,4 @@ function __ssh_history_completions --argument limit
     history --prefix ssh | string replace -rf '.* ([A-Za-z0-9._:-]+@[A-Za-z0-9._:-]+).*' '$1' | head -n $limit
 end
 
-complete -k -c ssh -a '(__ssh_history_completions 100)' -f -d "Remote"
+complete -k -c ssh -a '(__ssh_history_completions 100)' -f -d Remote
diff --git a/share/completions/sshfs.fish b/share/completions/sshfs.fish
index 1f224b0fe..78d75d0a1 100644
--- a/share/completions/sshfs.fish
+++ b/share/completions/sshfs.fish
@@ -10,8 +10,8 @@ complete -c sshfs -x -a '(__fish_complete_directories (commandline -ct) "Mount p
 # Command options
 #
 complete -c sshfs -s V -d "Display version and exit"
-complete -c sshfs -s p -x -d "Port"
-complete -c sshfs -s C -d "Compression"
+complete -c sshfs -s p -x -d Port
+complete -c sshfs -s C -d Compression
 complete -c sshfs -s o -x -d "Mount options"
 complete -c sshfs -s d -d "Enable debug"
 complete -c sshfs -s f -d "Foreground operation"
diff --git a/share/completions/string.fish b/share/completions/string.fish
index 8b54fba66..55188a063 100644
--- a/share/completions/string.fish
+++ b/share/completions/string.fish
@@ -3,46 +3,46 @@
 complete -f -c string
 complete -f -c string -n "test (count (commandline -opc)) -le 2" -s h -l help -d "Display help and exit"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and not contains -- (commandline -opc)[2] escape collect" -s q -l quiet -d "Do not print output"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "lower"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "upper"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "length"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "sub"
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a lower
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a upper
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a length
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a sub
 complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] sub" -s s -l start -xa "(seq 1 10)"
 complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] sub" -s l -l length -xa "(seq 1 10)"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "split"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "split0"
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a split
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a split0
 complete -x -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr split0\?\$ -- (commandline -opc)[2]' -s m -l max -a "(seq 1 10)" -d "Specify maximum number of splits"
 complete -f -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr split0\?\$ -- (commandline -opc)[2]' -s r -l right -d "Split right-to-left"
 complete -f -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr split0\?\$ -- (commandline -opc)[2]' -s n -l no-empty -d "Empty results excluded"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "collect"
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a collect
 complete -f -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr collect\$ -- (commandline -opc)[2]' -s N -l no-trim-newlines -d "Don't trim trailing newlines"
 
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "join"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "join0"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "trim"
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a join
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a join0
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a trim
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] trim" -s l -l left -d "Trim only leading chars"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] trim" -s r -l right -d "Trim only trailing chars"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] trim" -s c -l chars -d "Specify the chars to trim (default: whitespace)" -x
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "escape"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "unescape"
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a escape
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a unescape
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] escape; or contains -- (commandline -opc)[2] unescape" -s n -l no-quoted -d "Escape with \\ instead of quotes"
 complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] escape; or contains -- (commandline -opc)[2] unescape" -l style -d "Specify escaping style" -xa "
 (printf '%s\t%s\n' script 'For use in scripts' \
  var 'For use as a variable name' \
  regex 'For string match -r, string replace -r' \
  url 'For use as a URL')"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "match"
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a match
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] match" -s n -l index -d "Report index, length of match"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] match" -s v -l invert -d "Report only non-matches"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] match" -s e -l entire -d "Show entire matching lines"
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "replace"
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a replace
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] replace" -s f -l filter -d "Report only actual replacements"
 # All replace options are also valid for match
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] match replace" -s a -l all -d "Report every match"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] match replace" -s i -l ignore-case -d "Case insensitive"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] match replace" -s r -l regex -d "Use regex instead of globs"
 
-complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "repeat"
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a repeat
 complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] repeat" -s n -l count -xa "(seq 1 10)" -d "Repetition count"
 complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] repeat" -s m -l max -xa "(seq 1 10)" -d "Maximum number of printed chars"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] repeat" -s N -l no-newline -d "Remove newline"
diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish
index 5fd355f16..985a288b5 100644
--- a/share/completions/sudo.fish
+++ b/share/completions/sudo.fish
@@ -11,7 +11,7 @@ function __fish_sudo_print_remaining_args
     # Note that "-h" is both "--host" (which takes an option) and "--help" (which doesn't).
     # But `-h` as `--help` only counts when it's the only argument (`sudo -h`),
     # so any argument completion after that should take it as "--host".
-    set -a opts e/edit g/group= H/set-home h/host= '1-help'
+    set -a opts e/edit g/group= H/set-home h/host= 1-help
     set -a opts i/login K/remove-timestamp k/reset-timestamp l/list n/non-interactive
     set -a opts P/preserve-groups p/prompt= S/stdin s/shell U/other-user=
     set -a opts u/user= T/command-timeout= V/version v/validate
@@ -38,26 +38,26 @@ function __fish_complete_sudo_subcommand
 end
 
 # All these options should be valid for GNU and OSX sudo
-complete -c sudo -n "__fish_no_arguments" -s h -d "Display help and exit"
-complete -c sudo -n "__fish_no_arguments" -s V -d "Display version information and exit"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s A -d "Ask for password via the askpass or \$SSH_ASKPASS program"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s C -d "Close all file descriptors greater or equal to the given number" -xa "0 1 2 255"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s E -d "Preserve environment"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s H -d "Set home"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s K -d "Remove the credential timestamp entirely"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s P -d "Preserve group vector"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s S -d "Read password from stdin"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s b -d "Run command in the background"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s e -rF -d "Edit"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s g -a "(__fish_complete_groups)" -x -d "Run command as group"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s i -d "Run a login shell"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s k -d "Reset or ignore the credential timestamp"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s l -d "List the allowed and forbidden commands for the given user, or the full path to the given command if it is allowed"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s n -d "Do not prompt for a password - if one is needed, fail"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s p -d "Specify a custom password prompt"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s s -d "Run the given command in a shell"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s u -a "(__fish_complete_users)" -x -d "Run command as user"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s v -n "__fish_no_arguments" -d "Validate the credentials, extending timeout"
+complete -c sudo -n __fish_no_arguments -s h -d "Display help and exit"
+complete -c sudo -n __fish_no_arguments -s V -d "Display version information and exit"
+complete -c sudo -n __fish_sudo_no_subcommand -s A -d "Ask for password via the askpass or \$SSH_ASKPASS program"
+complete -c sudo -n __fish_sudo_no_subcommand -s C -d "Close all file descriptors greater or equal to the given number" -xa "0 1 2 255"
+complete -c sudo -n __fish_sudo_no_subcommand -s E -d "Preserve environment"
+complete -c sudo -n __fish_sudo_no_subcommand -s H -d "Set home"
+complete -c sudo -n __fish_sudo_no_subcommand -s K -d "Remove the credential timestamp entirely"
+complete -c sudo -n __fish_sudo_no_subcommand -s P -d "Preserve group vector"
+complete -c sudo -n __fish_sudo_no_subcommand -s S -d "Read password from stdin"
+complete -c sudo -n __fish_sudo_no_subcommand -s b -d "Run command in the background"
+complete -c sudo -n __fish_sudo_no_subcommand -s e -rF -d Edit
+complete -c sudo -n __fish_sudo_no_subcommand -s g -a "(__fish_complete_groups)" -x -d "Run command as group"
+complete -c sudo -n __fish_sudo_no_subcommand -s i -d "Run a login shell"
+complete -c sudo -n __fish_sudo_no_subcommand -s k -d "Reset or ignore the credential timestamp"
+complete -c sudo -n __fish_sudo_no_subcommand -s l -d "List the allowed and forbidden commands for the given user, or the full path to the given command if it is allowed"
+complete -c sudo -n __fish_sudo_no_subcommand -s n -d "Do not prompt for a password - if one is needed, fail"
+complete -c sudo -n __fish_sudo_no_subcommand -s p -d "Specify a custom password prompt"
+complete -c sudo -n __fish_sudo_no_subcommand -s s -d "Run the given command in a shell"
+complete -c sudo -n __fish_sudo_no_subcommand -s u -a "(__fish_complete_users)" -x -d "Run command as user"
+complete -c sudo -n __fish_sudo_no_subcommand -s v -n __fish_no_arguments -d "Validate the credentials, extending timeout"
 
 # Complete the command we are executed under sudo
 complete -c sudo -x -n 'not __fish_seen_argument -s e' -a "(__fish_complete_sudo_subcommand)"
diff --git a/share/completions/svn.fish b/share/completions/svn.fish
index c23efbf89..022f3f656 100644
--- a/share/completions/svn.fish
+++ b/share/completions/svn.fish
@@ -69,42 +69,42 @@ set -l unlock unlock
 set -l update 'up update'
 set -l upgrade upgrade
 
-complete -c svn -n '__fish_use_subcommand' -x -a $add -d 'Put files and directories under version control, scheduling them for addition to repository.  They will be added in next commit.'
-complete -c svn -n '__fish_use_subcommand' -x -a $blame -d 'Output the content of specified files or URLs with revision and author information in-line.'
-complete -c svn -n '__fish_use_subcommand' -x -a $cat -d 'Output the content of specified files or URLs.'
-complete -c svn -n '__fish_use_subcommand' -x -a $changelist -d 'Output the content of specified files or URLs with revision and author information in-line.'
-complete -c svn -n '__fish_use_subcommand' -x -a $checkout -d 'Check out a working copy from a repository.'
-complete -c svn -n '__fish_use_subcommand' -x -a $cleanup -d 'Recursively clean up the working copy, removing locks, resuming unfinished operations, etc.'
-complete -c svn -n '__fish_use_subcommand' -x -a $commit -d 'Send changes from your working copy to the repository.'
-complete -c svn -n '__fish_use_subcommand' -x -a $copy -d 'Duplicate something in working copy or repository, remembering history.'
-complete -c svn -n '__fish_use_subcommand' -x -a $diff -d 'Display the differences between two revisions or paths.'
-complete -c svn -n '__fish_use_subcommand' -x -a $export -d 'Create an unversioned copy of a tree.'
-complete -c svn -n '__fish_use_subcommand' -x -a $help -d 'Describe the usage of this program or its subcommands.'
-complete -c svn -n '__fish_use_subcommand' -x -a $import -d 'Commit an unversioned file or tree into the repository.'
-complete -c svn -n '__fish_use_subcommand' -x -a $info -d 'Display information about a local or remote item.'
-complete -c svn -n '__fish_use_subcommand' -x -a $list -d 'List directory entries in the repository.'
-complete -c svn -n '__fish_use_subcommand' -x -a $lock -d 'Lock working copy paths or URLs in the repository, so that no other user can commit changes to them.'
-complete -c svn -n '__fish_use_subcommand' -x -a $log -d 'Show the log messages for a set of revision(s) and/or file(s).'
-complete -c svn -n '__fish_use_subcommand' -x -a $merge -d 'Apply the differences between two sources to a working copy path.'
-complete -c svn -n '__fish_use_subcommand' -x -a $mergeinfo -d 'Display information related to merges'
-complete -c svn -n '__fish_use_subcommand' -x -a $mkdir -d 'Create a new directory under version control.'
-complete -c svn -n '__fish_use_subcommand' -x -a $move -d 'Move and/or rename something in working copy or repository.'
-complete -c svn -n '__fish_use_subcommand' -x -a $patch -d 'Apply a unidiff patch to the working copy'
-complete -c svn -n '__fish_use_subcommand' -x -a $propdel -d 'Remove a property from files, dirs, or revisions.'
-complete -c svn -n '__fish_use_subcommand' -x -a $propedit -d 'Edit a property with an external editor.'
-complete -c svn -n '__fish_use_subcommand' -x -a $propget -d 'Print the value of a property on files, dirs, or revisions.'
-complete -c svn -n '__fish_use_subcommand' -x -a $proplist -d 'List all properties on files, dirs, or revisions.'
-complete -c svn -n '__fish_use_subcommand' -x -a $propset -d 'Set the value of a property on files, dirs, or revisions.'
-complete -c svn -n '__fish_use_subcommand' -x -a $relocate -d 'Rewrite working copy url metadata'
-complete -c svn -n '__fish_use_subcommand' -x -a $remove -d 'Remove files and directories from version control.'
-complete -c svn -n '__fish_use_subcommand' -x -a $resolve -d 'Remove conflicts on working copy files or directories.'
-complete -c svn -n '__fish_use_subcommand' -x -a $resolved -d 'Remove \'conflicted\' state on working copy files or directories.'
-complete -c svn -n '__fish_use_subcommand' -x -a $revert -d 'Restore pristine working copy file (undo most local edits).'
-complete -c svn -n '__fish_use_subcommand' -x -a $stat -d 'Print the status of working copy files and directories.'
-complete -c svn -n '__fish_use_subcommand' -x -a $switch -d 'Update the working copy to a different URL.'
-complete -c svn -n '__fish_use_subcommand' -x -a $unlock -d 'Unlock working copy paths or URLs.'
-complete -c svn -n '__fish_use_subcommand' -x -a $update -d 'Bring changes from the repository into the working copy.'
-complete -c svn -n '__fish_use_subcommand' -x -a $upgrade -d 'Upgrade the metadata storage format for a working copy.'
+complete -c svn -n __fish_use_subcommand -x -a $add -d 'Put files and directories under version control, scheduling them for addition to repository.  They will be added in next commit.'
+complete -c svn -n __fish_use_subcommand -x -a $blame -d 'Output the content of specified files or URLs with revision and author information in-line.'
+complete -c svn -n __fish_use_subcommand -x -a $cat -d 'Output the content of specified files or URLs.'
+complete -c svn -n __fish_use_subcommand -x -a $changelist -d 'Output the content of specified files or URLs with revision and author information in-line.'
+complete -c svn -n __fish_use_subcommand -x -a $checkout -d 'Check out a working copy from a repository.'
+complete -c svn -n __fish_use_subcommand -x -a $cleanup -d 'Recursively clean up the working copy, removing locks, resuming unfinished operations, etc.'
+complete -c svn -n __fish_use_subcommand -x -a $commit -d 'Send changes from your working copy to the repository.'
+complete -c svn -n __fish_use_subcommand -x -a $copy -d 'Duplicate something in working copy or repository, remembering history.'
+complete -c svn -n __fish_use_subcommand -x -a $diff -d 'Display the differences between two revisions or paths.'
+complete -c svn -n __fish_use_subcommand -x -a $export -d 'Create an unversioned copy of a tree.'
+complete -c svn -n __fish_use_subcommand -x -a $help -d 'Describe the usage of this program or its subcommands.'
+complete -c svn -n __fish_use_subcommand -x -a $import -d 'Commit an unversioned file or tree into the repository.'
+complete -c svn -n __fish_use_subcommand -x -a $info -d 'Display information about a local or remote item.'
+complete -c svn -n __fish_use_subcommand -x -a $list -d 'List directory entries in the repository.'
+complete -c svn -n __fish_use_subcommand -x -a $lock -d 'Lock working copy paths or URLs in the repository, so that no other user can commit changes to them.'
+complete -c svn -n __fish_use_subcommand -x -a $log -d 'Show the log messages for a set of revision(s) and/or file(s).'
+complete -c svn -n __fish_use_subcommand -x -a $merge -d 'Apply the differences between two sources to a working copy path.'
+complete -c svn -n __fish_use_subcommand -x -a $mergeinfo -d 'Display information related to merges'
+complete -c svn -n __fish_use_subcommand -x -a $mkdir -d 'Create a new directory under version control.'
+complete -c svn -n __fish_use_subcommand -x -a $move -d 'Move and/or rename something in working copy or repository.'
+complete -c svn -n __fish_use_subcommand -x -a $patch -d 'Apply a unidiff patch to the working copy'
+complete -c svn -n __fish_use_subcommand -x -a $propdel -d 'Remove a property from files, dirs, or revisions.'
+complete -c svn -n __fish_use_subcommand -x -a $propedit -d 'Edit a property with an external editor.'
+complete -c svn -n __fish_use_subcommand -x -a $propget -d 'Print the value of a property on files, dirs, or revisions.'
+complete -c svn -n __fish_use_subcommand -x -a $proplist -d 'List all properties on files, dirs, or revisions.'
+complete -c svn -n __fish_use_subcommand -x -a $propset -d 'Set the value of a property on files, dirs, or revisions.'
+complete -c svn -n __fish_use_subcommand -x -a $relocate -d 'Rewrite working copy url metadata'
+complete -c svn -n __fish_use_subcommand -x -a $remove -d 'Remove files and directories from version control.'
+complete -c svn -n __fish_use_subcommand -x -a $resolve -d 'Remove conflicts on working copy files or directories.'
+complete -c svn -n __fish_use_subcommand -x -a $resolved -d 'Remove \'conflicted\' state on working copy files or directories.'
+complete -c svn -n __fish_use_subcommand -x -a $revert -d 'Restore pristine working copy file (undo most local edits).'
+complete -c svn -n __fish_use_subcommand -x -a $stat -d 'Print the status of working copy files and directories.'
+complete -c svn -n __fish_use_subcommand -x -a $switch -d 'Update the working copy to a different URL.'
+complete -c svn -n __fish_use_subcommand -x -a $unlock -d 'Unlock working copy paths or URLs.'
+complete -c svn -n __fish_use_subcommand -x -a $update -d 'Bring changes from the repository into the working copy.'
+complete -c svn -n __fish_use_subcommand -x -a $upgrade -d 'Upgrade the metadata storage format for a working copy.'
 
 #
 # Global commands
@@ -311,11 +311,11 @@ _svn_cmpl_ $propset -a "$props"
 
 _svn_cmpl_ svn:eol-style -a "native LF CR CRLF"
 _svn_cmpl_ svn:mime-type -a "(__fish_print_xdg_mimetypes)"
-_svn_cmpl_ svn:keywords -a "URL" -d 'The URL for the head version of the object'
-_svn_cmpl_ svn:keywords -a "Author" -d 'The last person to modify the file'
-_svn_cmpl_ svn:keywords -a "Date" -d 'Last changed date'
-_svn_cmpl_ svn:keywords -a "Rev" -d 'The last revision the object changed'
-_svn_cmpl_ svn:keywords -a "Id" -d 'A compressed summary of all keywords'
+_svn_cmpl_ svn:keywords -a URL -d 'The URL for the head version of the object'
+_svn_cmpl_ svn:keywords -a Author -d 'The last person to modify the file'
+_svn_cmpl_ svn:keywords -a Date -d 'Last changed date'
+_svn_cmpl_ svn:keywords -a Rev -d 'The last revision the object changed'
+_svn_cmpl_ svn:keywords -a Id -d 'A compressed summary of all keywords'
 
 #
 # Completions for the 'relocate' subcommand
diff --git a/share/completions/tar.fish b/share/completions/tar.fish
index 652dff911..3f43963b2 100644
--- a/share/completions/tar.fish
+++ b/share/completions/tar.fish
@@ -2,7 +2,7 @@ function __fish_complete_tar -d "Peek inside of archives and list all files"
     set -l args (commandline -poc)
     while count $args >/dev/null
         switch $args[1]
-            case '-*f' '--file'
+            case '-*f' --file
                 set -e args[1]
                 if test -f $args[1]
                     set -l file_list (tar -atf $args[1] 2> /dev/null)
diff --git a/share/completions/terraform.fish b/share/completions/terraform.fish
index 41f3660f7..b5d71931c 100644
--- a/share/completions/terraform.fish
+++ b/share/completions/terraform.fish
@@ -3,7 +3,7 @@ complete -f -c terraform -l version -d 'Print version information'
 complete -f -c terraform -l help -d 'Show help'
 
 ### apply
-complete -f -c terraform -n '__fish_use_subcommand' -a apply -d 'Build or change infrastructure'
+complete -f -c terraform -n __fish_use_subcommand -a apply -d 'Build or change infrastructure'
 complete -f -c terraform -n '__fish_seen_subcommand_from apply' -o backup -d 'Path to backup the existing state file'
 complete -f -c terraform -n '__fish_seen_subcommand_from apply' -o lock -d 'Lock the state file when locking is supported'
 complete -f -c terraform -n '__fish_seen_subcommand_from apply' -o lock-timeout -d 'Duration to retry a state lock'
@@ -18,13 +18,13 @@ complete -f -c terraform -n '__fish_seen_subcommand_from apply' -o var -d 'Set a
 complete -f -c terraform -n '__fish_seen_subcommand_from apply' -o var-file -d 'Set variables from a file'
 
 ### console
-complete -f -c terraform -n '__fish_use_subcommand' -a console -d 'Interactive console for Terraform interpolations'
+complete -f -c terraform -n __fish_use_subcommand -a console -d 'Interactive console for Terraform interpolations'
 complete -f -c terraform -n '__fish_seen_subcommand_from console' -o state -d 'Path to a Terraform state file'
 complete -f -c terraform -n '__fish_seen_subcommand_from console' -o var -d 'Set a variable in the Terraform configuration'
 complete -f -c terraform -n '__fish_seen_subcommand_from console' -o var-file -d 'Set variables from a file'
 
 ### destroy
-complete -f -c terraform -n '__fish_use_subcommand' -a destroy -d 'Destroy Terraform-managed infrastructure'
+complete -f -c terraform -n __fish_use_subcommand -a destroy -d 'Destroy Terraform-managed infrastructure'
 complete -f -c terraform -n '__fish_seen_subcommand_from destroy' -o backup -d 'Path to backup the existing state file'
 complete -f -c terraform -n '__fish_seen_subcommand_from destroy' -o force -d 'Don\'t ask for input for destroy confirmation'
 complete -f -c terraform -n '__fish_seen_subcommand_from destroy' -o lock -d 'Lock the state file when locking is supported'
@@ -39,31 +39,31 @@ complete -f -c terraform -n '__fish_seen_subcommand_from destroy' -o var -d 'Set
 complete -f -c terraform -n '__fish_seen_subcommand_from destroy' -o var-file -d 'Set variables from a file'
 
 ### env
-complete -f -c terraform -n '__fish_use_subcommand' -a env -d 'Environment management'
+complete -f -c terraform -n __fish_use_subcommand -a env -d 'Environment management'
 complete -f -c terraform -n '__fish_seen_subcommand_from env' -a list -d 'List environments'
 complete -f -c terraform -n '__fish_seen_subcommand_from env' -a select -d 'Select an environment'
 complete -f -c terraform -n '__fish_seen_subcommand_from env' -a new -d 'Create a new environment'
 complete -f -c terraform -n '__fish_seen_subcommand_from env' -a delete -d 'Delete an existing environment'
 
 ### fmt
-complete -f -c terraform -n '__fish_use_subcommand' -a fmt -d 'Rewrite config files to canonical format'
+complete -f -c terraform -n __fish_use_subcommand -a fmt -d 'Rewrite config files to canonical format'
 complete -f -c terraform -n '__fish_seen_subcommand_from fmt' -o list -d 'List files whose formatting differs'
 complete -f -c terraform -n '__fish_seen_subcommand_from fmt' -o write -d 'Write result to source file'
 complete -f -c terraform -n '__fish_seen_subcommand_from fmt' -o diff -d 'Display diffs of formatting changes'
 
 ### get
-complete -f -c terraform -n '__fish_use_subcommand' -a get -d 'Download and install modules for the configuration'
+complete -f -c terraform -n __fish_use_subcommand -a get -d 'Download and install modules for the configuration'
 complete -f -c terraform -n '__fish_seen_subcommand_from get' -o update -d 'Check modules for updates'
 complete -f -c terraform -n '__fish_seen_subcommand_from get' -o no-color -d 'If specified, output won\'t contain any color'
 
 ### graph
-complete -f -c terraform -n '__fish_use_subcommand' -a graph -d 'Create a visual graph of Terraform resources'
+complete -f -c terraform -n __fish_use_subcommand -a graph -d 'Create a visual graph of Terraform resources'
 complete -f -c terraform -n '__fish_seen_subcommand_from graph' -o draw-cycles -d 'Highlight any cycles in the graph'
 complete -f -c terraform -n '__fish_seen_subcommand_from graph' -o no-color -d 'If specified, output won\'t contain any color'
 complete -f -c terraform -n '__fish_seen_subcommand_from graph' -o type -d 'Type of graph to output'
 
 ### import
-complete -f -c terraform -n '__fish_use_subcommand' -a import -d 'Import existing infrastructure into Terraform'
+complete -f -c terraform -n __fish_use_subcommand -a import -d 'Import existing infrastructure into Terraform'
 complete -f -c terraform -n '__fish_seen_subcommand_from import' -o backup -d 'Path to backup the existing state file'
 complete -f -c terraform -n '__fish_seen_subcommand_from import' -o config -d 'Path to a directory of configuration files'
 complete -f -c terraform -n '__fish_seen_subcommand_from import' -o input -d 'Ask for input for variables if not directly set'
@@ -77,7 +77,7 @@ complete -f -c terraform -n '__fish_seen_subcommand_from import' -o var -d 'Set
 complete -f -c terraform -n '__fish_seen_subcommand_from import' -o var-file -d 'Set variables from a file'
 
 ### init
-complete -f -c terraform -n '__fish_use_subcommand' -a init -d 'Initialize a new or existing Terraform configuration'
+complete -f -c terraform -n __fish_use_subcommand -a init -d 'Initialize a new or existing Terraform configuration'
 complete -f -c terraform -n '__fish_seen_subcommand_from init' -o backend -d 'Configure the backend for this environment'
 complete -f -c terraform -n '__fish_seen_subcommand_from init' -o backend-config -d 'Backend configuration'
 complete -f -c terraform -n '__fish_seen_subcommand_from init' -o get -d 'Download modules for this configuration'
@@ -88,14 +88,14 @@ complete -f -c terraform -n '__fish_seen_subcommand_from init' -o no-color -d 'I
 complete -f -c terraform -n '__fish_seen_subcommand_from init' -o force-copy -d 'Suppress prompts about copying state data'
 
 ### output
-complete -f -c terraform -n '__fish_use_subcommand' -a output -d 'Read an output from a state file'
+complete -f -c terraform -n __fish_use_subcommand -a output -d 'Read an output from a state file'
 complete -f -c terraform -n '__fish_seen_subcommand_from output' -o state -d 'Path to the state file to read'
 complete -f -c terraform -n '__fish_seen_subcommand_from output' -o no-color -d 'If specified, output won\'t contain any color'
 complete -f -c terraform -n '__fish_seen_subcommand_from output' -o module -d 'Return the outputs for a specific module'
 complete -f -c terraform -n '__fish_seen_subcommand_from output' -o json -d 'Print output in JSON format'
 
 ### plan
-complete -f -c terraform -n '__fish_use_subcommand' -a plan -d 'Generate and show an execution plan'
+complete -f -c terraform -n __fish_use_subcommand -a plan -d 'Generate and show an execution plan'
 complete -f -c terraform -n '__fish_seen_subcommand_from plan' -o destroy -d 'Generate a plan to destroy all resources'
 complete -f -c terraform -n '__fish_seen_subcommand_from plan' -o detailed-exitcode -d 'Return detailed exit codes'
 complete -f -c terraform -n '__fish_seen_subcommand_from plan' -o input -d 'Ask for input for variables if not directly set'
@@ -112,7 +112,7 @@ complete -f -c terraform -n '__fish_seen_subcommand_from plan' -o var -d 'Set a
 complete -f -c terraform -n '__fish_seen_subcommand_from plan' -o var-file -d 'Set variables from a file'
 
 ### push
-complete -f -c terraform -n '__fish_use_subcommand' -a push -d 'Upload this Terraform module to Atlas to run'
+complete -f -c terraform -n __fish_use_subcommand -a push -d 'Upload this Terraform module to Atlas to run'
 complete -f -c terraform -n '__fish_seen_subcommand_from push' -o atlas-address -d 'An alternate address to an Atlas instance'
 complete -f -c terraform -n '__fish_seen_subcommand_from push' -o upload-modules -d 'Lock modules and upload completely'
 complete -f -c terraform -n '__fish_seen_subcommand_from push' -o name -d 'Name of the configuration in Atlas'
@@ -124,7 +124,7 @@ complete -f -c terraform -n '__fish_seen_subcommand_from push' -o vcs -d 'Upload
 complete -f -c terraform -n '__fish_seen_subcommand_from push' -o no-color -d 'If specified, output won\'t contain any color'
 
 ### refresh
-complete -f -c terraform -n '__fish_use_subcommand' -a refresh -d 'Update local state file against real resources'
+complete -f -c terraform -n __fish_use_subcommand -a refresh -d 'Update local state file against real resources'
 complete -f -c terraform -n '__fish_seen_subcommand_from refresh' -o backup -d 'Path to backup the existing state file'
 complete -f -c terraform -n '__fish_seen_subcommand_from refresh' -o input -d 'Ask for input for variables if not directly set'
 complete -f -c terraform -n '__fish_seen_subcommand_from refresh' -o lock -d 'Lock the state file when locking is supported'
@@ -137,12 +137,12 @@ complete -f -c terraform -n '__fish_seen_subcommand_from refresh' -o var -d 'Set
 complete -f -c terraform -n '__fish_seen_subcommand_from refresh' -o var-file -d 'Set variables from a file'
 
 ### show
-complete -f -c terraform -n '__fish_use_subcommand' -a show -d 'Inspect Terraform state or plan'
+complete -f -c terraform -n __fish_use_subcommand -a show -d 'Inspect Terraform state or plan'
 complete -f -c terraform -n '__fish_seen_subcommand_from show' -o module-depth -d 'Depth of modules to show in the output'
 complete -f -c terraform -n '__fish_seen_subcommand_from show' -o no-color -d 'If specified, output won\'t contain any color'
 
 ### taint
-complete -f -c terraform -n '__fish_use_subcommand' -a taint -d 'Manually mark a resource for recreation'
+complete -f -c terraform -n __fish_use_subcommand -a taint -d 'Manually mark a resource for recreation'
 complete -f -c terraform -n '__fish_seen_subcommand_from taint' -o allow-missing -d 'Succeed even if resource is missing'
 complete -f -c terraform -n '__fish_seen_subcommand_from taint' -o backup -d 'Path to backup the existing state file'
 complete -f -c terraform -n '__fish_seen_subcommand_from taint' -o lock -d 'Lock the state file when locking is supported'
@@ -153,7 +153,7 @@ complete -f -c terraform -n '__fish_seen_subcommand_from taint' -o state -d 'Pat
 complete -f -c terraform -n '__fish_seen_subcommand_from taint' -o state-out -d 'Path to write state'
 
 ### untaint
-complete -f -c terraform -n '__fish_use_subcommand' -a untaint -d 'Manually unmark a resource as tainted'
+complete -f -c terraform -n __fish_use_subcommand -a untaint -d 'Manually unmark a resource as tainted'
 complete -f -c terraform -n '__fish_seen_subcommand_from untaint' -o allow-missing -d 'Succeed even if resource is missing'
 complete -f -c terraform -n '__fish_seen_subcommand_from untaint' -o backup -d 'Path to backup the existing state file'
 complete -f -c terraform -n '__fish_seen_subcommand_from untaint' -o lock -d 'Lock the state file when locking is supported'
@@ -164,8 +164,8 @@ complete -f -c terraform -n '__fish_seen_subcommand_from untaint' -o state -d 'P
 complete -f -c terraform -n '__fish_seen_subcommand_from untaint' -o state-out -d 'Path to write state'
 
 ### validate
-complete -f -c terraform -n '__fish_use_subcommand' -a validate -d 'Validate the Terraform files'
+complete -f -c terraform -n __fish_use_subcommand -a validate -d 'Validate the Terraform files'
 complete -f -c terraform -n '__fish_seen_subcommand_from validate' -o no-color -d 'If specified, output won\'t contain any color'
 
 ### version
-complete -f -c terraform -n '__fish_use_subcommand' -a version -d 'Print the Terraform version'
+complete -f -c terraform -n __fish_use_subcommand -a version -d 'Print the Terraform version'
diff --git a/share/completions/time.fish b/share/completions/time.fish
index 77891f435..7a04ab845 100644
--- a/share/completions/time.fish
+++ b/share/completions/time.fish
@@ -1,14 +1,14 @@
 if not command -q time
-    complete -c time -a "(__fish_complete_subcommand)" -d "Command"
+    complete -c time -a "(__fish_complete_subcommand)" -d Command
     exit
 end
 
-complete -c time -a "(__fish_complete_subcommand -- -o --output -f --format)" -d "Command"
+complete -c time -a "(__fish_complete_subcommand -- -o --output -f --format)" -d Command
 
-complete -c time -s f -l format -n "__fish_no_arguments" -d "Specify output format" -x
-complete -c time -s p -l portable -n "__fish_no_arguments" -d "Use the portable output format"
-complete -c time -s o -l output -n "__fish_no_arguments" -d "Do not send the results to stderr, but overwrite the specified file" -r
-complete -c time -s a -l append -n "__fish_no_arguments" -d "(Used together with -o) Do not overwrite but append"
-complete -c time -s v -l verbose -n "__fish_no_arguments" -d "Verbose mode"
-complete -c time -l help -n "__fish_no_arguments" -d "Display help and exit"
-complete -c time -s V -l version -n "__fish_no_arguments" -d "Display version and exit"
+complete -c time -s f -l format -n __fish_no_arguments -d "Specify output format" -x
+complete -c time -s p -l portable -n __fish_no_arguments -d "Use the portable output format"
+complete -c time -s o -l output -n __fish_no_arguments -d "Do not send the results to stderr, but overwrite the specified file" -r
+complete -c time -s a -l append -n __fish_no_arguments -d "(Used together with -o) Do not overwrite but append"
+complete -c time -s v -l verbose -n __fish_no_arguments -d "Verbose mode"
+complete -c time -l help -n __fish_no_arguments -d "Display help and exit"
+complete -c time -s V -l version -n __fish_no_arguments -d "Display version and exit"
diff --git a/share/completions/timedatectl.fish b/share/completions/timedatectl.fish
index f57647713..e30775fd3 100644
--- a/share/completions/timedatectl.fish
+++ b/share/completions/timedatectl.fish
@@ -1,15 +1,15 @@
 set -l commands status set-time{,zone} list-timezones set-local-rtc set-ntp
 
 complete -c timedatectl -f
-complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "status"
-complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "set-time"
-complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "set-timezone"
+complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a status
+complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a set-time
+complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a set-timezone
 complete -c timedatectl -n "__fish_seen_subcommand_from set-timezone" -a "(timedatectl list-timezones)"
-complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "list-timezones"
-complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "set-local-rtc" -d "Maintain RTC in local time"
+complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a list-timezones
+complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a set-local-rtc -d "Maintain RTC in local time"
 complete -c timedatectl -n "__fish_seen_subcommand_from set-local-rtc" -a "true false"
 complete -c timedatectl -n "__fish_seen_subcommand_from set-local-rtc" -l adjust-system-clock -d 'Synchronize system clock from the RTC'
-complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "set-ntp" -d "Use NTP"
+complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a set-ntp -d "Use NTP"
 complete -c timedatectl -n "__fish_seen_subcommand_from set-ntp" -a "true false"
 complete -c timedatectl -l no-ask-password -d "Don't ask for password"
 complete -c timedatectl -s H -l host -d 'Execute the operation on a remote host'
diff --git a/share/completions/tmutil.fish b/share/completions/tmutil.fish
index 37cfd350e..d0d0f1d20 100644
--- a/share/completions/tmutil.fish
+++ b/share/completions/tmutil.fish
@@ -1,11 +1,11 @@
 # completion for tmutil (macOS)
 
-complete -f -c tmutil -n '__fish_use_subcommand' -a addexclusion -d 'Add an exclusion not to back up a file'
+complete -f -c tmutil -n __fish_use_subcommand -a addexclusion -d 'Add an exclusion not to back up a file'
 complete -f -c tmutil -n '__fish_seen_subcommand_from addexclusion' -s v -d 'Volume exclusion'
 complete -f -c tmutil -n '__fish_seen_subcommand_from addexclusion' -s p -d 'Path exclusion'
-complete -r -c tmutil -n '__fish_use_subcommand' -a associatedisk -d 'Bind a snapshot volume directory to the specified local disk'
-complete -r -c tmutil -n '__fish_use_subcommand' -a calculatedrift -d 'Determine the amount of change between snapshots'
-complete -r -c tmutil -n '__fish_use_subcommand' -a compare -d 'Perform a backup diff'
+complete -r -c tmutil -n __fish_use_subcommand -a associatedisk -d 'Bind a snapshot volume directory to the specified local disk'
+complete -r -c tmutil -n __fish_use_subcommand -a calculatedrift -d 'Determine the amount of change between snapshots'
+complete -r -c tmutil -n __fish_use_subcommand -a compare -d 'Perform a backup diff'
 complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s a -d 'Compare all supported metadata'
 complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s n -d 'No metadata comparison'
 complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s @ -d 'Compare extended attributes'
@@ -22,40 +22,40 @@ complete -r -c tmutil -n '__fish_seen_subcommand_from compare' -s D -d 'Limit tr
 complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s E -d 'Dont take exclusions into account'
 complete -r -c tmutil -n '__fish_seen_subcommand_from compare' -s I -d 'Ignore path'
 complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s U -d 'Ignore logical volume identity'
-complete -r -c tmutil -n '__fish_use_subcommand' -a delete -d 'Delete one or more snapshots'
-complete -r -c tmutil -n '__fish_use_subcommand' -a deletelocalsnapshots -d 'Delete all local Time Machine snapshots for the specified date (formatted YYYY-MM-DD-HHMMSS)'
-complete -f -c tmutil -n '__fish_use_subcommand' -a destinationinfo -d 'Print information about destinations'
-complete -f -c tmutil -n '__fish_use_subcommand' -a disable -d 'Turn off automatic backups'
-complete -f -c tmutil -n '__fish_use_subcommand' -a disablelocal -d 'Turn off local Time Machine snapshots'
-complete -f -c tmutil -n '__fish_use_subcommand' -a enable -d 'Turn on automatic backups'
-complete -f -c tmutil -n '__fish_use_subcommand' -a enablelocal -d 'Turn on local Time Machine snapshots'
-complete -r -c tmutil -n '__fish_use_subcommand' -a inheritbackup -d 'Claim a machine directory or sparsebundle for use by the current machine'
-complete -f -c tmutil -n '__fish_use_subcommand' -a isexcluded -d 'Determine if a file, directory, or volume are excluded from backups'
-complete -f -c tmutil -n '__fish_use_subcommand' -a latestbackup -d 'Print the path to the latest snapshot'
-complete -c tmutil -n '__fish_use_subcommand' -a listlocalsnapshotdates -d 'List the creation dates of all local Time Machine snapshots'
-complete -r -c tmutil -n '__fish_use_subcommand' -a listlocalsnapshots -d 'List local Time Machine snapshots of the specified volume'
-complete -f -c tmutil -n '__fish_use_subcommand' -a listbackups -d 'Print paths for all snapshots'
-complete -f -c tmutil -n '__fish_use_subcommand' -a localsnapshot -d 'Create new local Time Machine snapshots of all APFS volumes included in TM backup'
-complete -f -c tmutil -n '__fish_use_subcommand' -a machinedirectory -d 'Print the path to the current machine directory'
-complete -f -c tmutil -n '__fish_use_subcommand' -a removedestination -d 'Removes a backup destination'
-complete -f -c tmutil -n '__fish_use_subcommand' -a removeexclusion -d 'Remove an exclusion'
+complete -r -c tmutil -n __fish_use_subcommand -a delete -d 'Delete one or more snapshots'
+complete -r -c tmutil -n __fish_use_subcommand -a deletelocalsnapshots -d 'Delete all local Time Machine snapshots for the specified date (formatted YYYY-MM-DD-HHMMSS)'
+complete -f -c tmutil -n __fish_use_subcommand -a destinationinfo -d 'Print information about destinations'
+complete -f -c tmutil -n __fish_use_subcommand -a disable -d 'Turn off automatic backups'
+complete -f -c tmutil -n __fish_use_subcommand -a disablelocal -d 'Turn off local Time Machine snapshots'
+complete -f -c tmutil -n __fish_use_subcommand -a enable -d 'Turn on automatic backups'
+complete -f -c tmutil -n __fish_use_subcommand -a enablelocal -d 'Turn on local Time Machine snapshots'
+complete -r -c tmutil -n __fish_use_subcommand -a inheritbackup -d 'Claim a machine directory or sparsebundle for use by the current machine'
+complete -f -c tmutil -n __fish_use_subcommand -a isexcluded -d 'Determine if a file, directory, or volume are excluded from backups'
+complete -f -c tmutil -n __fish_use_subcommand -a latestbackup -d 'Print the path to the latest snapshot'
+complete -c tmutil -n __fish_use_subcommand -a listlocalsnapshotdates -d 'List the creation dates of all local Time Machine snapshots'
+complete -r -c tmutil -n __fish_use_subcommand -a listlocalsnapshots -d 'List local Time Machine snapshots of the specified volume'
+complete -f -c tmutil -n __fish_use_subcommand -a listbackups -d 'Print paths for all snapshots'
+complete -f -c tmutil -n __fish_use_subcommand -a localsnapshot -d 'Create new local Time Machine snapshots of all APFS volumes included in TM backup'
+complete -f -c tmutil -n __fish_use_subcommand -a machinedirectory -d 'Print the path to the current machine directory'
+complete -f -c tmutil -n __fish_use_subcommand -a removedestination -d 'Removes a backup destination'
+complete -f -c tmutil -n __fish_use_subcommand -a removeexclusion -d 'Remove an exclusion'
 complete -f -c tmutil -n '__fish_seen_subcommand_from removeexclusion' -s v -d 'Volume exclusion'
 complete -f -c tmutil -n '__fish_seen_subcommand_from removeexclusion' -s p -d 'Path exclusion'
-complete -f -c tmutil -n '__fish_use_subcommand' -a restore -d 'Restore an item'
+complete -f -c tmutil -n __fish_use_subcommand -a restore -d 'Restore an item'
 complete -r -c tmutil -n '__fish_seen_subcommand_from restore' -s v
-complete -r -c tmutil -n '__fish_use_subcommand' -a setdestination -d 'Set a backup destination'
+complete -r -c tmutil -n __fish_use_subcommand -a setdestination -d 'Set a backup destination'
 complete -f -c tmutil -n '__fish_seen_subcommand_from setdestination' -s a -d 'Add to the list of destinations'
 complete -f -c tmutil -n '__fish_seen_subcommand_from setdestination' -s p -d 'Enter the password at a non-echoing interactive prompt'
-complete -f -c tmutil -n '__fish_use_subcommand' -a snapshot -d 'Create new local Time Machine snapshot'
-complete -f -c tmutil -n '__fish_use_subcommand' -a startbackup -d 'Begin a backup if one is not already running'
+complete -f -c tmutil -n __fish_use_subcommand -a snapshot -d 'Create new local Time Machine snapshot'
+complete -f -c tmutil -n __fish_use_subcommand -a startbackup -d 'Begin a backup if one is not already running'
 complete -f -c tmutil -n '__fish_seen_subcommand_from startbackup' -s a -l auto -d 'Automatic mode'
 complete -f -c tmutil -n '__fish_seen_subcommand_from startbackup' -s b -l block -d 'Block until finished'
 complete -f -c tmutil -n '__fish_seen_subcommand_from startbackup' -s r -l rotation -d 'Automatic rotation'
 complete -r -c tmutil -n '__fish_seen_subcommand_from startbackup' -s d -l destination -d 'Backup destination'
-complete -f -c tmutil -n '__fish_use_subcommand' -a stopbackup -d 'Cancel a backup currently in progress'
-complete -r -c tmutil -n '__fish_use_subcommand' -a thinlocalsnapshots -d 'Thin local Time Machine snapshots for the specified volume'
-complete -r -c tmutil -n '__fish_use_subcommand' -a uniquesize -d 'Analyze the specified path and determine its unique size'
-complete -r -c tmutil -n '__fish_use_subcommand' -a verifychecksums -d 'Verify snapshot'
-complete -f -c tmutil -n '__fish_use_subcommand' -a version -d 'Print version'
+complete -f -c tmutil -n __fish_use_subcommand -a stopbackup -d 'Cancel a backup currently in progress'
+complete -r -c tmutil -n __fish_use_subcommand -a thinlocalsnapshots -d 'Thin local Time Machine snapshots for the specified volume'
+complete -r -c tmutil -n __fish_use_subcommand -a uniquesize -d 'Analyze the specified path and determine its unique size'
+complete -r -c tmutil -n __fish_use_subcommand -a verifychecksums -d 'Verify snapshot'
+complete -f -c tmutil -n __fish_use_subcommand -a version -d 'Print version'
 
 complete -f -c tmutil -n '__fish_seen_subcommand_from destinationinfo isexcluded compare' -s X -d 'Print as XML'
diff --git a/share/completions/tmux.fish b/share/completions/tmux.fish
index 8049d0c4f..018ccc57e 100644
--- a/share/completions/tmux.fish
+++ b/share/completions/tmux.fish
@@ -22,27 +22,27 @@ complete -c tmux -x
 
 ###############  Begin: Front  Flags ###############
 #these do not require parameters
-complete -c tmux -n '__fish_use_subcommand' -s 2 -d 'Force tmux to assume the terminal supports 256 colours'
-complete -c tmux -n '__fish_use_subcommand' -s 8 -d 'Like -2, but indicates that the terminal supports 88 colours'
-complete -c tmux -n '__fish_use_subcommand' -s l -d 'Behave as a login shell'
-complete -c tmux -n '__fish_use_subcommand' -s q -d 'Set the quiet server option'
-complete -c tmux -n '__fish_use_subcommand' -s u -d 'Flag explicitly informs tmux that UTF-8 is supported'
-complete -c tmux -n '__fish_use_subcommand' -s v -d 'Request verbose logging'
-complete -c tmux -n '__fish_use_subcommand' -s V -d 'Report the tmux version'
+complete -c tmux -n __fish_use_subcommand -s 2 -d 'Force tmux to assume the terminal supports 256 colours'
+complete -c tmux -n __fish_use_subcommand -s 8 -d 'Like -2, but indicates that the terminal supports 88 colours'
+complete -c tmux -n __fish_use_subcommand -s l -d 'Behave as a login shell'
+complete -c tmux -n __fish_use_subcommand -s q -d 'Set the quiet server option'
+complete -c tmux -n __fish_use_subcommand -s u -d 'Flag explicitly informs tmux that UTF-8 is supported'
+complete -c tmux -n __fish_use_subcommand -s v -d 'Request verbose logging'
+complete -c tmux -n __fish_use_subcommand -s V -d 'Report the tmux version'
 
 #these require parameters
-complete -c tmux -n '__fish_use_subcommand' -xs c -d 'Execute command using the default shell'
-complete -c tmux -n '__fish_use_subcommand' -rs f -d 'Alternate config file'
-complete -c tmux -n '__fish_use_subcommand' -rs L -d 'Specify the name of the server socket to use'
-complete -c tmux -n '__fish_use_subcommand' -rs S -d 'Full path to server socket. If set, -L is ignored.'
+complete -c tmux -n __fish_use_subcommand -xs c -d 'Execute command using the default shell'
+complete -c tmux -n __fish_use_subcommand -rs f -d 'Alternate config file'
+complete -c tmux -n __fish_use_subcommand -rs L -d 'Specify the name of the server socket to use'
+complete -c tmux -n __fish_use_subcommand -rs S -d 'Full path to server socket. If set, -L is ignored.'
 ###############  End:   Front  Flags ###############
 
 ###############  Begin: Clients and Sessions ###############
 set -l attach 'attach-session attach at a'
 set -l detach 'detach-client detach'
 set -l has 'has-session has'
-set -l killserver 'kill-server'
-set -l killsession 'kill-session'
+set -l killserver kill-server
+set -l killsession kill-session
 set -l lsc 'list-clients lsc'
 set -l lscm 'list-commands lscm'
 set -l ls 'list-sessions ls'
@@ -57,60 +57,60 @@ set -l start 'start-server start'
 set -l suspendc 'suspend-client suspendc'
 set -l switchc 'switch-client switchc'
 
-complete -c tmux -n '__fish_use_subcommand' -a $attach -d 'attach to existing session'
+complete -c tmux -n __fish_use_subcommand -a $attach -d 'attach to existing session'
 complete -c tmux -n "__fish_seen_subcommand_from $attach" -s d -d 'detach other clients'
 complete -c tmux -n "__fish_seen_subcommand_from $attach" -s r -d 'attach in read-only mode'
 
-complete -c tmux -n '__fish_use_subcommand' -a $detach -d 'detach current client'
+complete -c tmux -n __fish_use_subcommand -a $detach -d 'detach current client'
 complete -c tmux -n "__fish_seen_subcommand_from $detach" -s P -d 'SIGHUP parent process of client, likely causing it to exit'
 
-complete -c tmux -n '__fish_use_subcommand' -a $has -d 'report error and exit with 1 if the specified session does not exist'
-complete -c tmux -n '__fish_use_subcommand' -a $killserver -d 'kill tmux server, clients, and sessions'
-complete -c tmux -n '__fish_use_subcommand' -a $killsession -d 'destroy session, closing windows linked to it and no other sessions, detach all clients'
-complete -c tmux -n '__fish_use_subcommand' -a $lsc -d 'list all attached clients'
-complete -c tmux -n '__fish_use_subcommand' -a $lscm -d 'list syntax for all tmux commands'
-complete -c tmux -n '__fish_use_subcommand' -a $ls -d 'list all sessions'
-complete -c tmux -n '__fish_use_subcommand' -a $lockc -d 'lock client'
-complete -c tmux -n '__fish_use_subcommand' -a $locks -d 'lock session'
+complete -c tmux -n __fish_use_subcommand -a $has -d 'report error and exit with 1 if the specified session does not exist'
+complete -c tmux -n __fish_use_subcommand -a $killserver -d 'kill tmux server, clients, and sessions'
+complete -c tmux -n __fish_use_subcommand -a $killsession -d 'destroy session, closing windows linked to it and no other sessions, detach all clients'
+complete -c tmux -n __fish_use_subcommand -a $lsc -d 'list all attached clients'
+complete -c tmux -n __fish_use_subcommand -a $lscm -d 'list syntax for all tmux commands'
+complete -c tmux -n __fish_use_subcommand -a $ls -d 'list all sessions'
+complete -c tmux -n __fish_use_subcommand -a $lockc -d 'lock client'
+complete -c tmux -n __fish_use_subcommand -a $locks -d 'lock session'
 
-complete -c tmux -n '__fish_use_subcommand' -a $new -d 'create a new session with name session-name'
+complete -c tmux -n __fish_use_subcommand -a $new -d 'create a new session with name session-name'
 complete -c tmux -n "__fish_seen_subcommand_from $new" -s d -d "don't attach to current window"
 complete -c tmux -n "__fish_seen_subcommand_from $new" -s A -d "attach to existing session if session-name already exists"
 complete -c tmux -n "__fish_seen_subcommand_from $new" -s D -d "if -A is specified, detach other clients attached to the session if it exists"
 complete -c tmux -n "__fish_seen_subcommand_from $new" -s P -d "print information about the new session after creation"
 complete -c tmux -n "__fish_seen_subcommand_from $new" -s E -d "don't apply update-environment option"
-complete -c tmux -n "__fish_seen_subcommand_from $new" -xs c -d 'start-directory'
-complete -c tmux -n "__fish_seen_subcommand_from $new" -xs F -d 'format'
-complete -c tmux -n "__fish_seen_subcommand_from $new" -xs n -d 'window-name'
-complete -c tmux -n "__fish_seen_subcommand_from $new" -xs s -d 'session-name'
-complete -c tmux -n "__fish_seen_subcommand_from $new" -xs t -d 'group-name'
-complete -c tmux -n "__fish_seen_subcommand_from $new" -xs x -d 'width'
-complete -c tmux -n "__fish_seen_subcommand_from $new" -xs y -d 'height'
+complete -c tmux -n "__fish_seen_subcommand_from $new" -xs c -d start-directory
+complete -c tmux -n "__fish_seen_subcommand_from $new" -xs F -d format
+complete -c tmux -n "__fish_seen_subcommand_from $new" -xs n -d window-name
+complete -c tmux -n "__fish_seen_subcommand_from $new" -xs s -d session-name
+complete -c tmux -n "__fish_seen_subcommand_from $new" -xs t -d group-name
+complete -c tmux -n "__fish_seen_subcommand_from $new" -xs x -d width
+complete -c tmux -n "__fish_seen_subcommand_from $new" -xs y -d height
 
-complete -c tmux -n '__fish_use_subcommand' -a $refresh -d 'refresh client'
+complete -c tmux -n __fish_use_subcommand -a $refresh -d 'refresh client'
 complete -c tmux -n "__fish_seen_subcommand_from $refresh" -s S -d 'update client status bar'
 
-complete -c tmux -n '__fish_use_subcommand' -a $rename -d 'rename session'
-complete -c tmux -n '__fish_use_subcommand' -a $showmsgs -d 'save msgs in status bar in per-client msg log'
+complete -c tmux -n __fish_use_subcommand -a $rename -d 'rename session'
+complete -c tmux -n __fish_use_subcommand -a $showmsgs -d 'save msgs in status bar in per-client msg log'
 
-complete -c tmux -n '__fish_use_subcommand' -a $source -d 'execute commands from path'
-complete -c tmux -n '__fish_use_subcommand' -a $start -d 'start tmux server if not running; do not create a session'
+complete -c tmux -n __fish_use_subcommand -a $source -d 'execute commands from path'
+complete -c tmux -n __fish_use_subcommand -a $start -d 'start tmux server if not running; do not create a session'
 
-complete -c tmux -n '__fish_use_subcommand' -a $suspendc -d 'send SIGTSTP signal to client (tty stop)'
+complete -c tmux -n __fish_use_subcommand -a $suspendc -d 'send SIGTSTP signal to client (tty stop)'
 
-complete -c tmux -n '__fish_use_subcommand' -a $switchc -d 'Switch the current session for client target-client to target-session'
+complete -c tmux -n __fish_use_subcommand -a $switchc -d 'Switch the current session for client target-client to target-session'
 complete -c tmux -n "__fish_seen_subcommand_from $switchc" -s l -d 'move client to the last session'
 complete -c tmux -n "__fish_seen_subcommand_from $switchc" -s n -d 'move client to the next session'
 complete -c tmux -n "__fish_seen_subcommand_from $switchc" -s p -d 'move client to the previous session'
 complete -c tmux -n "__fish_seen_subcommand_from $switchc" -s r -d 'toggle if client is read-only'
 
 #commands with a session flag
-complete -c tmux -xs t -n "__fish_seen_subcommand_from $attach $new $has $killsession $lsc $locks $rename $switchc" -a '(__fish_tmux_sessions)' -d 'target-session'
-complete -c tmux -xs s -n "__fish_seen_subcommand_from $detach" -a '(__fish_tmux_sessions)' -d 'target-session'
+complete -c tmux -xs t -n "__fish_seen_subcommand_from $attach $new $has $killsession $lsc $locks $rename $switchc" -a '(__fish_tmux_sessions)' -d target-session
+complete -c tmux -xs s -n "__fish_seen_subcommand_from $detach" -a '(__fish_tmux_sessions)' -d target-session
 
 #commands with a client flag
-complete -c tmux -xs t -n "__fish_seen_subcommand_from $detach $lockc $refresh $showmsgs $suspendc" -a '(__fish_tmux_clients)' -d 'target-client'
-complete -c tmux -xs c -n "__fish_seen_subcommand_from $switchc" -a '(__fish_tmux_clients)' -d 'target-client'
+complete -c tmux -xs t -n "__fish_seen_subcommand_from $detach $lockc $refresh $showmsgs $suspendc" -a '(__fish_tmux_clients)' -d target-client
+complete -c tmux -xs c -n "__fish_seen_subcommand_from $switchc" -a '(__fish_tmux_clients)' -d target-client
 
 #commands with the -F format flag
 complete -c tmux -n "__fish_seen_subcommand_from $lsc $ls" -rs F -d 'format string'
@@ -127,29 +127,29 @@ complete -c tmux -n "__fish_seen_subcommand_from $lsc $ls" -rs F -d 'format stri
 set -l bind 'bind-key bind'
 set -l lsk 'list-keys lsk'
 set -l send 'send-keys send'
-set -l sendprefix 'send-prefix'
+set -l sendprefix send-prefix
 set -l unbind 'unbind-key unbind'
 
 set -l key_table 'vi-edit emacs-edit vi-choice emacs-choice vi-copy emacs-copy'
 
-complete -c tmux -n '__fish_use_subcommand' -a $bind -d 'bind key to command'
+complete -c tmux -n __fish_use_subcommand -a $bind -d 'bind key to command'
 complete -c tmux -n "__fish_seen_subcommand_from $bind" -s c -d 'bind for command mode instead of normal mode'
 complete -c tmux -n "__fish_seen_subcommand_from $bind" -s n -d 'make the binding work without using a prefix key'
 complete -c tmux -n "__fish_seen_subcommand_from $bind" -s r -d 'key may repeat'
 complete -c tmux -n "__fish_seen_subcommand_from $bind" -xs t -d 'choose key table for binding' -xa "$key_table"
 
-complete -c tmux -n '__fish_use_subcommand' -a $lsk -d 'list all key bindings'
+complete -c tmux -n __fish_use_subcommand -a $lsk -d 'list all key bindings'
 complete -c tmux -n "__fish_seen_subcommand_from $lsk" -s t -d 'key table' -xa "$key_table"
 
-complete -c tmux -n '__fish_use_subcommand' -a $send -d 'list all key bindings'
+complete -c tmux -n __fish_use_subcommand -a $send -d 'list all key bindings'
 complete -c tmux -n "__fish_seen_subcommand_from $send" -s R -d 'reset terminal state'
 complete -c tmux -n "__fish_seen_subcommand_from $send" -xs t -a '(__fish_tmux_panes)' -d 'target pane'
 
-complete -c tmux -n '__fish_use_subcommand' -a $sendprefix -d 'send the prefix key'
+complete -c tmux -n __fish_use_subcommand -a $sendprefix -d 'send the prefix key'
 complete -c tmux -n "__fish_seen_subcommand_from $sendprefix" -s 2 -d 'use secondary prefix'
 complete -c tmux -n "__fish_seen_subcommand_from $sendprefix" -xs t -a '(__fish_tmux_panes)' -d 'target pane'
 
-complete -c tmux -n '__fish_use_subcommand' -a $unbind -d 'unbind the command bound to key'
+complete -c tmux -n __fish_use_subcommand -a $unbind -d 'unbind the command bound to key'
 complete -c tmux -n "__fish_seen_subcommand_from $unbind" -s a -d 'remove all key bindings'
 complete -c tmux -n "__fish_seen_subcommand_from $unbind" -s c -d 'binding for command mode'
 complete -c tmux -n "__fish_seen_subcommand_from $unbind" -s n -d 'command bound to key without a prefix (if any) removed'
@@ -167,31 +167,31 @@ complete -c tmux -n "__fish_seen_subcommand_from $unbind" -xs t -d 'key table' -
 set -l setenv 'set-environment setenv'
 set -l showenv 'show-environment showenv'
 
-complete -c tmux -n '__fish_use_subcommand' -a $setenv -d 'Set or unset an environment variable'
+complete -c tmux -n __fish_use_subcommand -a $setenv -d 'Set or unset an environment variable'
 complete -c tmux -n "__fish_seen_subcommand_from $setenv" -s g -d 'global environment'
 complete -c tmux -n "__fish_seen_subcommand_from $setenv" -s r -d 'remove from environment before starting a new process'
 complete -c tmux -n "__fish_seen_subcommand_from $setenv" -s u -d 'unset variable'
-complete -c tmux -xs t -n "__fish_seen_subcommand_from $setenv" -a '(__fish_tmux_sessions)' -d 'target-session'
+complete -c tmux -xs t -n "__fish_seen_subcommand_from $setenv" -a '(__fish_tmux_sessions)' -d target-session
 
-complete -c tmux -n '__fish_use_subcommand' -a $showenv -d 'bind key to command'
+complete -c tmux -n __fish_use_subcommand -a $showenv -d 'bind key to command'
 complete -c tmux -n "__fish_seen_subcommand_from $showenv" -s g -d 'global environment'
-complete -c tmux -xs t -n "__fish_seen_subcommand_from $showenv" -a '(__fish_tmux_sessions)' -d 'target-session'
+complete -c tmux -xs t -n "__fish_seen_subcommand_from $showenv" -a '(__fish_tmux_sessions)' -d target-session
 
 ###############  End:   Environment ###############
 
 ###############  Begin: Status Line ###############
-set -l commandprompt 'command-prompt'
+set -l commandprompt command-prompt
 set -l display 'display-message display'
 
-complete -c tmux -n '__fish_use_subcommand' -a $commandprompt -d 'Open the command prompt in a client'
+complete -c tmux -n __fish_use_subcommand -a $commandprompt -d 'Open the command prompt in a client'
 complete -c tmux -n "__fish_seen_subcommand_from $commandprompt" -s I -x -d 'Comma-separated list of initial text for each prompt'
 complete -c tmux -n "__fish_seen_subcommand_from $commandprompt" -s p -x -d 'Comma-separated list of prompts'
-complete -c tmux -n "__fish_seen_subcommand_from $commandprompt" -s t -xa '(__fish_tmux_clients)' -d 'target-client'
+complete -c tmux -n "__fish_seen_subcommand_from $commandprompt" -s t -xa '(__fish_tmux_clients)' -d target-client
 
-complete -c tmux -n '__fish_use_subcommand' -a $display -d 'Display a message'
+complete -c tmux -n __fish_use_subcommand -a $display -d 'Display a message'
 complete -c tmux -n "__fish_seen_subcommand_from $display" -s p -d 'print to stdout'
-complete -c tmux -n "__fish_seen_subcommand_from $display" -s t -xa '(__fish_tmux_panes)' -d 'target-pane'
-complete -c tmux -n "__fish_seen_subcommand_from $display" -s c -xa '(__fish_tmux_clients)' -d 'target-client'
+complete -c tmux -n "__fish_seen_subcommand_from $display" -s t -xa '(__fish_tmux_panes)' -d target-pane
+complete -c tmux -n "__fish_seen_subcommand_from $display" -s c -xa '(__fish_tmux_clients)' -d target-client
 
 ###############  End:   Status Line ###############
 
diff --git a/share/completions/trap.fish b/share/completions/trap.fish
index d500e5110..0f0cc2d4a 100644
--- a/share/completions/trap.fish
+++ b/share/completions/trap.fish
@@ -2,4 +2,4 @@
 complete -c trap -s l -l list-signals -d 'Display names of all signals'
 complete -c trap -s p -l print -d 'Display all currently defined trap handlers'
 complete -c trap -s h -l help -d 'Display help and exit'
-complete -c trap -a '(trap -l | sed "s/ /\n/g")' -d 'Signal'
+complete -c trap -a '(trap -l | sed "s/ /\n/g")' -d Signal
diff --git a/share/completions/travis.fish b/share/completions/travis.fish
index 8ba924d25..d1402ed57 100644
--- a/share/completions/travis.fish
+++ b/share/completions/travis.fish
@@ -17,42 +17,42 @@ function __fish_travis_using_command
 end
 
 # Commands
-complete -c travis -f -n '__fish_travis_needs_command' -a 'accounts' -d "Displays accounts and their subscription status"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'branches' -d "Displays the most recent build for each branch"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'cache' -d "Lists or deletes repository caches"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'cancel' -d "Cancels a job or build"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'console' -d "Interactive shell"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'disable' -d "Disables a project"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'enable' -d "Enables a project"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'encrypt' -d "Encrypts values for the .travis.yml"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'encrypt-file' -d "Encrypts a file and adds decryption steps to .travis.yml"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'endpoint' -d "Displays or changes the API endpoint"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'env' -d "Show or modify build environment variables"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'help' -d "Helps you out when in dire need of information"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'history' -d "Displays a projects build history"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'init' -d "Generates a .travis.yml and enables the project"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'lint' -d "Display warnings for a .travis.yml"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'login' -d "Authenticates against the API and stores the token"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'logout' -d "Deletes the stored API token"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'logs' -d "Streams test logs"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'monitor' -d "Live monitor for what's going on"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'open' -d "Opens a build or job in the browser"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'pubkey' -d "Prints out a repository's public key"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'raw' -d "Makes an (authenticated) API call and prints out the result"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'report' -d "Generates a report useful for filing issues"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'repos' -d "Lists repositories the user has certain permissions on"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'requests' -d "Lists recent requests"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'restart' -d "Restarts a build or job"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'settings' -d "Access repository settings"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'setup' -d "Sets up an addon or deploy target"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'show' -d "Displays a build or job"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'sshkey' -d "Checks, updates or deletes an SSH key"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'status' -d "Checks status of the latest build"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'sync' -d "Triggers a new sync with GitHub"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'token' -d "Outputs the secret API token"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'version' -d "Outputs the client version"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'whatsup' -d "Lists most recent builds"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'whoami' -d "Outputs the current user"
+complete -c travis -f -n __fish_travis_needs_command -a accounts -d "Displays accounts and their subscription status"
+complete -c travis -f -n __fish_travis_needs_command -a branches -d "Displays the most recent build for each branch"
+complete -c travis -f -n __fish_travis_needs_command -a cache -d "Lists or deletes repository caches"
+complete -c travis -f -n __fish_travis_needs_command -a cancel -d "Cancels a job or build"
+complete -c travis -f -n __fish_travis_needs_command -a console -d "Interactive shell"
+complete -c travis -f -n __fish_travis_needs_command -a disable -d "Disables a project"
+complete -c travis -f -n __fish_travis_needs_command -a enable -d "Enables a project"
+complete -c travis -f -n __fish_travis_needs_command -a encrypt -d "Encrypts values for the .travis.yml"
+complete -c travis -f -n __fish_travis_needs_command -a encrypt-file -d "Encrypts a file and adds decryption steps to .travis.yml"
+complete -c travis -f -n __fish_travis_needs_command -a endpoint -d "Displays or changes the API endpoint"
+complete -c travis -f -n __fish_travis_needs_command -a env -d "Show or modify build environment variables"
+complete -c travis -f -n __fish_travis_needs_command -a help -d "Helps you out when in dire need of information"
+complete -c travis -f -n __fish_travis_needs_command -a history -d "Displays a projects build history"
+complete -c travis -f -n __fish_travis_needs_command -a init -d "Generates a .travis.yml and enables the project"
+complete -c travis -f -n __fish_travis_needs_command -a lint -d "Display warnings for a .travis.yml"
+complete -c travis -f -n __fish_travis_needs_command -a login -d "Authenticates against the API and stores the token"
+complete -c travis -f -n __fish_travis_needs_command -a logout -d "Deletes the stored API token"
+complete -c travis -f -n __fish_travis_needs_command -a logs -d "Streams test logs"
+complete -c travis -f -n __fish_travis_needs_command -a monitor -d "Live monitor for what's going on"
+complete -c travis -f -n __fish_travis_needs_command -a open -d "Opens a build or job in the browser"
+complete -c travis -f -n __fish_travis_needs_command -a pubkey -d "Prints out a repository's public key"
+complete -c travis -f -n __fish_travis_needs_command -a raw -d "Makes an (authenticated) API call and prints out the result"
+complete -c travis -f -n __fish_travis_needs_command -a report -d "Generates a report useful for filing issues"
+complete -c travis -f -n __fish_travis_needs_command -a repos -d "Lists repositories the user has certain permissions on"
+complete -c travis -f -n __fish_travis_needs_command -a requests -d "Lists recent requests"
+complete -c travis -f -n __fish_travis_needs_command -a restart -d "Restarts a build or job"
+complete -c travis -f -n __fish_travis_needs_command -a settings -d "Access repository settings"
+complete -c travis -f -n __fish_travis_needs_command -a setup -d "Sets up an addon or deploy target"
+complete -c travis -f -n __fish_travis_needs_command -a show -d "Displays a build or job"
+complete -c travis -f -n __fish_travis_needs_command -a sshkey -d "Checks, updates or deletes an SSH key"
+complete -c travis -f -n __fish_travis_needs_command -a status -d "Checks status of the latest build"
+complete -c travis -f -n __fish_travis_needs_command -a sync -d "Triggers a new sync with GitHub"
+complete -c travis -f -n __fish_travis_needs_command -a token -d "Outputs the secret API token"
+complete -c travis -f -n __fish_travis_needs_command -a version -d "Outputs the client version"
+complete -c travis -f -n __fish_travis_needs_command -a whatsup -d "Lists most recent builds"
+complete -c travis -f -n __fish_travis_needs_command -a whoami -d "Outputs the current user"
 
 # General Options
 complete -c travis -f -s h -l help -d "Display help"
diff --git a/share/completions/tshark.fish b/share/completions/tshark.fish
index daa05dc38..e22567d3b 100644
--- a/share/completions/tshark.fish
+++ b/share/completions/tshark.fish
@@ -48,7 +48,7 @@ text\t"Default"'
 complete -c tshark -s U -d "PDUs export according to given tap name" -xa '(
     printf "%s\tTap name\n" (command tshark -U "" 2>| string replace -rf "^tshark:\s*" "")[2..-1])'
 complete -c tshark -s V -d 'Causes TShark to print a view of packet details'
-complete -c tshark -s W -d 'Save extra information in the capture file if the format supports it' -xa "n"
+complete -c tshark -s W -d 'Save extra information in the capture file if the format supports it' -xa n
 complete -c tshark -s x -d 'Print hex and ASCII dumps of packet data'
 complete -c tshark -s M -d 'Automatically reset internal session when reaching N packets' -x
 complete -c tshark -l color -d 'Enable coloring of packets according to standard Wireshark color filters'
diff --git a/share/completions/ttx.fish b/share/completions/ttx.fish
index 959c51e70..4a0c2e86e 100644
--- a/share/completions/ttx.fish
+++ b/share/completions/ttx.fish
@@ -9,34 +9,34 @@ set -l line_endings LF CR CRLF
 set -l woff_fmts woff woff2
 
 complete -f -c ttx -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx; __fish_complete_suffix .ttc)'
-complete -c ttx -f -n '__fish_is_first_token' -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx)'
+complete -c ttx -f -n __fish_is_first_token -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx)'
 
 # General options
-complete -c ttx -f -s 'h' -d'Show help message'
-complete -c ttx -f -l 'version' -d'Show version info'
-complete -c ttx -x -s 'd' -d'Set output folder' -a '(__fish_complete_directories)'
-complete -c ttx -r -s 'o' -d'Set output filename' -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx)'
-complete -c ttx -f -s 'f' -d'Force output overwrite'
-complete -c ttx -f -s 'v' -d'Verbose output'
-complete -c ttx -f -s 'q' -d'Quiet mode'
-complete -c ttx -f -s 'a' -d'Allow virtual glyph IDs'
+complete -c ttx -f -s h -d'Show help message'
+complete -c ttx -f -l version -d'Show version info'
+complete -c ttx -x -s d -d'Set output folder' -a '(__fish_complete_directories)'
+complete -c ttx -r -s o -d'Set output filename' -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx)'
+complete -c ttx -f -s f -d'Force output overwrite'
+complete -c ttx -f -s v -d'Verbose output'
+complete -c ttx -f -s q -d'Quiet mode'
+complete -c ttx -f -s a -d'Allow virtual glyph IDs'
 
 # Dump options
-complete -c ttx -f -s 'l' -d'List table info'
-complete -c ttx -x -s 't' -d'Dump named table' -a "$table_names"
-complete -c ttx -x -s 'x' -d'Exclude named table' -a "$table_names"
-complete -c ttx -f -s 's' -d'Split tables'
-complete -c ttx -f -s 'g' -d'Split glyf tables'
-complete -c ttx -f -s 'i' -d'Do NOT disassemble TT instructions'
-complete -c ttx -x -s 'z' -d'Use FORMAT for EBDT or CBDT' -a "$formats"
-complete -c ttx -f -s 'e' -d'Don\'t ignore decompilation errors'
-complete -c ttx -x -s 'y' -d'Select font index for TrueType Collection'
-complete -c ttx -x -l 'unicodedata' -d'Custom database for character names [UnicodeData.txt]' -a '(__fish_complete_suffix .txt)'
-complete -c ttx -x -l 'newline' -d'Set EOL format' -a "$line_endings"
+complete -c ttx -f -s l -d'List table info'
+complete -c ttx -x -s t -d'Dump named table' -a "$table_names"
+complete -c ttx -x -s x -d'Exclude named table' -a "$table_names"
+complete -c ttx -f -s s -d'Split tables'
+complete -c ttx -f -s g -d'Split glyf tables'
+complete -c ttx -f -s i -d'Do NOT disassemble TT instructions'
+complete -c ttx -x -s z -d'Use FORMAT for EBDT or CBDT' -a "$formats"
+complete -c ttx -f -s e -d'Don\'t ignore decompilation errors'
+complete -c ttx -x -s y -d'Select font index for TrueType Collection'
+complete -c ttx -x -l unicodedata -d'Custom database for character names [UnicodeData.txt]' -a '(__fish_complete_suffix .txt)'
+complete -c ttx -x -l newline -d'Set EOL format' -a "$line_endings"
 
 # Compile options
-complete -c ttx -x -s 'm' -d'Merge named TTF/OTF with SINGLE .ttx input' -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf)'
-complete -c ttx -f -s 'b' -d'Don\'t recalculate glyph bounding boxes'
-complete -c ttx -f -l 'recalc-timestamp' -d'Set font modified timestamp to current time'
-complete -c ttx -x -l 'flavor' -d'Set WOFF flavor' -a "$woff_fmts"
-complete -c ttx -f -l 'with-zopfli' -d'Compress with zopfli instead of zlib'
+complete -c ttx -x -s m -d'Merge named TTF/OTF with SINGLE .ttx input' -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf)'
+complete -c ttx -f -s b -d'Don\'t recalculate glyph bounding boxes'
+complete -c ttx -f -l recalc-timestamp -d'Set font modified timestamp to current time'
+complete -c ttx -x -l flavor -d'Set WOFF flavor' -a "$woff_fmts"
+complete -c ttx -f -l with-zopfli -d'Compress with zopfli instead of zlib'
diff --git a/share/completions/type.fish b/share/completions/type.fish
index e58ba1de2..9c42dd603 100644
--- a/share/completions/type.fish
+++ b/share/completions/type.fish
@@ -7,7 +7,7 @@ complete -c type -s p -l path -d "Print path to command, or nothing if name is n
 complete -c type -s P -l force-path -d "Print path to command"
 complete -c type -s q -l quiet -d "Suppress output"
 
-complete -c type -a "(builtin -n)" -d "Builtin"
-complete -c type -a "(functions -n)" -d "Function"
+complete -c type -a "(builtin -n)" -d Builtin
+complete -c type -a "(functions -n)" -d Function
 
 complete -c type -a "(__fish_complete_command)" -x
diff --git a/share/completions/unrar.fish b/share/completions/unrar.fish
index aeabcd8ca..da1e65257 100644
--- a/share/completions/unrar.fish
+++ b/share/completions/unrar.fish
@@ -18,14 +18,14 @@ end
 
 complete -c unrar -a "(__fish_complete_unrar)"
 
-complete -x -c unrar -n '__fish_use_subcommand' -a e -d "Extract files to current directory"
-complete -x -c unrar -n '__fish_use_subcommand' -a l -d "List archive"
-complete -x -c unrar -n '__fish_use_subcommand' -a lt -d "List archive (technical)"
-complete -x -c unrar -n '__fish_use_subcommand' -a lb -d "List archive (bare)"
-complete -x -c unrar -n '__fish_use_subcommand' -a p -d "Print file to stdout"
-complete -x -c unrar -n '__fish_use_subcommand' -a t -d "Test archive files"
-complete -x -c unrar -n '__fish_use_subcommand' -a v -d "Verbosely list archive"
-complete -x -c unrar -n '__fish_use_subcommand' -a vt -d "Verbosely list archive (technical)"
-complete -x -c unrar -n '__fish_use_subcommand' -a vb -d "Verbosely list archive (bare)"
-complete -x -c unrar -n '__fish_use_subcommand' -a x -d "Extract files with full path"
+complete -x -c unrar -n __fish_use_subcommand -a e -d "Extract files to current directory"
+complete -x -c unrar -n __fish_use_subcommand -a l -d "List archive"
+complete -x -c unrar -n __fish_use_subcommand -a lt -d "List archive (technical)"
+complete -x -c unrar -n __fish_use_subcommand -a lb -d "List archive (bare)"
+complete -x -c unrar -n __fish_use_subcommand -a p -d "Print file to stdout"
+complete -x -c unrar -n __fish_use_subcommand -a t -d "Test archive files"
+complete -x -c unrar -n __fish_use_subcommand -a v -d "Verbosely list archive"
+complete -x -c unrar -n __fish_use_subcommand -a vt -d "Verbosely list archive (technical)"
+complete -x -c unrar -n __fish_use_subcommand -a vb -d "Verbosely list archive (bare)"
+complete -x -c unrar -n __fish_use_subcommand -a x -d "Extract files with full path"
 
diff --git a/share/completions/unzip.fish b/share/completions/unzip.fish
index 6fed9b7a6..30d6f3a26 100644
--- a/share/completions/unzip.fish
+++ b/share/completions/unzip.fish
@@ -28,7 +28,7 @@ complete -c unzip -s M -d "pipe through `more` pager"
 if unzip -v 2>/dev/null | string match -eq Debian
 
     # the first non-switch argument should be the zipfile
-    complete -c unzip -n '__fish_is_first_token' -xa '(__fish_complete_suffix .zip)'
+    complete -c unzip -n __fish_is_first_token -xa '(__fish_complete_suffix .zip)'
 
     # Files thereafter are either files to include or exclude from the operation
     set -l zipfile
diff --git a/share/completions/vagrant.fish b/share/completions/vagrant.fish
index fed81c29b..8dace3373 100644
--- a/share/completions/vagrant.fish
+++ b/share/completions/vagrant.fish
@@ -19,7 +19,7 @@ function __fish_print_vagrant_state
     # Find a .vagrant file/directory above $PWD
     set -l root
     set -l dir (pwd -P)
-    while test $dir != "/"
+    while test $dir != /
         if test -d $dir.vagrant -o -f $dir.vagrant
             echo $dir.vagrant
             return 0
@@ -81,7 +81,7 @@ end
 
 function __fish_vagrant_box_need_command
     set -l cmd (__fish_vagrant_need_command)
-    test "$cmd[1]" = "box" 2>/dev/null
+    test "$cmd[1]" = box 2>/dev/null
     or return 1
     set -e cmd[1]
 
@@ -106,7 +106,7 @@ end
 
 function __fish_vagrant_cloud_need_command
     set -l cmd (__fish_vagrant_need_command)
-    test "$cmd[1]" = "cloud" 2>/dev/null
+    test "$cmd[1]" = cloud 2>/dev/null
     or return 1
     set -e cmd[1]
 
@@ -126,37 +126,37 @@ function __fish_vagrant_cloud_using_command
     and contains -- $cmd[1] $argv
 end
 
-complete -c vagrant -n "__fish_vagrant_need_command" -fa box -d 'Manage boxes: installation, removal, etc.'
+complete -c vagrant -n __fish_vagrant_need_command -fa box -d 'Manage boxes: installation, removal, etc.'
 complete -c vagrant -n "__fish_vagrant_using_command box; and __fish_vagrant_box_need_command" -fa "$box_commands"
-complete -c vagrant -n "__fish_vagrant_need_command" -fa cloud -d 'Manage Vagrant Cloud'
+complete -c vagrant -n __fish_vagrant_need_command -fa cloud -d 'Manage Vagrant Cloud'
 complete -c vagrant -n "__fish_vagrant_using_command cloud; and __fish_vagrant_cloud_need_command" -fa "$cloud_commands"
-complete -c vagrant -n "__fish_vagrant_need_command" -fa connect
-complete -c vagrant -n "__fish_vagrant_need_command" -fa destroy -d 'Stop and delete all traces of the vagrant machine'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa docker-exec
-complete -c vagrant -n "__fish_vagrant_need_command" -fa docker-logs
-complete -c vagrant -n "__fish_vagrant_need_command" -fa docker-run
-complete -c vagrant -n "__fish_vagrant_need_command" -fa global-status -d 'Show status Vagrant environments for this user'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa halt -d 'Stop a machine'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa help -d 'Show help for a subcommand'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa init -d 'Initialize a new Vagrant env by creating a Vagrantfile'
+complete -c vagrant -n __fish_vagrant_need_command -fa connect
+complete -c vagrant -n __fish_vagrant_need_command -fa destroy -d 'Stop and delete all traces of the vagrant machine'
+complete -c vagrant -n __fish_vagrant_need_command -fa docker-exec
+complete -c vagrant -n __fish_vagrant_need_command -fa docker-logs
+complete -c vagrant -n __fish_vagrant_need_command -fa docker-run
+complete -c vagrant -n __fish_vagrant_need_command -fa global-status -d 'Show status Vagrant environments for this user'
+complete -c vagrant -n __fish_vagrant_need_command -fa halt -d 'Stop a machine'
+complete -c vagrant -n __fish_vagrant_need_command -fa help -d 'Show help for a subcommand'
+complete -c vagrant -n __fish_vagrant_need_command -fa init -d 'Initialize a new Vagrant env by creating a Vagrantfile'
 complete -c vagrant -n "__fish_vagrant_using_command init" -fa '(__fish_vagrant_boxes)'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa list-commands
-complete -c vagrant -n "__fish_vagrant_need_command" -fa login
-complete -c vagrant -n "__fish_vagrant_need_command" -fa package -d 'Package a running vagrant environment into a box'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa plugin -d 'Manages plugins: install, uninstall, update, etc.'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa provision
-complete -c vagrant -n "__fish_vagrant_need_command" -fa push
-complete -c vagrant -n "__fish_vagrant_need_command" -fa rdp
-complete -c vagrant -n "__fish_vagrant_need_command" -fa reload
-complete -c vagrant -n "__fish_vagrant_need_command" -fa resume
-complete -c vagrant -n "__fish_vagrant_need_command" -fa rsync
-complete -c vagrant -n "__fish_vagrant_need_command" -fa rsync-auto
-complete -c vagrant -n "__fish_vagrant_need_command" -fa share
-complete -c vagrant -n "__fish_vagrant_need_command" -fa snapshot
-complete -c vagrant -n "__fish_vagrant_need_command" -fa ssh -d 'Connect to a machine via SSH'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa ssh-config -d 'Print ssh config to connect to machine'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa status -d 'Print status of a machine'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa suspend -d 'Suspend a machine'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa up -d 'Start and provision the environment'
+complete -c vagrant -n __fish_vagrant_need_command -fa list-commands
+complete -c vagrant -n __fish_vagrant_need_command -fa login
+complete -c vagrant -n __fish_vagrant_need_command -fa package -d 'Package a running vagrant environment into a box'
+complete -c vagrant -n __fish_vagrant_need_command -fa plugin -d 'Manages plugins: install, uninstall, update, etc.'
+complete -c vagrant -n __fish_vagrant_need_command -fa provision
+complete -c vagrant -n __fish_vagrant_need_command -fa push
+complete -c vagrant -n __fish_vagrant_need_command -fa rdp
+complete -c vagrant -n __fish_vagrant_need_command -fa reload
+complete -c vagrant -n __fish_vagrant_need_command -fa resume
+complete -c vagrant -n __fish_vagrant_need_command -fa rsync
+complete -c vagrant -n __fish_vagrant_need_command -fa rsync-auto
+complete -c vagrant -n __fish_vagrant_need_command -fa share
+complete -c vagrant -n __fish_vagrant_need_command -fa snapshot
+complete -c vagrant -n __fish_vagrant_need_command -fa ssh -d 'Connect to a machine via SSH'
+complete -c vagrant -n __fish_vagrant_need_command -fa ssh-config -d 'Print ssh config to connect to machine'
+complete -c vagrant -n __fish_vagrant_need_command -fa status -d 'Print status of a machine'
+complete -c vagrant -n __fish_vagrant_need_command -fa suspend -d 'Suspend a machine'
+complete -c vagrant -n __fish_vagrant_need_command -fa up -d 'Start and provision the environment'
 complete -c vagrant -n "__fish_vagrant_using_command up" -fa '(__fish_vagrant_machines)'
-complete -c vagrant -n "__fish_vagrant_need_command" -fa version -d 'Print current and latest version'
+complete -c vagrant -n __fish_vagrant_need_command -fa version -d 'Print current and latest version'
diff --git a/share/completions/valgrind.fish b/share/completions/valgrind.fish
index a52ca3e54..67910c0e7 100644
--- a/share/completions/valgrind.fish
+++ b/share/completions/valgrind.fish
@@ -9,7 +9,7 @@ if type -q valgrind; and valgrind --version 2>/dev/null | string match -qr -- '-
     set skin skin
 end
 
-complete -xc valgrind -l $skin -d "Skin" -a "
+complete -xc valgrind -l $skin -d Skin -a "
 	memcheck\tHeavyweight\ memory\ checker
 	cachegrind\tCache-miss\ profiler
 	addrcheck\tLightweight\ memory\ checker
diff --git a/share/completions/vbc.fish b/share/completions/vbc.fish
index 4a2477199..7ca98939e 100644
--- a/share/completions/vbc.fish
+++ b/share/completions/vbc.fish
@@ -4,9 +4,9 @@
 # Compiler output
 complete -c vbc -o nologo -d "Suppresses compiler banner information"
 complete -c vbc -o utf8output -o "utf8output+" -d "Displays compiler output using UTF-8 encoding"
-complete -c vbc -o "utf8output-" -d "Disable -utf8output"
+complete -c vbc -o utf8output- -d "Disable -utf8output"
 complete -c vbc -o verbose -o "verbose+" -d "Outputs extra information during compilation"
-complete -c vbc -o "verbose-" -d "Disable -verbose"
+complete -c vbc -o verbose- -d "Disable -verbose"
 complete -c vbc -o "modulename:" -d "Specify the name of the source module"
 complete -c vbc -o "preferreduilang:" -d "Specify a language for compiler output"
 
@@ -16,11 +16,11 @@ for bytes in 512 1024 2048 4096 8192
 end
 
 complete -c vbc -o optimize -o "optimize+" -d "Enable optimizations"
-complete -c vbc -o "optimize-" -d "Disable optimizations"
+complete -c vbc -o optimize- -d "Disable optimizations"
 
 # Output files
 complete -c vbc -o doc -o "doc:" -o "doc+" -d "Process documentation comments to an XML file"
-complete -c vbc -o "doc-" -d "Disable -doc"
+complete -c vbc -o doc- -d "Disable -doc"
 complete -c vbc -o deterministic -d "Causes the compiler to output an assembly whose binary content is identical across compilations if inputs are identical"
 complete -c vbc -o netcf -d "Sets the compiler to target the .NET Compact Framework"
 complete -c vbc -o "out:" -d "Specifies an output file"
@@ -36,7 +36,7 @@ complete -c vbc -o "t:winmdobj" -o "target:winmdobj" -d "Causes the compiler to
 # .NET assemblies
 complete -c vbc -o "addmodule:" -d "Causes the compiler to make all type information from the specified file(s) available to the project you are currently compiling"
 complete -c vbc -o delaysign -o "delaysign+" -d "Specifies whether the assembly will be fully or partially signed"
-complete -c vbc -o "delaysign-" -d "Disable -delaysign"
+complete -c vbc -o delaysign- -d "Disable -delaysign"
 complete -c vbc -o "imports:" -d "Imports a namespace from a specified assembly"
 complete -c vbc -o "keycontainer:" -d "Specifies a key container name for a key pair to give an assembly a strong name"
 complete -c vbc -o "keyfile:" -d "Specifies a file containing a key or key pair to give an assembly a strong name"
@@ -53,14 +53,14 @@ complete -c vbc -o debug -o "debug+" -d "Produces debugging information"
 for arguments in full pdbonly
     complete -c vbc -o "debug:$arguments" -d "Produces debugging information"
 end
-complete -c vbc -o "debug-" -d "Disable -debug"
+complete -c vbc -o debug- -d "Disable -debug"
 
 complete -c vbc -o nowarn -o "nowarn:" -d "Suppresses the compiler's ability to generate warnings"
 complete -c vbc -o quiet -d "Prevents the compiler from displaying code for syntax-related errors and warnings"
 complete -c vbc -o removeintchecks -o "removeintchecks+" -d "Disables integer overflow checking"
-complete -c vbc -o "removeintchecks-" -d "Disable -removeintchecks"
+complete -c vbc -o removeintchecks- -d "Disable -removeintchecks"
 complete -c vbc -o warnaserror -o "warnaserror:" -o "warnaserror+" -o "warnaserror+:" -d "Promotes warnings to errors"
-complete -c vbc -o "warnaserror-" -o "warnaserror-:" -d "Disable -warnaserror"
+complete -c vbc -o warnaserror- -o "warnaserror-:" -d "Disable -warnaserror"
 complete -c vbc -o "ruleset:" -d "Specify a ruleset file that disables specific diagnostics"
 
 # Help
@@ -84,16 +84,16 @@ for version_number in (seq 9 15)
 end
 
 complete -c vbc -o optionexplicit -o "optionexplicit+" -d "Enforces explicit declaration of variables"
-complete -c vbc -o "optionexplicit-" -d "Disable -optionexplicit"
+complete -c vbc -o optionexplicit- -d "Disable -optionexplicit"
 complete -c vbc -o optionstrict -o "optionstrict+" -o "optionstrict:" -d "Enforces strict type semantics"
-complete -c vbc -o "optionstrict-" -d "Disable -optionstrict"
+complete -c vbc -o optionstrict- -d "Disable -optionstrict"
 
 for arguments in binary text
     complete -c vbc -o "optioncompare:$arguments" -d "Specifies whether string comparisons should be binary or use locale-specific text semantics"
 end
 
 complete -c vbc -o optioninfer -o "optioninfer+" -d "Enables the use of local type inference in variable declarations"
-complete -c vbc -o "optioninfer-" -d "Disable -optioninfer"
+complete -c vbc -o optioninfer- -d "Disable -optioninfer"
 
 # Preprocessor
 complete -c vbc -o "d:" -o "define:" -d "Defines symbols for conditional compilation"
@@ -113,7 +113,7 @@ for arguments in prompt queue send none
 end
 
 complete -c vbc -o highentropyva -o "highentropyva+" -d "Tells the Windows kernel whether a particular executable supports high entropy Address Space Layout Randomization (ASLR)"
-complete -c vbc -o "highentropyva-" -d "Disable -highentropyva"
+complete -c vbc -o highentropyva- -d "Disable -highentropyva"
 complete -c vbc -o "m:" -o "main:" -d "Specifies the class that contains the Sub Main procedure to use at startup"
 complete -c vbc -o noconfig -d "Do not compile with Vbc.rsp"
 complete -c vbc -o nostdlib -d "Causes the compiler not to reference the standard libraries"
@@ -135,6 +135,6 @@ end
 
 complete -c vbc -o "win32manifest:" -d "Identifies a user-defined Win32 application manifest file to be embedded into a project's portable executable (PE) file"
 complete -c vbc -o parallel -o "parallel+" -d "Specifies whether to use concurrent build"
-complete -c vbc -o "parallel-" -d "Disable -parallel"
+complete -c vbc -o parallel- -d "Disable -parallel"
 complete -c vbc -o "checksumalgorithm:SHA1" -d "Specify SHA1 as the algorithm for calculating the source file checksum stored in PDB (default)"
 complete -c vbc -o "checksumalgorithm:SHA256" -d "Specify SHA256 as the algorithm for calculating the source file checksum stored in PDB"
diff --git a/share/completions/vim-addons.fish b/share/completions/vim-addons.fish
index 8cce2f737..254b5d2ca 100644
--- a/share/completions/vim-addons.fish
+++ b/share/completions/vim-addons.fish
@@ -17,27 +17,27 @@ end
 # Commands
 # --------
 # list
-complete -c vim-addons -n "__fish_vim-addons_subcommand" -a "list" -f -d "list the names of the addons available in the system"
+complete -c vim-addons -n __fish_vim-addons_subcommand -a list -f -d "list the names of the addons available in the system"
 # status
-complete -c vim-addons -n "__fish_vim-addons_subcommand" -a "status" -f -d "show the status of the addons available in the system"
+complete -c vim-addons -n __fish_vim-addons_subcommand -a status -f -d "show the status of the addons available in the system"
 complete -c vim-addons -n "contains status (commandline -poc)" -a "(vim-addons list)" -x
 # install
-complete -c vim-addons -n "__fish_vim-addons_subcommand" -a "install" -x -d "install one or more addons under ~/.vim"
+complete -c vim-addons -n __fish_vim-addons_subcommand -a install -x -d "install one or more addons under ~/.vim"
 complete -c vim-addons -n "contains install (commandline -poc)" -a "(vim-addons status | awk '\$2 != \"installed\" && \$1 != \"#\" { print \$1}')" -x
 # remove
-complete -c vim-addons -n "__fish_vim-addons_subcommand" -a "remove" -x -d "remove one or more addons from ~/.vim"
+complete -c vim-addons -n __fish_vim-addons_subcommand -a remove -x -d "remove one or more addons from ~/.vim"
 complete -c vim-addons -n "contains remove (commandline -poc)" -a "(vim-addons status | awk '\$2 != \"removed\" && \$1 != \"#\" { print \$1}')" -x
 # disable
-complete -c vim-addons -n "__fish_vim-addons_subcommand" -a "disable" -x -d "disable  one  or more addons to be used by the current user"
+complete -c vim-addons -n __fish_vim-addons_subcommand -a disable -x -d "disable  one  or more addons to be used by the current user"
 complete -c vim-addons -n "contains disable (commandline -poc)" -a "(vim-addons status | awk '\$2 != \"disable\" && \$1 != \"#\" { print \$1}')" -x
 # amend
-complete -c vim-addons -n "__fish_vim-addons_subcommand" -a "amend" -x -d "undo the effects of a previous disable command"
+complete -c vim-addons -n __fish_vim-addons_subcommand -a amend -x -d "undo the effects of a previous disable command"
 complete -c vim-addons -n "contains amend (commandline -poc)" -a "(vim-addons list)" -x
 # files
-complete -c vim-addons -n "__fish_vim-addons_subcommand" -a "files" -x -d "list, one per line, the files composing the specified addons"
+complete -c vim-addons -n __fish_vim-addons_subcommand -a files -x -d "list, one per line, the files composing the specified addons"
 complete -c vim-addons -n "contains files (commandline -poc)" -a "(vim-addons list)" -x
 # show
-complete -c vim-addons -n "__fish_vim-addons_subcommand" -a "show" -x -d "displays detailed information about the specified addons"
+complete -c vim-addons -n __fish_vim-addons_subcommand -a show -x -d "displays detailed information about the specified addons"
 complete -c vim-addons -n "contains show (commandline -poc)" -a "(vim-addons list)" -x
 
 
diff --git a/share/completions/virsh.fish b/share/completions/virsh.fish
index c6c0f2f4a..c0ce95162 100644
--- a/share/completions/virsh.fish
+++ b/share/completions/virsh.fish
@@ -883,7 +883,7 @@ complete -c virsh -n "__fish_seen_subcommand_from allocpages" -l add -d "Instead
 complete -c virsh -n "__fish_seen_subcommand_from allocpages" -l all -d "Set on all NUMA cells"
 
 # virsh capabilities
-complete -c virsh -n "not __fish_seen_subcommand_from $cmds" -a capabilities -d "Capabilities"
+complete -c virsh -n "not __fish_seen_subcommand_from $cmds" -a capabilities -d Capabilities
 
 # virsh cpu-models
 complete -c virsh -n "not __fish_seen_subcommand_from $cmds" -a cpu-models -d "CPU models"
diff --git a/share/completions/w.fish b/share/completions/w.fish
index 54abe5d12..5f877c534 100644
--- a/share/completions/w.fish
+++ b/share/completions/w.fish
@@ -3,4 +3,4 @@ complete -c w -s u -d "Ignore username for time calculations"
 complete -c w -s s -d "Short format"
 complete -c w -s f -d "Toggle printing of remote hostname"
 complete -c w -s V -d "Display version and exit"
-complete -c w -x -a "(__fish_complete_users)" -d "Username"
+complete -c w -x -a "(__fish_complete_users)" -d Username
diff --git a/share/completions/wajig.fish b/share/completions/wajig.fish
index a7865de8e..0fc8e4087 100644
--- a/share/completions/wajig.fish
+++ b/share/completions/wajig.fish
@@ -16,124 +16,124 @@ function __fish_wajig_use_package -d 'Test if wajig command should have packages
     return 1
 end
 
-complete -c wajig -n '__fish_wajig_use_package' -a '(__fish_print_packages)' -d 'Package'h
+complete -c wajig -n __fish_wajig_use_package -a '(__fish_print_packages)' -d Packageh
 complete -c wajig -s q -l quiet -d 'Do system commands everything quietly.'
 complete -c wajig -s n -l noauth -d 'Allow packages from unathenticated archives.'
 complete -c wajig -s s -l simulate -d 'Trace but don\'t execute the sequence of underlying commands.'
 complete -c wajig -s t -l teaching -d 'Trace the sequence of commands performed.'
 complete -c wajig -s y -l yes -d 'Assume yes for any questions asked.'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'addcdrom' -d 'Add a CD-ROM to the list of available sources of packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-alts' -d 'Mark the alternative to be auto set (using set priorities)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-clean' -d 'Remove superseded deb files from the download cache'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-download' -d 'Do an update followed by a download of all updated packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-install' -d 'Perform an install without asking questions (non-interactive)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'available' -d 'List versions of packages available for installation'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'bug' -d 'Check reported bugs in package using the Debian Bug Tracker'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'build' -d 'Retrieve/unpack sources and build .deb for the named packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'build-depend' -d 'Retrieve packages required to build listed packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'changelog' -d 'Retrieve latest changelog for the package'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'clean' -d 'Remove all deb files from the download cache'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'commands' -d 'List all the JIG commands and one line descriptions for each'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'daily-upgrade' -d 'Perform an update then a dist-upgrade'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'dependents' -d 'List of packages which depend/recommend/suggest the package'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'describe' -d 'One line description of packages (-v and -vv for more detail)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'describe-new' -d 'One line description of new packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'detail' -d 'Provide a detailed description of package (describe -vv)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'detail-new' -d 'Provide a detailed description of new packages (describe -vv)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'dist-upgrade' -d 'Upgrade to new distribution (installed and new rqd packages)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'docs' -d 'Equivalent to help with -verbose=2'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'download' -d 'Download package files ready for an install'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'file-download' -d 'Download packages listed in file ready for an install'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'file-install' -d 'Install packages listed in a file'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'file-remove' -d 'Remove packages listed in a file'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'find-file' -d 'Search for a file within installed packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'find-pkg' -d 'Search for an unofficial Debian package at apt-get.org'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'fix-configure' -d 'Perform dpkg --configure -a (to fix interrupted configure)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'fix-install' -d 'Perform apt-get -f install (to fix broken dependencies)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'fix-missing' -d 'Perform apt-get --fix-missing upgrade'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'force' -d 'Install packages and ignore file overwrites and depends'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'help' -d 'Print documentation (detail depends on --verbose)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'hold' -d 'Place listed packages on hold so they are not upgraded'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'init' -d 'Initialise or reset the JIG archive files'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'install' -d 'Install (or upgrade) one or more packages or .deb files'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'installr' -d 'Install package and associated recommended packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'installrs' -d 'Install package and recommended and suggested packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'installs' -d 'Install package and associated suggested packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'integrity' -d 'Check the integrity of installed packages (through checksums)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'large' -d 'List size of all large (>10MB) installed packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'last-update' -d 'Identify when an update was last performed'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list' -d 'List the status and description of installed packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-all' -d 'List a one line description of given or all packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-alts' -d 'List the objects that can have alternatives configured'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-cache' -d 'List the contents of the download cache'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-commands' -d 'List all the JIG commands and one line descriptions for each'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-daemons' -d 'List the daemons that JIG can start/stop/restart'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-files' -d 'List the files that are supplied by the named package'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-hold' -d 'List those packages on hold'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-installed' -d 'List packages (with optional argument substring) installed'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-log' -d 'List the contents of the install/remove log file (filtered)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-names' -d 'List all known packages or those containing supplied string'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-orphans' -d 'List libraries not required by any installed package'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-scripts' -d 'List the control scripts of the package of deb file'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-section' -d 'List packages that belong to a specific section'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-section' -d 'List the sections that are available'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-status' -d 'Same as list but only prints first two columns, not truncated'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-wide' -d 'Same as list but avoids truncating package names'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'local-dist-upgrade' -d 'Dist-upgrade using packages already downloaded'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'local-upgrade' -d 'Upgrade using packages already downloaded, but not any others'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'madison' -d 'Runs the madison command of apt-cache.'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'move' -d 'Move packages in the download cache to a local Debian mirror'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'new' -d 'List packages that became available since last update'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'news' -d 'Obtain the latest news about the package'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'new-upgrades' -d 'List packages newly available for upgrading'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'non-free' -d 'List installed packages that do not meet the DFSG'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'orphans' -d 'List libraries not required by any installed package'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'package' -d 'Generate a .deb file for an installed package'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'policy' -d 'From preferences file show priorities/policy (available)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'purge' -d 'Remove one or more packages and configuration files'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'purge-depend' -d 'Purge package and those it depend on and not required by others'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'purge-orphans' -d 'Purge orphaned libraries (not required by installed packages)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'readme' -d 'Display the package\'s README file from /usr/share/doc'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'recursive' -d 'Download package and any packages it depends on'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'recommended' -d 'Install package and associated recommended packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reconfigure' -d 'Reconfigure the named installed packages or run gkdebconf'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reinstall' -d 'Reinstall each of the named packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reload' -d 'Reload daemon configs, e.g., gdm, apache (see list-daemons)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'remove' -d 'Remove one or more packages (see also purge)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'remove-depend' -d 'Remove package and its dependees not required by others'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'remove-orphans' -d 'Remove orphaned libraries (not required by installed packages)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'repackage' -d 'Generate a .deb file for an installed package'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reset' -d 'Initialise or reset the JIG archive files'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'restart' -d 'Stop then start a daemon, e.g., gdm, apache (see list-daemons)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'rpminstall' -d 'Install a RedHat .rpm package'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'rpmtodeb' -d 'Convert a RedHat .rpm file to a Debian .deb file'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'search' -d 'Search for packages containing listed words'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'search-apt' -d 'Find local Debian archives suitable for sources.list'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'setup' -d 'Configure the sources.list file which locates Debian archives'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'show' -d 'Provide a detailed description of package [same as detail]'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showdistupgrade' -d 'Trace the steps that a dist-upgrade would perform'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showinstall' -d 'Trace the steps that an install would perform'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showremove' -d 'Trace the steps that a remove would perform'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showupgrade' -d 'Trace the steps that an upgrade would perform'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'size' -d 'Print out the size (in K) of all, or listed, installed packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'sizes' -d 'Print out the size (in K) of all, or listed, installed packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'snapshot' -d 'Generates list of package=version for all installed packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'source' -d 'Retrieve and unpack sources for the named packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'start' -d 'Start a daemon, e.g., gdm, apache (see list-daemons)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'status' -d 'Show the version and available version of packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'status-match' -d 'Show the version and available version of matching packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'status-search' -d 'Show the version and available version of matching packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'stop' -d 'Stop a daemon, e.g., gdm, apache (see list-daemons)'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'suggested' -d 'Install package and associated suggested packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'tasksel' -d 'Run the Gnome task selector to install groups of packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'toupgrade' -d 'List packages with newer versions available for upgrading'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'unhold' -d 'Remove listed packages from hold so they are again upgraded'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'unofficial' -d 'Search for an unofficial Debian package at apt-get.org'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update' -d 'Update the list of down-loadable packages'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update-alts' -d 'Update default alternative for things like x-window-manager'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update-pci-ids' -d 'Updates the local list of PCI ids from the internet master list'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update-usb-ids' -d 'Updates the local list of USB ids from the internet master list'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'upgrade' -d 'Upgrade all of the installed packages or just those listed'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'versions' -d 'List version and distribution of (all) packages.'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'whatis' -d 'A synonym for describe'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'whichpkg' -d 'Find the package that supplies the given command or file'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a addcdrom -d 'Add a CD-ROM to the list of available sources of packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a auto-alts -d 'Mark the alternative to be auto set (using set priorities)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a auto-clean -d 'Remove superseded deb files from the download cache'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a auto-download -d 'Do an update followed by a download of all updated packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a auto-install -d 'Perform an install without asking questions (non-interactive)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a available -d 'List versions of packages available for installation'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a bug -d 'Check reported bugs in package using the Debian Bug Tracker'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a build -d 'Retrieve/unpack sources and build .deb for the named packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a build-depend -d 'Retrieve packages required to build listed packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a changelog -d 'Retrieve latest changelog for the package'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a clean -d 'Remove all deb files from the download cache'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a commands -d 'List all the JIG commands and one line descriptions for each'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a daily-upgrade -d 'Perform an update then a dist-upgrade'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a dependents -d 'List of packages which depend/recommend/suggest the package'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a describe -d 'One line description of packages (-v and -vv for more detail)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a describe-new -d 'One line description of new packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a detail -d 'Provide a detailed description of package (describe -vv)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a detail-new -d 'Provide a detailed description of new packages (describe -vv)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a dist-upgrade -d 'Upgrade to new distribution (installed and new rqd packages)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a docs -d 'Equivalent to help with -verbose=2'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a download -d 'Download package files ready for an install'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a file-download -d 'Download packages listed in file ready for an install'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a file-install -d 'Install packages listed in a file'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a file-remove -d 'Remove packages listed in a file'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a find-file -d 'Search for a file within installed packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a find-pkg -d 'Search for an unofficial Debian package at apt-get.org'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a fix-configure -d 'Perform dpkg --configure -a (to fix interrupted configure)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a fix-install -d 'Perform apt-get -f install (to fix broken dependencies)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a fix-missing -d 'Perform apt-get --fix-missing upgrade'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a force -d 'Install packages and ignore file overwrites and depends'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a help -d 'Print documentation (detail depends on --verbose)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a hold -d 'Place listed packages on hold so they are not upgraded'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a init -d 'Initialise or reset the JIG archive files'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a install -d 'Install (or upgrade) one or more packages or .deb files'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a installr -d 'Install package and associated recommended packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a installrs -d 'Install package and recommended and suggested packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a installs -d 'Install package and associated suggested packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a integrity -d 'Check the integrity of installed packages (through checksums)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a large -d 'List size of all large (>10MB) installed packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a last-update -d 'Identify when an update was last performed'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list -d 'List the status and description of installed packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-all -d 'List a one line description of given or all packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-alts -d 'List the objects that can have alternatives configured'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-cache -d 'List the contents of the download cache'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-commands -d 'List all the JIG commands and one line descriptions for each'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-daemons -d 'List the daemons that JIG can start/stop/restart'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-files -d 'List the files that are supplied by the named package'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-hold -d 'List those packages on hold'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-installed -d 'List packages (with optional argument substring) installed'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-log -d 'List the contents of the install/remove log file (filtered)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-names -d 'List all known packages or those containing supplied string'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-orphans -d 'List libraries not required by any installed package'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-scripts -d 'List the control scripts of the package of deb file'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-section -d 'List packages that belong to a specific section'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-section -d 'List the sections that are available'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-status -d 'Same as list but only prints first two columns, not truncated'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a list-wide -d 'Same as list but avoids truncating package names'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a local-dist-upgrade -d 'Dist-upgrade using packages already downloaded'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a local-upgrade -d 'Upgrade using packages already downloaded, but not any others'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a madison -d 'Runs the madison command of apt-cache.'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a move -d 'Move packages in the download cache to a local Debian mirror'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a new -d 'List packages that became available since last update'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a news -d 'Obtain the latest news about the package'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a new-upgrades -d 'List packages newly available for upgrading'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a non-free -d 'List installed packages that do not meet the DFSG'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a orphans -d 'List libraries not required by any installed package'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a package -d 'Generate a .deb file for an installed package'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a policy -d 'From preferences file show priorities/policy (available)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a purge -d 'Remove one or more packages and configuration files'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a purge-depend -d 'Purge package and those it depend on and not required by others'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a purge-orphans -d 'Purge orphaned libraries (not required by installed packages)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a readme -d 'Display the package\'s README file from /usr/share/doc'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a recursive -d 'Download package and any packages it depends on'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a recommended -d 'Install package and associated recommended packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a reconfigure -d 'Reconfigure the named installed packages or run gkdebconf'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a reinstall -d 'Reinstall each of the named packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a reload -d 'Reload daemon configs, e.g., gdm, apache (see list-daemons)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a remove -d 'Remove one or more packages (see also purge)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a remove-depend -d 'Remove package and its dependees not required by others'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a remove-orphans -d 'Remove orphaned libraries (not required by installed packages)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a repackage -d 'Generate a .deb file for an installed package'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a reset -d 'Initialise or reset the JIG archive files'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a restart -d 'Stop then start a daemon, e.g., gdm, apache (see list-daemons)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a rpminstall -d 'Install a RedHat .rpm package'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a rpmtodeb -d 'Convert a RedHat .rpm file to a Debian .deb file'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a search -d 'Search for packages containing listed words'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a search-apt -d 'Find local Debian archives suitable for sources.list'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a setup -d 'Configure the sources.list file which locates Debian archives'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a show -d 'Provide a detailed description of package [same as detail]'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a showdistupgrade -d 'Trace the steps that a dist-upgrade would perform'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a showinstall -d 'Trace the steps that an install would perform'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a showremove -d 'Trace the steps that a remove would perform'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a showupgrade -d 'Trace the steps that an upgrade would perform'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a size -d 'Print out the size (in K) of all, or listed, installed packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a sizes -d 'Print out the size (in K) of all, or listed, installed packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a snapshot -d 'Generates list of package=version for all installed packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a source -d 'Retrieve and unpack sources for the named packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a start -d 'Start a daemon, e.g., gdm, apache (see list-daemons)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a status -d 'Show the version and available version of packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a status-match -d 'Show the version and available version of matching packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a status-search -d 'Show the version and available version of matching packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a stop -d 'Stop a daemon, e.g., gdm, apache (see list-daemons)'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a suggested -d 'Install package and associated suggested packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a tasksel -d 'Run the Gnome task selector to install groups of packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a toupgrade -d 'List packages with newer versions available for upgrading'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a unhold -d 'Remove listed packages from hold so they are again upgraded'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a unofficial -d 'Search for an unofficial Debian package at apt-get.org'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a update -d 'Update the list of down-loadable packages'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a update-alts -d 'Update default alternative for things like x-window-manager'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a update-pci-ids -d 'Updates the local list of PCI ids from the internet master list'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a update-usb-ids -d 'Updates the local list of USB ids from the internet master list'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a upgrade -d 'Upgrade all of the installed packages or just those listed'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a versions -d 'List version and distribution of (all) packages.'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a whatis -d 'A synonym for describe'
+complete -f -n __fish_wajig_no_subcommand -c wajig -a whichpkg -d 'Find the package that supplies the given command or file'
diff --git a/share/completions/wget.fish b/share/completions/wget.fish
index 8d860bc48..d00f0bbb3 100644
--- a/share/completions/wget.fish
+++ b/share/completions/wget.fish
@@ -42,7 +42,7 @@ complete -c wget -l waitretry -d "Wait time between retries" -x
 complete -c wget -l random-wait -d "Wait random amount of time between retrievals"
 complete -c wget -s Y -l proxy -d "Toggle proxy support" -xa "on off"
 complete -c wget -s Q -l quota -d "Specify download quota for automatic retrievals" -x
-complete -c wget -l dns-cache -d "Turn off caching of DNS lookups" -xa "off"
+complete -c wget -l dns-cache -d "Turn off caching of DNS lookups" -xa off
 complete -c wget -l restrict-file-names -d "Change which characters found in remote URLs may show up in local file names" -a "
 	unix\t'Escape slash and non-printing characters'
 	windows\t'Escape most non-alphabetical characters'
diff --git a/share/completions/whatis.fish b/share/completions/whatis.fish
index 423e9b8e2..135bd943f 100644
--- a/share/completions/whatis.fish
+++ b/share/completions/whatis.fish
@@ -1,14 +1,14 @@
 complete -xc whatis -a "(__fish_complete_man)"
 
-complete -c whatis -s d -l debug -d "Debug"
-complete -c whatis -s v -l verbose -d "Verbose"
+complete -c whatis -s d -l debug -d Debug
+complete -c whatis -s v -l verbose -d Verbose
 complete -c whatis -s r -l regex -d "Interpret each keyword as a regex"
 complete -c whatis -s w -l wildcard -d "Allow wildcards"
 complete -c whatis -s l -l long -d "Do not trim output to terminal width"
 complete -rc whatis -s C -l config-file -d "Configuration file"
 complete -xc whatis -s L -l locale -a "(command -sq locale; and locale -a)" -d "Set locale"
 complete -xc whatis -s m -l systems -d "Set system"
-complete -xc whatis -s M -l manpath -a "(__fish_complete_directories (commandline -ct))" -d "Manpath"
+complete -xc whatis -s M -l manpath -a "(__fish_complete_directories (commandline -ct))" -d Manpath
 complete -xc whatis -s s -l sections -l section -d "Search only these sections (colon-separated)"
 complete -c whatis -s '?' -l help -l usage -d "Display help and exit"
 complete -c whatis -s V -l version -d "Print program version"
diff --git a/share/completions/wicd-cli.fish b/share/completions/wicd-cli.fish
index da42854c9..4408bfd84 100644
--- a/share/completions/wicd-cli.fish
+++ b/share/completions/wicd-cli.fish
@@ -2,8 +2,8 @@ complete -c wicd-cli -s h -l help -d 'Print help and exit'
 complete -c wicd-cli -s S -l scan -d 'Scan for networks'
 complete -c wicd-cli -s l -l list-networks -d 'List networks'
 complete -c wicd-cli -s d -l network-details -d 'Show network details'
-complete -c wicd-cli -s x -l disconnect -d 'Disconnect'
-complete -c wicd-cli -s c -l connect -d 'Connect'
+complete -c wicd-cli -s x -l disconnect -d Disconnect
+complete -c wicd-cli -s c -l connect -d Connect
 complete -c wicd-cli -s e -l list-encryption-types -d 'List encryption types'
 complete -c wicd-cli -s y -l wireless -d 'Perform operation on wireless network'
 complete -c wicd-cli -s z -l wired -d 'Perform operation on wired network'
diff --git a/share/completions/xdg-mime.fish b/share/completions/xdg-mime.fish
index 09f479f93..d1eb80193 100644
--- a/share/completions/xdg-mime.fish
+++ b/share/completions/xdg-mime.fish
@@ -16,7 +16,7 @@ complete -c xdg-mime -d 'Query file\'s filetype' -n 'contains_seq query filetype
 
 # complete xdg-mime default
 complete -c xdg-mime -d 'Choose application' -n '__fish_seen_subcommand_from default; and __fish_is_token_n 3' -xa '(__fish_print_xdg_desktop_file_ids)'
-complete -c xdg-mime -d 'Mimetype' -n '__fish_seen_subcommand_from default; and __fish_is_token_n 4' -xa '(__fish_print_xdg_mimetypes)'
+complete -c xdg-mime -d Mimetype -n '__fish_seen_subcommand_from default; and __fish_is_token_n 4' -xa '(__fish_print_xdg_mimetypes)'
 
 # complete xdg-mime install
 complete -c xdg-mime -d 'Add filetype description' -n 'contains_seq xdg-mime install -- (commandline -cop)' -r
diff --git a/share/completions/xsv.fish b/share/completions/xsv.fish
index b793edf70..2afdc024a 100644
--- a/share/completions/xsv.fish
+++ b/share/completions/xsv.fish
@@ -1,22 +1,22 @@
-complete -c xsv -n '__fish_is_first_token' -xa cat -d 'Concatenate by row or column'
-complete -c xsv -n '__fish_is_first_token' -xa count -d 'Count records'
-complete -c xsv -n '__fish_is_first_token' -xa fixlengths -d 'Makes all records have same length'
-complete -c xsv -n '__fish_is_first_token' -xa flatten -d 'Show one field per line'
-complete -c xsv -n '__fish_is_first_token' -xa fmt -d 'Format CSV output (change field delimiter)'
-complete -c xsv -n '__fish_is_first_token' -xa frequency -d 'Show frequency tables'
-complete -c xsv -n '__fish_is_first_token' -xa headers -d 'Show header names'
-complete -c xsv -n '__fish_is_first_token' -xa help -d 'Show this usage message.'
-complete -c xsv -n '__fish_is_first_token' -xa index -d 'Create CSV index for faster access'
-complete -c xsv -n '__fish_is_first_token' -xa input -d 'Read CSV data with special quoting rules'
-complete -c xsv -n '__fish_is_first_token' -xa join -d 'Join CSV files'
-complete -c xsv -n '__fish_is_first_token' -xa sample -d 'Randomly sample CSV data'
-complete -c xsv -n '__fish_is_first_token' -xa search -d 'Search CSV data with regexes'
-complete -c xsv -n '__fish_is_first_token' -xa select -d 'Select columns from CSV'
-complete -c xsv -n '__fish_is_first_token' -xa slice -d 'Slice records from CSV'
-complete -c xsv -n '__fish_is_first_token' -xa sort -d 'Sort CSV data'
-complete -c xsv -n '__fish_is_first_token' -xa split -d 'Split CSV data into many files'
-complete -c xsv -n '__fish_is_first_token' -xa stats -d 'Compute basic statistics'
-complete -c xsv -n '__fish_is_first_token' -xa table -d 'Align CSV data into columns'
+complete -c xsv -n __fish_is_first_token -xa cat -d 'Concatenate by row or column'
+complete -c xsv -n __fish_is_first_token -xa count -d 'Count records'
+complete -c xsv -n __fish_is_first_token -xa fixlengths -d 'Makes all records have same length'
+complete -c xsv -n __fish_is_first_token -xa flatten -d 'Show one field per line'
+complete -c xsv -n __fish_is_first_token -xa fmt -d 'Format CSV output (change field delimiter)'
+complete -c xsv -n __fish_is_first_token -xa frequency -d 'Show frequency tables'
+complete -c xsv -n __fish_is_first_token -xa headers -d 'Show header names'
+complete -c xsv -n __fish_is_first_token -xa help -d 'Show this usage message.'
+complete -c xsv -n __fish_is_first_token -xa index -d 'Create CSV index for faster access'
+complete -c xsv -n __fish_is_first_token -xa input -d 'Read CSV data with special quoting rules'
+complete -c xsv -n __fish_is_first_token -xa join -d 'Join CSV files'
+complete -c xsv -n __fish_is_first_token -xa sample -d 'Randomly sample CSV data'
+complete -c xsv -n __fish_is_first_token -xa search -d 'Search CSV data with regexes'
+complete -c xsv -n __fish_is_first_token -xa select -d 'Select columns from CSV'
+complete -c xsv -n __fish_is_first_token -xa slice -d 'Slice records from CSV'
+complete -c xsv -n __fish_is_first_token -xa sort -d 'Sort CSV data'
+complete -c xsv -n __fish_is_first_token -xa split -d 'Split CSV data into many files'
+complete -c xsv -n __fish_is_first_token -xa stats -d 'Compute basic statistics'
+complete -c xsv -n __fish_is_first_token -xa table -d 'Align CSV data into columns'
 
 # with a subcommand
 complete -c xsv -n 'not __fish_is_first_token' -xa '(__fish_complete_suffix .csv)'
diff --git a/share/completions/xz.fish b/share/completions/xz.fish
index 91149e874..3bceaa5c5 100644
--- a/share/completions/xz.fish
+++ b/share/completions/xz.fish
@@ -1,5 +1,5 @@
-complete -c xz -s z -l compress -d 'Compress'
-complete -c xz -s d -l decompress -l uncompress -d 'Decompress' -x -a "
+complete -c xz -s z -l compress -d Compress
+complete -c xz -s d -l decompress -l uncompress -d Decompress -x -a "
 (
     __fish_complete_suffix .xz
     __fish_complete_suffix .txz
diff --git a/share/completions/yaourt.fish b/share/completions/yaourt.fish
index 6d930c54a..9cbbb8578 100644
--- a/share/completions/yaourt.fish
+++ b/share/completions/yaourt.fish
@@ -25,9 +25,9 @@ set -l upgrade '__fish_contains_opt -s U upgrade'
 set -l files '__fish_contains_opt -s F files'
 
 # HACK: We only need these three to coerce fish to stop file completion and complete options
-complete -c $progname -n $noopt -a "-D" -d "Modify the package database"
-complete -c $progname -n $noopt -a "-Q" -d "Query the package database"
-complete -c $progname -n $noopt -a "-C" -d "Manage .pac* files"
+complete -c $progname -n $noopt -a -D -d "Modify the package database"
+complete -c $progname -n $noopt -a -Q -d "Query the package database"
+complete -c $progname -n $noopt -a -C -d "Manage .pac* files"
 # Primary operations
 complete -c $progname -s D -f -l database -n $noopt -d 'Modify the package database'
 complete -c $progname -s Q -f -l query -n $noopt -d 'Query the package database'
diff --git a/share/completions/yarn.fish b/share/completions/yarn.fish
index 2223dd23c..e412934a5 100644
--- a/share/completions/yarn.fish
+++ b/share/completions/yarn.fish
@@ -8,57 +8,57 @@ set -l yarn_add "yarn global add"
 complete -f -c yarn -n '__fish_seen_subcommand_from remove; and not __fish_is_switch' -xa '(__yarn_installed_packages)'
 complete -f -c yarn -n '__fish_seen_subcommand_from add; and not __fish_is_switch' -xa "(__yarn_filtered_list_packages \"$yarn_add\")"
 
-complete -f -c yarn -n '__fish_use_subcommand' -a help
+complete -f -c yarn -n __fish_use_subcommand -a help
 
-complete -f -c yarn -n '__fish_use_subcommand' -a access
+complete -f -c yarn -n __fish_use_subcommand -a access
 complete -f -c yarn -n '__fish_seen_subcommand_from access' -a 'public restricted grant revoke ls-packages ls-collaborators edit'
 
-complete -f -c yarn -n '__fish_use_subcommand' -a add
+complete -f -c yarn -n __fish_use_subcommand -a add
 complete -f -c yarn -n '__fish_seen_subcommand_from add' -l dev -s D
 complete -f -c yarn -n '__fish_seen_subcommand_from add' -l peer -s P
 complete -f -c yarn -n '__fish_seen_subcommand_from add' -l O -s O
 complete -f -c yarn -n '__fish_seen_subcommand_from add' -l exact -s E
 complete -f -c yarn -n '__fish_seen_subcommand_from add' -l tilde -s T
 
-complete -f -c yarn -n '__fish_use_subcommand' -a bin
+complete -f -c yarn -n __fish_use_subcommand -a bin
 
-complete -f -c yarn -n '__fish_use_subcommand' -a cache
+complete -f -c yarn -n __fish_use_subcommand -a cache
 complete -f -c yarn -n '__fish_seen_subcommand_from cache' -a 'ls dir clean'
 
-complete -f -c yarn -n '__fish_use_subcommand' -a check
-complete -f -c yarn -n '__fish_use_subcommand' -a clean
+complete -f -c yarn -n __fish_use_subcommand -a check
+complete -f -c yarn -n __fish_use_subcommand -a clean
 
-complete -f -c yarn -n '__fish_use_subcommand' -a config
+complete -f -c yarn -n __fish_use_subcommand -a config
 complete -f -c yarn -n '__fish_seen_subcommand_from config' -a 'set get delete list'
 
-complete -f -c yarn -n '__fish_use_subcommand' -a generate-lock-entry
+complete -f -c yarn -n __fish_use_subcommand -a generate-lock-entry
 
-complete -f -c yarn -n '__fish_use_subcommand' -a global
+complete -f -c yarn -n __fish_use_subcommand -a global
 complete -f -c yarn -n '__fish_seen_subcommand_from global' -a 'add bin ls remove upgrade'
-complete -f -c yarn -n '__fish_use_subcommand' -a info
+complete -f -c yarn -n __fish_use_subcommand -a info
 
-complete -f -c yarn -n '__fish_use_subcommand' -a init
+complete -f -c yarn -n __fish_use_subcommand -a init
 complete -f -c yarn -n '__fish_seen_subcommand_from init' -s y -l yes
 
-complete -f -c yarn -n '__fish_use_subcommand' -a install
+complete -f -c yarn -n __fish_use_subcommand -a install
 
-complete -f -c yarn -n '__fish_use_subcommand' -a licenses
+complete -f -c yarn -n __fish_use_subcommand -a licenses
 complete -f -c yarn -n '__fish_seen_subcommand_from licenses' -a 'ls generate-disclaimer'
-complete -f -c yarn -n '__fish_use_subcommand' -a link
+complete -f -c yarn -n __fish_use_subcommand -a link
 
-complete -f -c yarn -n '__fish_use_subcommand' -a list
+complete -f -c yarn -n __fish_use_subcommand -a list
 complete -f -c yarn -n '__fish_seen_subcommand_from list' -l depth
 
-complete -f -c yarn -n '__fish_use_subcommand' -a login
-complete -f -c yarn -n '__fish_use_subcommand' -a logout
-complete -f -c yarn -n '__fish_use_subcommand' -a outdated
+complete -f -c yarn -n __fish_use_subcommand -a login
+complete -f -c yarn -n __fish_use_subcommand -a logout
+complete -f -c yarn -n __fish_use_subcommand -a outdated
 
-complete -f -c yarn -n '__fish_use_subcommand' -a owner
+complete -f -c yarn -n __fish_use_subcommand -a owner
 complete -f -c yarn -n '__fish_seen_subcommand_from owner' -a 'add rm ls'
 
-complete -f -c yarn -n '__fish_use_subcommand' -a pack
+complete -f -c yarn -n __fish_use_subcommand -a pack
 
-complete -f -c yarn -n '__fish_use_subcommand' -a publish
+complete -f -c yarn -n __fish_use_subcommand -a publish
 complete -f -c yarn -n '__fish_seen_subcommand_from publish' -l access -a 'public restricted'
 complete -f -c yarn -n '__fish_seen_subcommand_from publish' -l tag
 complete -f -c yarn -n '__fish_seen_subcommand_from publish' -l new-version
@@ -67,8 +67,8 @@ complete -f -c yarn -n '__fish_seen_subcommand_from publish' -l no-git-tag-versi
 complete -f -c yarn -n '__fish_seen_subcommand_from publish' -l access
 complete -f -c yarn -n '__fish_seen_subcommand_from publish' -l tag
 
-complete -f -c yarn -n '__fish_use_subcommand' -a remove
-complete -f -c yarn -n '__fish_use_subcommand' -a run
+complete -f -c yarn -n __fish_use_subcommand -a remove
+complete -f -c yarn -n __fish_use_subcommand -a run
 
 function __fish_yarn_run
     if test -e package.json; and set -l python (__fish_anypython)
@@ -86,23 +86,23 @@ end
 # Scripts can be used like normal subcommands, or with `yarn run SCRIPT`.
 complete -c yarn -n '__fish_use_subcommand; or __fish_seen_subcommand_from run' -xa "(__fish_yarn_run)"
 
-complete -f -c yarn -n '__fish_use_subcommand' -a tag
+complete -f -c yarn -n __fish_use_subcommand -a tag
 complete -f -c yarn -n '__fish_seen_subcommand_from tag' -a 'add rm ls'
 
-complete -f -c yarn -n '__fish_use_subcommand' -a team
+complete -f -c yarn -n __fish_use_subcommand -a team
 complete -f -c yarn -n '__fish_seen_subcommand_from team' -a 'create destroy add rm ls'
 
-complete -f -c yarn -n '__fish_use_subcommand' -a unlink
-complete -f -c yarn -n '__fish_use_subcommand' -a upgrade
-complete -f -c yarn -n '__fish_use_subcommand' -a upgrade-interactive
+complete -f -c yarn -n __fish_use_subcommand -a unlink
+complete -f -c yarn -n __fish_use_subcommand -a upgrade
+complete -f -c yarn -n __fish_use_subcommand -a upgrade-interactive
 
-complete -f -c yarn -n '__fish_use_subcommand' -a version
+complete -f -c yarn -n __fish_use_subcommand -a version
 complete -f -c yarn -n '__fish_seen_subcommand_from version' -l new-version
 complete -f -c yarn -n '__fish_seen_subcommand_from version' -l message
 complete -f -c yarn -n '__fish_seen_subcommand_from version' -l no-git-tag-version
 
-complete -f -c yarn -n '__fish_use_subcommand' -a versions
-complete -f -c yarn -n '__fish_use_subcommand' -a why
+complete -f -c yarn -n __fish_use_subcommand -a versions
+complete -f -c yarn -n __fish_use_subcommand -a why
 
 # These are the yarn commands all of them use the same options
 set -g yarn_cmds access add bin cache check clean config generate-lock-entry global info init install licenses link list login logout outdated owner pack publish remove run tag team unlink upgrade upgrade-interactive version versions why
diff --git a/share/completions/yast2.fish b/share/completions/yast2.fish
index 251b23670..cf638f016 100644
--- a/share/completions/yast2.fish
+++ b/share/completions/yast2.fish
@@ -1,4 +1,4 @@
-complete -f -c yast2 -a '(yast2 -l)' -d 'Module'
+complete -f -c yast2 -a '(yast2 -l)' -d Module
 
 complete -f -c yast2 -s h -l help -d 'Show help'
 complete -f -c yast2 -s l -l list -d 'List all available modules'
diff --git a/share/completions/yum.fish b/share/completions/yum.fish
index 7ddc15c6b..a0ad88890 100644
--- a/share/completions/yum.fish
+++ b/share/completions/yum.fish
@@ -14,18 +14,18 @@ function __fish_yum_package_ok
     return 1
 end
 
-complete -c yum -n '__fish_use_subcommand' -xa install -d "Install the latest version of a package"
-complete -c yum -n '__fish_use_subcommand' -xa 'update upgrade' -d "Update specified packages (defaults to all packages)"
-complete -c yum -n '__fish_use_subcommand' -xa check-update -d "Print list of available updates"
-complete -c yum -n '__fish_use_subcommand' -xa 'remove erase' -d "Remove the specified packages and packages that depend on them"
-complete -c yum -n '__fish_use_subcommand' -xa list -d "List available packages"
-complete -c yum -n '__fish_use_subcommand' -xa info -d "Describe available packages"
-complete -c yum -n '__fish_use_subcommand' -xa 'provides whatprovides' -d "Find package providing a feature or file"
-complete -c yum -n '__fish_use_subcommand' -xa search -d "find packages matching description regexp"
-complete -c yum -n '__fish_use_subcommand' -xa clean -d "Clean up cache directory"
-complete -c yum -n '__fish_use_subcommand' -xa generate-rss -d "Generate rss changelog"
+complete -c yum -n __fish_use_subcommand -xa install -d "Install the latest version of a package"
+complete -c yum -n __fish_use_subcommand -xa 'update upgrade' -d "Update specified packages (defaults to all packages)"
+complete -c yum -n __fish_use_subcommand -xa check-update -d "Print list of available updates"
+complete -c yum -n __fish_use_subcommand -xa 'remove erase' -d "Remove the specified packages and packages that depend on them"
+complete -c yum -n __fish_use_subcommand -xa list -d "List available packages"
+complete -c yum -n __fish_use_subcommand -xa info -d "Describe available packages"
+complete -c yum -n __fish_use_subcommand -xa 'provides whatprovides' -d "Find package providing a feature or file"
+complete -c yum -n __fish_use_subcommand -xa search -d "find packages matching description regexp"
+complete -c yum -n __fish_use_subcommand -xa clean -d "Clean up cache directory"
+complete -c yum -n __fish_use_subcommand -xa generate-rss -d "Generate rss changelog"
 
-complete -c yum -n '__fish_yum_package_ok' -a "(__fish_print_packages)"
+complete -c yum -n __fish_yum_package_ok -a "(__fish_print_packages)"
 
 complete -c yum -s h -l help -d "Display help and exit"
 complete -c yum -s y -d "Assume yes to all questions"
diff --git a/share/completions/zcat.fish b/share/completions/zcat.fish
index 553258a9f..8ec919e80 100644
--- a/share/completions/zcat.fish
+++ b/share/completions/zcat.fish
@@ -3,7 +3,7 @@ complete -c zcat -x -a "(
 	__fish_complete_suffix .tgz
 )
 "
-complete -c zcat -s f -l force -d "Overwrite"
+complete -c zcat -s f -l force -d Overwrite
 complete -c zcat -s h -l help -d "Display help and exit"
 complete -c zcat -s L -l license -d "Print license"
 complete -c zcat -s V -l version -d "Display version and exit"
diff --git a/share/completions/zfs.fish b/share/completions/zfs.fish
index 52515c6a9..927de7122 100644
--- a/share/completions/zfs.fish
+++ b/share/completions/zfs.fish
@@ -13,23 +13,23 @@
 set -lx OS ""
 switch (uname)
     case Linux
-        set OS "Linux"
+        set OS Linux
     case Darwin
-        set OS "macOS"
+        set OS macOS
     case FreeBSD
-        set OS "FreeBSD"
+        set OS FreeBSD
     case SunOS
-        set OS "SunOS"
+        set OS SunOS
         # Others?
     case "*"
-        set OS "unknown"
+        set OS unknown
 end
 
 # Does the current invocation need a command?
 function __fish_zfs_needs_command
     set -l bookmark ""
     if __fish_is_zfs_feature_enabled "feature@bookmarks"
-        set bookmark "bookmark"
+        set bookmark bookmark
     end
 
     not __fish_seen_subcommand_from \? create destroy snap{,shot} rollback clone promote rename list set get inherit upgrade {user,group}space {u,un,}mount {un,}share $bookmark send receive recv {un,}allow hold{s,} release diff program
@@ -95,19 +95,19 @@ function __fish_zfs_list_permissions -V OS
     echo -e "clone\tAlso needs the 'create' and 'mount' permissions in the origin filesystem"
     echo -e "create\tAlso needs the 'mount' permission"
     echo -e "destroy\tAlso needs the 'mount' permission"
-    echo -e "mount"
+    echo -e mount
     echo -e "promote\tAlso needs the 'promote' and 'mount' permissions in the origin filesystem"
     echo -e "receive\tAlso needs the 'create' and 'mount' permissions"
     echo -e "rename\tAlso needs the 'create' and 'mount' permissions in the new parent"
     echo -e "rollback\tAlso needs the 'mount' permission"
-    echo -e "send"
+    echo -e send
     echo -e "share\tFor SMB and NFS shares"
     echo -e "snapshot\tAlso needs the 'mount' permission"
-    echo -e "groupquota"
-    echo -e "groupused"
+    echo -e groupquota
+    echo -e groupused
     echo -e "userprop\tAllows changing any user property"
-    echo -e "userquota"
-    echo -e "userused"
+    echo -e userquota
+    echo -e userused
     # The remaining code of the function is almost a duplicate of __fish_complete_zfs_rw_properties and __fish_complete_zfs_ro_properties, but almost only, hence the duplication
     # RO properties
     echo -e "volblocksize\tVolume block size"
@@ -163,7 +163,7 @@ function __fish_zfs_list_permissions -V OS
     echo -e "snapdir\tHide .zfs directory (hidden, visible)"
     echo -e "sync\tHandle of synchronous requests (standard, always, disabled)"
     echo -e "volsize\tVolume logical size (SIZE)"
-    if test $OS = "SunOS"
+    if test $OS = SunOS
         echo -e "zoned\tManaged from a non-global zone (on, off)"
         echo -e "mlslabel\tCan the dataset be mounted in a zone with Trusted Extensions enabled (LABEL, none)"
         echo -e "nbmand\tMount with Non Blocking mandatory locks (on, off)"
@@ -172,7 +172,7 @@ function __fish_zfs_list_permissions -V OS
         echo -e "version\tOn-disk version of filesystem (1, 2, current)"
         echo -e "vscan\tScan regular files for viruses on opening and closing (on, off)"
         echo -e "xattr\tExtended attributes (on, off, sa)"
-    else if test $OS = "Linux"
+    else if test $OS = Linux
         echo -e "acltype\tUse no ACL or POSIX ACL (noacl, posixacl)"
         echo -e "nbmand\tMount with Non Blocking mandatory locks (on, off)"
         echo -e "relatime\tSometimes update access time on read (on, off)"
@@ -182,14 +182,14 @@ function __fish_zfs_list_permissions -V OS
         echo -e "version\tOn-disk version of filesystem (1, 2, current)"
         echo -e "vscan\tScan regular files for viruses on opening and closing (on, off)"
         echo -e "xattr\tExtended attributes (on, off, sa)"
-    else if test $OS = "FreeBSD"
+    else if test $OS = FreeBSD
         echo -e "aclmode\tHow is ACL modified by chmod (discard, groupmask, passthrough, restricted)"
         echo -e "volmode\tHow to expose volumes to OS (default, geom, dev, none)"
     end
     # Write-once properties
     echo -e "normalization\tUnicode normalization (none, formC, formD, formKC, formKD)"
     echo -e "utf8only\tReject non-UTF-8-compliant filenames (on, off)"
-    if test $OS = "Linux"
+    if test $OS = Linux
         echo -e "casesensitivity\tCase sensitivity (sensitive, insensitive)"
     else # FreeBSD, SunOS and virtually all others
         echo -e "casesensitivity\tCase sensitivity (sensitive, insensitive, mixed)"
@@ -214,45 +214,45 @@ function __fish_print_zfs_volumes -d "Lists ZFS volumes"
     zfs list -t volume -o name -H
 end
 
-complete -c zfs -f -n '__fish_zfs_needs_command' -s '?' -a '?' -d 'Display a help message'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'create' -d 'Create a volume or filesystem'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'destroy' -d 'Destroy a dataset'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'snapshot snap' -d 'Create a snapshot'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'rollback' -d 'Roll back a filesystem to a previous snapshot'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'clone' -d 'Create a clone of a snapshot'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'promote' -d 'Promotes a clone file system to no longer be dependent on its "origin" snapshot'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'rename' -d 'Rename a dataset'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'list' -d 'List dataset properties'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'set' -d 'Set a dataset property'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'get' -d 'Get one or several dataset properties'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'inherit' -d 'Set a dataset property to be inherited'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'upgrade' -d 'List upgradeable datasets, or upgrade one'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'userspace' -d 'Get dataset space consumed by each user'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'groupspace' -d 'Get dataset space consumed by each user group'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'mount' -d 'Mount a filesystem'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'unmount umount' -d 'Unmount a filesystem'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'share' -d 'Share a given filesystem, or all of them'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'unshare' -d 'Stop sharing a given filesystem, or all of them'
+complete -c zfs -f -n __fish_zfs_needs_command -s '?' -a '?' -d 'Display a help message'
+complete -c zfs -f -n __fish_zfs_needs_command -a create -d 'Create a volume or filesystem'
+complete -c zfs -f -n __fish_zfs_needs_command -a destroy -d 'Destroy a dataset'
+complete -c zfs -f -n __fish_zfs_needs_command -a 'snapshot snap' -d 'Create a snapshot'
+complete -c zfs -f -n __fish_zfs_needs_command -a rollback -d 'Roll back a filesystem to a previous snapshot'
+complete -c zfs -f -n __fish_zfs_needs_command -a clone -d 'Create a clone of a snapshot'
+complete -c zfs -f -n __fish_zfs_needs_command -a promote -d 'Promotes a clone file system to no longer be dependent on its "origin" snapshot'
+complete -c zfs -f -n __fish_zfs_needs_command -a rename -d 'Rename a dataset'
+complete -c zfs -f -n __fish_zfs_needs_command -a list -d 'List dataset properties'
+complete -c zfs -f -n __fish_zfs_needs_command -a set -d 'Set a dataset property'
+complete -c zfs -f -n __fish_zfs_needs_command -a get -d 'Get one or several dataset properties'
+complete -c zfs -f -n __fish_zfs_needs_command -a inherit -d 'Set a dataset property to be inherited'
+complete -c zfs -f -n __fish_zfs_needs_command -a upgrade -d 'List upgradeable datasets, or upgrade one'
+complete -c zfs -f -n __fish_zfs_needs_command -a userspace -d 'Get dataset space consumed by each user'
+complete -c zfs -f -n __fish_zfs_needs_command -a groupspace -d 'Get dataset space consumed by each user group'
+complete -c zfs -f -n __fish_zfs_needs_command -a mount -d 'Mount a filesystem'
+complete -c zfs -f -n __fish_zfs_needs_command -a 'unmount umount' -d 'Unmount a filesystem'
+complete -c zfs -f -n __fish_zfs_needs_command -a share -d 'Share a given filesystem, or all of them'
+complete -c zfs -f -n __fish_zfs_needs_command -a unshare -d 'Stop sharing a given filesystem, or all of them'
 if __fish_is_zfs_feature_enabled 'feature@bookmarks'
-    complete -c zfs -f -n '__fish_zfs_needs_command' -a 'bookmark' -d 'Create a bookmark for a snapshot'
+    complete -c zfs -f -n __fish_zfs_needs_command -a bookmark -d 'Create a bookmark for a snapshot'
 end
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'send' -d 'Output a stream representation of a dataset'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'receive recv' -d 'Write on disk a dataset from the stream representation given on standard input'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'allow' -d 'Delegate, or display delegations of, rights on a dataset to (groups of) users'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'unallow' -d 'Revoke delegations of rights on a dataset from (groups of) users'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'hold' -d 'Put a named hold on a snapshot'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'holds' -d 'List holds on a snapshot'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'release' -d 'Remove a named hold from a snapshot'
-complete -c zfs -f -n '__fish_zfs_needs_command' -a 'diff' -d 'List changed files between a snapshot, and a filesystem or a previous snapshot'
-if test $OS = 'SunOS' # This is currently only supported under Illumos, but that will probably change
-    complete -c zfs -f -n '__fish_zfs_needs_command' -a 'program' -d 'Execute a ZFS Channel Program'
+complete -c zfs -f -n __fish_zfs_needs_command -a send -d 'Output a stream representation of a dataset'
+complete -c zfs -f -n __fish_zfs_needs_command -a 'receive recv' -d 'Write on disk a dataset from the stream representation given on standard input'
+complete -c zfs -f -n __fish_zfs_needs_command -a allow -d 'Delegate, or display delegations of, rights on a dataset to (groups of) users'
+complete -c zfs -f -n __fish_zfs_needs_command -a unallow -d 'Revoke delegations of rights on a dataset from (groups of) users'
+complete -c zfs -f -n __fish_zfs_needs_command -a hold -d 'Put a named hold on a snapshot'
+complete -c zfs -f -n __fish_zfs_needs_command -a holds -d 'List holds on a snapshot'
+complete -c zfs -f -n __fish_zfs_needs_command -a release -d 'Remove a named hold from a snapshot'
+complete -c zfs -f -n __fish_zfs_needs_command -a diff -d 'List changed files between a snapshot, and a filesystem or a previous snapshot'
+if test $OS = SunOS # This is currently only supported under Illumos, but that will probably change
+    complete -c zfs -f -n __fish_zfs_needs_command -a program -d 'Execute a ZFS Channel Program'
 end
 
 # Completions hereafter try to follow the man pages commands order, for maintainability, at the cost of multiple if statements
 
 # create completions
 complete -c zfs -f -n '__fish_zfs_using_command create' -s p -d 'Create all needed non-existing parent datasets'
-if test $OS = 'Linux' # Only Linux supports the comma-separated format; others need multiple -o calls
+if test $OS = Linux # Only Linux supports the comma-separated format; others need multiple -o calls
     complete -c zfs -x -n '__fish_zfs_using_command create' -s o -d 'Dataset property' -a '(__fish_append , (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties))'
 else
     complete -c zfs -x -n '__fish_zfs_using_command create' -s o -d 'Dataset property' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties)'
@@ -261,7 +261,7 @@ end
 # If -V is typed after -s or -b, zfs should accept it, but fish won't propose -s or -b, but, as these options are for volumes only, it seems reasonable to expect the user to ask for a volume, with -V, before giving its characteristics with -s or -b
 complete -c zfs -x -n '__fish_zfs_using_command create' -s V -d 'Volume size'
 complete -c zfs -f -n '__fish_zfs_using_command create; and __fish_contains_opt -s V' -s s -d 'Create a sparse volume'
-complete -c zfs -x -n '__fish_zfs_using_command create; and __fish_contains_opt -s V' -s b -d 'Blocksize'
+complete -c zfs -x -n '__fish_zfs_using_command create; and __fish_contains_opt -s V' -s b -d Blocksize
 
 # destroy completions; as the dataset is the last item, we can't know yet if it's a snapshot, a bookmark or something else, so we can't separate snapshot-specific options from others
 complete -c zfs -f -n '__fish_zfs_using_command destroy' -s r -d 'Recursively destroy children'
@@ -275,7 +275,7 @@ complete -c zfs -x -n '__fish_zfs_using_command destroy' -d 'Dataset to destroy'
 
 # snapshot completions
 complete -c zfs -f -n '__fish_zfs_using_command snapshot; or __fish_zfs_using_command snap' -s r -d 'Recursively snapshot children'
-if test $OS = 'Linux' # Only Linux supports the comma-separated format; others need multiple -o calls
+if test $OS = Linux # Only Linux supports the comma-separated format; others need multiple -o calls
     complete -c zfs -x -n '__fish_zfs_using_command snapshot; or __fish_zfs_using_command snap' -s o -d 'Snapshot property' -a '(__fish_append , (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties))'
 else
     complete -c zfs -x -n '__fish_zfs_using_command snapshot; or __fish_zfs_using_command snap' -s o -d 'Snapshot property' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties)'
@@ -290,7 +290,7 @@ complete -c zfs -x -n '__fish_zfs_using_command rollback' -d 'Snapshot to roll b
 
 # clone completions
 complete -c zfs -f -n '__fish_zfs_using_command clone' -s p -d 'Create all needed non-existing parent datasets'
-if test $OS = 'Linux' # Only Linux supports the comma-separated format; others need multiple -o calls
+if test $OS = Linux # Only Linux supports the comma-separated format; others need multiple -o calls
     complete -c zfs -x -n '__fish_zfs_using_command clone' -s o -d 'Clone property' -a '(__fish_append , (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties))'
 else
     complete -c zfs -x -n '__fish_zfs_using_command clone' -s o -d 'Clone property' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties)'
@@ -303,9 +303,9 @@ complete -c zfs -x -n '__fish_zfs_using_command promote' -d 'Clone to promote' -
 # rename completions; as the dataset is the last item, we can't know yet if it's a snapshot or not, we can't separate snapshot-specific option from others
 complete -c zfs -f -n '__fish_zfs_using_command rename' -s p -d 'Create all needed non-existing parent datasets'
 complete -c zfs -f -n '__fish_zfs_using_command rename' -s r -d 'Recursively rename children snapshots'
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zfs -f -n '__fish_zfs_using_command rename' -s f -d 'Force unmounting if needed'
-else if test $OS = 'FreeBSD'
+else if test $OS = FreeBSD
     complete -c zfs -f -n '__fish_zfs_using_command rename' -s u -d 'Do not remount filesystems during rename'
     complete -c zfs -f -n '__fish_zfs_using_command rename; and __fish_not_contain_opt -s u' -s f -d 'Force unmounting if needed'
 end
@@ -355,8 +355,8 @@ complete -c zfs -f -n '__fish_zfs_using_command groupspace' -s n -d 'Print GID i
 complete -c zfs -f -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -s H -d 'Print output in a machine-parsable format'
 complete -c zfs -f -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -s p -d 'Print parsable (exact) values for numbers'
 complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -s o -d 'Field to display' -a '(__fish_append , (__fish_zfs_list_space_fields))'
-complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace; and __fish_not_contain_opt -s S' -s s -d 'Property to use for sorting output by ascending order' -a '__fish_zfs_list_space_fields'
-complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace; and __fish_not_contain_opt -s s' -s S -d 'Property to use for sorting output by descending order' -a '__fish_zfs_list_space_fields'
+complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace; and __fish_not_contain_opt -s S' -s s -d 'Property to use for sorting output by ascending order' -a __fish_zfs_list_space_fields
+complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace; and __fish_not_contain_opt -s s' -s S -d 'Property to use for sorting output by descending order' -a __fish_zfs_list_space_fields
 complete -c zfs -x -n '__fish_zfs_using_command userspace' -s t -d 'Identity types to display' -a '(__fish_append , (__fish_zfs_list_userspace_types))'
 complete -c zfs -x -n '__fish_zfs_using_command groupspace' -s t -d 'Identity types to display' -a '(__fish_append , (__fish_zfs_list_groupspace_types))'
 complete -c zfs -f -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -s i -d 'Translate S(amba)ID to POSIX ID'
@@ -392,7 +392,7 @@ end
 # send completions
 complete -c zfs -x -n '__fish_zfs_using_command send' -s i -d 'Generate incremental stream from snapshot' -a '(__fish_print_zfs_snapshots; __fish_print_zfs_bookmarks)'
 complete -c zfs -x -n '__fish_zfs_using_command send' -s I -d 'Generate incremental stream from snapshot, even with intermediary snapshots' -a '(__fish_print_zfs_snapshots)'
-if test $OS = 'SunOS'
+if test $OS = SunOS
     complete -c zfs -f -n '__fish_zfs_using_command send' -s R -l replicate -d 'Include children in replication stream'
     complete -c zfs -f -n '__fish_zfs_using_command send' -s D -l dedup -d 'Generate a deduplicated stream'
     complete -c zfs -f -n '__fish_zfs_using_command send; and __fish_is_zfs_feature_enabled "feature@large_blocks"' -s L -l large-block -d 'Allow the presence of larger blocks than 128 kiB'
@@ -421,8 +421,8 @@ complete -c zfs -f -n '__fish_zfs_using_command receive; or __fish_zfs_using_com
 complete -c zfs -f -n '__fish_zfs_using_command receive; or __fish_zfs_using_command recv' -s u -d 'Unmount the target filesystem'
 complete -c zfs -f -n '__fish_zfs_using_command receive; or __fish_zfs_using_command recv; and __fish_not_contain_opt -s e' -s d -d 'Discard the first element of the path of the sent snapshot'
 complete -c zfs -f -n '__fish_zfs_using_command receive; or __fish_zfs_using_command recv; and __fish_not_contain_opt -s d' -s e -d 'Discard all but the last element of the path of the sent snapshot'
-if test $OS = "SunOS"
-    complete -c zfs -x -n '__fish_zfs_using_command receive; or __fish_zfs_using_command recv' -s o -d 'Force the stream to be received as a clone of the given snapshot' -a 'origin'
+if test $OS = SunOS
+    complete -c zfs -x -n '__fish_zfs_using_command receive; or __fish_zfs_using_command recv' -s o -d 'Force the stream to be received as a clone of the given snapshot' -a origin
 end
 if __fish_is_zfs_feature_enabled "feature@extensible_dataset"
     complete -c zfs -f -n '__fish_zfs_using_command receive; or __fish_zfs_using_command recv' -s s -d 'On transfer interruption, store a receive_resume_token for resumption'
@@ -435,7 +435,7 @@ complete -c zfs -f -n '__fish_zfs_using_command allow; and __fish_not_contain_op
 complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s e' -s u -d 'User to delegate permissions to' -a '(__fish_append , (__fish_complete_users))'
 complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s e' -s g -d 'Group to delegate permissions to' -a '(__fish_append , (__fish_complete_groups))'
 if contains -- $OS SunOS FreeBSD
-    complete -c zfs -f -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s u -s g -s e' -a 'everyone' -d 'Delegate permission to everyone'
+    complete -c zfs -f -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s u -s g -s e' -a everyone -d 'Delegate permission to everyone'
 end
 complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s u -s g everyone' -s e -d 'Delegate permission to everyone'
 complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s l -s d -s e -s g -s u -s s' -s c -d 'Delegate permissions only to the creator of later descendent datasets' -a '(__fish_append , (__fish_zfs_list_permissions))'
@@ -450,11 +450,11 @@ complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_
 complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s u -s g everyone' -s e -d 'Remove permission from everyone'
 complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s l -s d -s e -s g -s u -s s' -s c -d 'Remove permissions only on later created descendent datasets' -a '(__fish_append , (__fish_zfs_list_permissions))'
 complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s l -s d -s e -s g -s u -s c' -s s -d 'Remove a permission set or remove permissions from an existing one'
-if test $OS = 'SunOS'
+if test $OS = SunOS
     complete -c zfs -f -n '__fish_zfs_using_command unallow' -s r -d 'Remove permissions recursively'
-    complete -c zfs -f -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s u -s g -s e' -a 'everyone' -d 'Remove permission from everyone'
-else if test $OS = 'FreeBSD'
-    complete -c zfs -f -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s u -s g -s e' -a 'everyone' -d 'Remove permission from everyone'
+    complete -c zfs -f -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s u -s g -s e' -a everyone -d 'Remove permission from everyone'
+else if test $OS = FreeBSD
+    complete -c zfs -f -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s u -s g -s e' -a everyone -d 'Remove permission from everyone'
 end
 complete -c zfs -x -n '__fish_zfs_using_command unallow' -d 'Dataset on which delegation is to be removed' -a '(__fish_print_zfs_filesystems; __fish_print_zfs_volumes)'
 
@@ -477,7 +477,7 @@ complete -c zfs -f -n '__fish_zfs_using_command diff' -s t -d 'Display inode cha
 complete -c zfs -x -n '__fish_zfs_using_command diff' -d 'Source snapshot for the diff' -a '(__fish_print_zfs_snapshots)'
 
 # program completions
-if test $OS = 'SunOS' # This is currently only supported under Illumos, but that will probably change
+if test $OS = SunOS # This is currently only supported under Illumos, but that will probably change
     complete -c zfs -x -n '__fish_zfs_using_command program' -s t -d 'Execution timeout'
     complete -c zfs -x -n '__fish_zfs_using_command program' -s t -d 'Execution memory limit'
     complete -c zfs -x -n '__fish_zfs_using_command program' -d 'Pool which program will be executed on' -a '(__fish_complete_zfs_pools)'
diff --git a/share/completions/zip.fish b/share/completions/zip.fish
index bb7970f5f..d0cce0c90 100644
--- a/share/completions/zip.fish
+++ b/share/completions/zip.fish
@@ -26,7 +26,7 @@ complete -c zip -s T -d "Test zipfile integrity"
 complete -c zip -s X -d "Exclude extra file attributes"
 complete -c zip -s y -d "Store symbolic links as links"
 complete -c zip -s R -d "PKZIP recursion"
-complete -c zip -s e -d "Encrypt"
+complete -c zip -s e -d Encrypt
 complete -c zip -s n -r -d "Don\'t compress files with these suffixes"
 complete -c zip -s h -d "Display help and exit"
 
diff --git a/share/completions/zpaq.fish b/share/completions/zpaq.fish
index 77728ade4..9199b2289 100644
--- a/share/completions/zpaq.fish
+++ b/share/completions/zpaq.fish
@@ -9,16 +9,16 @@ set -l command3 x extract
 
 #commands
 complete -c zpaq -f -n "not $seen $commands" -a "$commands"
-complete -c zpaq -f -n "not $seen $commands" -a a -d "add"
+complete -c zpaq -f -n "not $seen $commands" -a a -d add
 complete -c zpaq -f -n "not $seen $commands" -a add -d "Append files to archive if dates have changed"
-complete -c zpaq -f -n "not $seen $commands" -a x -d "extract"
+complete -c zpaq -f -n "not $seen $commands" -a x -d extract
 complete -c zpaq -f -n "not $seen $commands" -a extract -d "Extract most recent versions of files"
-complete -c zpaq -f -n "not $seen $commands" -a l -d "list"
+complete -c zpaq -f -n "not $seen $commands" -a l -d list
 complete -c zpaq -f -n "not $seen $commands" -a list -d "List or compare external files to archive"
 
 #options
 complete -c zpaq -x -n "$seen $commands" -o all -a N -d "Extract/list versions in N [4] digit directories"
-complete -c zpaq -f -n "$seen $commands" -s f -d "-force"
+complete -c zpaq -f -n "$seen $commands" -s f -d -force
 complete -c zpaq -f -n "$seen $command1" -o force -d "Append files if contents have changed"
 complete -c zpaq -f -n "$seen $command2" -o force -d "Compare file contents instead of dates"
 complete -c zpaq -f -n "$seen $command3" -o force -d "Overwrite existing output files"
diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index 3221bf9ee..7b1bb9516 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -7,16 +7,16 @@
 set OS ""
 switch (uname)
     case Linux
-        set OS "Linux"
+        set OS Linux
     case Darwin
-        set OS "macOS"
+        set OS macOS
     case FreeBSD
-        set OS "FreeBSD"
+        set OS FreeBSD
     case SunOS
-        set OS "SunOS"
+        set OS SunOS
         # Others?
     case "*"
-        set OS "unknown"
+        set OS unknown
 end
 
 # Does the current invocation need a command?
@@ -43,12 +43,12 @@ function __fish_zpool_list_used_vdevs -a pool
 end
 
 function __fish_zpool_list_available_vdevs
-    if test $OS = 'Linux'
-        find /dev -type b | string replace '/dev/' ''
-    else if test $OS = 'FreeBSD'
+    if test $OS = Linux
+        find /dev -type b | string replace /dev/ ''
+    else if test $OS = FreeBSD
         sysctl -an kern.disks | string split ' '
-    else if test $OS = 'SunOS'
-        find /dev/dsk -type b | string replace '/dev/' ''
+    else if test $OS = SunOS
+        find /dev/dsk -type b | string replace /dev/ ''
     end
 end
 
@@ -119,7 +119,7 @@ function __fish_zpool_list_ro_properties
         echo -e "available\tAvailable space"
         echo -e "avail\tAvailable space"
     end
-    if test $OS = 'SunOS'
+    if test $OS = SunOS
         echo -e "bootsize\tSystem boot partition size"
     end
     echo -e "capacity\tUsage percentage of pool"
@@ -167,39 +167,39 @@ function __fish_zpool_list_rw_properties
     zpool list -o all | string replace -ra ' +' '\n' | string lower | string replace -rf '^feature@(.*)' '$1'
 end
 
-complete -c zpool -f -n '__fish_zpool_needs_command' -s '?' -d 'Display a help message'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'add' -d 'Add new virtual devices to pool'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'attach' -d 'Attach virtual device to a pool device'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'clear' -d 'Clear devices errors in pool'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'create' -d 'Create a new storage pool'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'destroy' -d 'Destroy a storage pool'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'detach' -d 'Detach virtual device from a mirroring pool'
-if test $OS = 'Linux'
-    complete -c zpool -f -n '__fish_zpool_needs_command' -a 'events' -d 'Display pool event log'
+complete -c zpool -f -n __fish_zpool_needs_command -s '?' -d 'Display a help message'
+complete -c zpool -f -n __fish_zpool_needs_command -a add -d 'Add new virtual devices to pool'
+complete -c zpool -f -n __fish_zpool_needs_command -a attach -d 'Attach virtual device to a pool device'
+complete -c zpool -f -n __fish_zpool_needs_command -a clear -d 'Clear devices errors in pool'
+complete -c zpool -f -n __fish_zpool_needs_command -a create -d 'Create a new storage pool'
+complete -c zpool -f -n __fish_zpool_needs_command -a destroy -d 'Destroy a storage pool'
+complete -c zpool -f -n __fish_zpool_needs_command -a detach -d 'Detach virtual device from a mirroring pool'
+if test $OS = Linux
+    complete -c zpool -f -n __fish_zpool_needs_command -a events -d 'Display pool event log'
 end
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'export' -d 'Export a pool'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'get' -d 'Get one or several pool properties'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'history' -d 'Display pool command history'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'import' -d 'List importable pools, or import some'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'iostat' -d 'Display pool I/O stats'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'labelclear' -d 'Remove ZFS label information from the specified device'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'list' -d 'List pools with health status and space usage'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'offline' -d 'Take the specified devices offline'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'online' -d 'Bring the specified devices back online'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'reguid' -d 'Reset pool GUID'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'remove' -d 'Remove virtual devices from pool'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'reopen' -d 'Reopen pool devices'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'replace' -d 'Replace a pool virtual device'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'scrub' -d 'Start or stop scrubbing'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'set' -d 'Set a pool property'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'split' -d 'Create a pool by splitting an existing mirror one'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'status' -d 'Display detailed pool health status'
-complete -c zpool -f -n '__fish_zpool_needs_command' -a 'upgrade' -d 'List upgradeable pools, or upgrade one'
+complete -c zpool -f -n __fish_zpool_needs_command -a export -d 'Export a pool'
+complete -c zpool -f -n __fish_zpool_needs_command -a get -d 'Get one or several pool properties'
+complete -c zpool -f -n __fish_zpool_needs_command -a history -d 'Display pool command history'
+complete -c zpool -f -n __fish_zpool_needs_command -a import -d 'List importable pools, or import some'
+complete -c zpool -f -n __fish_zpool_needs_command -a iostat -d 'Display pool I/O stats'
+complete -c zpool -f -n __fish_zpool_needs_command -a labelclear -d 'Remove ZFS label information from the specified device'
+complete -c zpool -f -n __fish_zpool_needs_command -a list -d 'List pools with health status and space usage'
+complete -c zpool -f -n __fish_zpool_needs_command -a offline -d 'Take the specified devices offline'
+complete -c zpool -f -n __fish_zpool_needs_command -a online -d 'Bring the specified devices back online'
+complete -c zpool -f -n __fish_zpool_needs_command -a reguid -d 'Reset pool GUID'
+complete -c zpool -f -n __fish_zpool_needs_command -a remove -d 'Remove virtual devices from pool'
+complete -c zpool -f -n __fish_zpool_needs_command -a reopen -d 'Reopen pool devices'
+complete -c zpool -f -n __fish_zpool_needs_command -a replace -d 'Replace a pool virtual device'
+complete -c zpool -f -n __fish_zpool_needs_command -a scrub -d 'Start or stop scrubbing'
+complete -c zpool -f -n __fish_zpool_needs_command -a set -d 'Set a pool property'
+complete -c zpool -f -n __fish_zpool_needs_command -a split -d 'Create a pool by splitting an existing mirror one'
+complete -c zpool -f -n __fish_zpool_needs_command -a status -d 'Display detailed pool health status'
+complete -c zpool -f -n __fish_zpool_needs_command -a upgrade -d 'List upgradeable pools, or upgrade one'
 
 # add completions
 complete -c zpool -f -n '__fish_zpool_using_command add' -s f -d 'Force use of virtual device'
 complete -c zpool -f -n '__fish_zpool_using_command add' -s n -d 'Dry run: only display resulting configuration'
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -f -n '__fish_zpool_using_command add' -s g -d 'Display virtual device GUID instead of device name'
     complete -c zpool -f -n '__fish_zpool_using_command add' -s L -d 'Resolve device path symbolic links'
     complete -c zpool -f -n '__fish_zpool_using_command add' -s P -d 'Display device full path'
@@ -210,14 +210,14 @@ complete -c zpool -x -n '__fish_zpool_using_command add' -d 'Virtual device to a
 
 # attach completions
 complete -c zpool -f -n '__fish_zpool_using_command attach' -s f -d 'Force use of virtual device'
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -x -n '__fish_zpool_using_command attach' -s o -d 'Pool property' -a '(__fish_zpool_list_device_properties)'
 end
 complete -c zpool -x -n '__fish_zpool_using_command attach' -d 'Pool to attach virtual device to' -a '(__fish_complete_zfs_pools)'
 complete -c zpool -x -n '__fish_zpool_using_command attach' -d 'Virtual device to operate on' -a '(__fish_zpool_list_available_vdevs)'
 
 # clear completions
-if test $OS = 'FreeBSD'
+if test $OS = FreeBSD
     complete -c zpool -f -n '__fish_zpool_using_command clear' -s F -d 'Initiate recovery mode'
     complete -c zpool -f -n '__fish_zpool_using_command clear; and __fish_contains_opt -s F' -s n -d 'Dry run: only determine if the recovery is possible, without attempting it'
 end
@@ -225,7 +225,7 @@ complete -c zpool -x -n '__fish_zpool_using_command clear' -d 'Pool to clear err
 complete -c zpool -f -n '__fish_zpool_using_command clear' -d 'Virtual device to operate on' -a '(__fish_zpool_list_used_vdevs)'
 
 # create completions
-if test $OS = 'SunOS'
+if test $OS = SunOS
     complete -c zpool -f -n '__fish_zpool_using_command create' -s B -d 'Create whole disk pool with EFI System partition to support booting system with UEFI firmware'
 else
     complete -c zpool -f -n '__fish_zpool_using_command create' -s f -d 'Force use of virtual device'
@@ -236,7 +236,7 @@ complete -c zpool -x -n '__fish_zpool_using_command create' -s o -d 'Pool proper
 complete -c zpool -x -n '__fish_zpool_using_command create' -s O -d 'Root filesystem property' -a '(__fish_complete_zfs_ro_properties; __fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties)'
 complete -c zpool -r -n '__fish_zpool_using_command create' -s R -d 'Equivalent to "-o cachefile=none,altroot=ROOT"'
 complete -c zpool -x -n '__fish_zpool_using_command create' -s m -d 'Root filesystem mountpoint' -a 'legacy none'
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -x -n '__fish_zpool_using_command create' -s t -d 'Set a different in-core pool name'
 end
 complete -c zpool -x -n '__fish_zpool_using_command create' -d 'Virtual device to add' -a '(__fish_zpool_complete_vdevs)'
@@ -250,7 +250,7 @@ complete -c zpool -x -n '__fish_zpool_using_command clear' -d 'Pool to detach de
 complete -c zpool -x -n '__fish_zpool_using_command clear' -d 'Physical device to detach' -a '(__fish_zpool_list_used_vdevs)'
 
 # events completions
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -f -n '__fish_zpool_using_command events' -s v -d 'Print verbose event information'
     complete -c zpool -f -n '__fish_zpool_using_command events' -s H -d 'Print output in a machine-parsable format'
     complete -c zpool -f -n '__fish_zpool_using_command events' -s f -d 'Output appended data as the log grows'
@@ -259,7 +259,7 @@ if test $OS = 'Linux'
 end
 
 # export completions
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -f -n '__fish_zpool_using_command export' -s a -d 'Export all pools'
 end
 complete -c zpool -f -n '__fish_zpool_using_command export' -s f -d 'Force unmounting of all contained datasets'
@@ -292,7 +292,7 @@ complete -c zpool -f -n '__fish_zpool_using_command import' -s m -d 'Ignore miss
 complete -c zpool -r -n '__fish_zpool_using_command import' -s R -d 'Equivalent to "-o cachefile=none,altroot=ROOT"'
 complete -c zpool -f -n '__fish_zpool_using_command import' -s N -d 'Do not mount contained filesystems'
 complete -c zpool -f -n '__fish_zpool_using_command import; and __fish_contains_opt -s F' -s n -d 'Dry run: only determine if the recovery is possible, without attempting it'
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -f -n '__fish_zpool_using_command import; and __fish_contains_opt -s F' -s X -d 'Roll back to a previous TXG (hazardous)'
     complete -c zpool -r -n '__fish_zpool_using_command import' -s T -d 'TXG to roll back to (implies -FX)'
     complete -c zpool -f -n '__fish_zpool_using_command import' -s t -d 'Specify, as the last argument, a temporary pool name'
@@ -301,7 +301,7 @@ complete -c zpool -f -n '__fish_zpool_using_command import; and __fish_not_conta
 
 # iostat completions
 complete -c zpool -x -n '__fish_zpool_using_command iostat' -s T -d 'Display a timestamp using specified format'
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -f -n '__fish_zpool_using_command iostat' -s g -d 'Display virtual device GUID instead of device name'
     complete -c zpool -f -n '__fish_zpool_using_command iostat' -s L -d 'Resolve device path symbolic links'
     complete -c zpool -f -n '__fish_zpool_using_command iostat' -s P -d 'Display device full path'
@@ -316,7 +316,7 @@ complete -c zpool -x -n '__fish_zpool_using_command labelclear' -d 'Device to cl
 
 # list completions
 complete -c zpool -f -n '__fish_zpool_using_command list' -s H -d 'Print output in a machine-parsable format'
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -f -n '__fish_zpool_using_command list' -s g -d 'Display virtual device GUID instead of device name'
     complete -c zpool -f -n '__fish_zpool_using_command list' -s L -d 'Resolve device path symbolic links'
 end
@@ -348,7 +348,7 @@ complete -c zpool -x -n '__fish_zpool_using_command reopen' -d 'Pool which devic
 
 # replace completions
 complete -c zpool -f -n '__fish_zpool_using_command replace' -s f -d 'Force use of virtual device'
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -x -n '__fish_zpool_using_command replace' -s o -d 'Pool property' -a '(__fish_zpool_list_device_properties)'
 end
 complete -c zpool -x -n '__fish_zpool_using_command replace' -d 'Pool to replace device' -a '(__fish_complete_zfs_pools)'
@@ -357,7 +357,7 @@ complete -c zpool -f -n '__fish_zpool_using_command replace' -d 'Device to use f
 
 # scrub completions
 complete -c zpool -f -n '__fish_zpool_using_command scrub' -s s -d 'Stop scrubbing'
-if test $OS = 'SunOS'
+if test $OS = SunOS
     complete -c zpool -f -n '__fish_zpool_using_command scrub' -s p -d 'Pause scrubbing'
 end
 complete -c zpool -x -n '__fish_zpool_using_command scrub' -d 'Pool to start/stop scrubbing' -a '(__fish_complete_zfs_pools)'
@@ -367,7 +367,7 @@ complete -c zpool -x -n '__fish_zpool_using_command set' -d 'Property to set' -a
 complete -c zpool -x -n '__fish_zpool_using_command set' -d 'Pool which property is to be set' -a '(__fish_complete_zfs_pools)'
 
 # split completions
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -f -n '__fish_zpool_using_command split' -s g -d 'Display virtual device GUID instead of device name'
     complete -c zpool -f -n '__fish_zpool_using_command split' -s L -d 'Resolve device path symbolic links'
     complete -c zpool -f -n '__fish_zpool_using_command split' -s P -d 'Display device full path'
@@ -375,18 +375,18 @@ end
 complete -c zpool -f -n '__fish_zpool_using_command split' -s n -d 'Dry run: only display resulting configuration'
 complete -c zpool -r -n '__fish_zpool_using_command split' -s R -d 'Set altroot for newpool and automatically import it'
 complete -c zpool -x -n '__fish_zpool_using_command split' -s o -d 'Pool property' -a '(__fish_zpool_list_writeonce_properties; __fish_zpool_list_rw_properties)'
-if test $OS = 'FreeBSD'
+if test $OS = FreeBSD
     complete -c zpool -x -n '__fish_zpool_using_command split; and __fish_contains_opt -s R' -s o -d 'Mount properties for contained datasets' -a '(__fish_append , (__fish_complete_zfs_mountpoint_properties))'
 end
 complete -c zpool -x -n '__fish_zpool_using_command split' -d 'Pool to split' -a '(__fish_complete_zfs_pools)'
 
 # status completions
-if test $OS = 'Linux'
+if test $OS = Linux
     complete -c zpool -f -n '__fish_zpool_using_command status' -s g -d 'Display virtual device GUID instead of device name'
     complete -c zpool -f -n '__fish_zpool_using_command status' -s L -d 'Resolve device path symbolic links'
     complete -c zpool -f -n '__fish_zpool_using_command status' -s P -d 'Display device full path'
     complete -c zpool -f -n '__fish_zpool_using_command status' -s D -d 'Display deduplication histogram'
-else if test $OS = 'SunOS'
+else if test $OS = SunOS
     complete -c zpool -f -n '__fish_zpool_using_command status' -s D -d 'Display deduplication histogram'
 end
 complete -c zpool -f -n '__fish_zpool_using_command status' -s v -d 'Verbose mode'
diff --git a/share/completions/zstd.fish b/share/completions/zstd.fish
index 66944da1a..528f983ea 100644
--- a/share/completions/zstd.fish
+++ b/share/completions/zstd.fish
@@ -1,7 +1,7 @@
 # Completions for zstd
 
 complete -c zstd -s z -l compress -d "Compress (default)"
-complete -c zstd -s d -l decompress -l uncompress -d "Decompress" -x -a "
+complete -c zstd -s d -l decompress -l uncompress -d Decompress -x -a "
 (
     __fish_complete_suffix .zst
 )
diff --git a/share/completions/zstdmt.fish b/share/completions/zstdmt.fish
index ed813bc1f..672dc5659 100644
--- a/share/completions/zstdmt.fish
+++ b/share/completions/zstdmt.fish
@@ -1,7 +1,7 @@
 # Completions for zstdmt
 
 complete -c zstdmt -s z -l compress -d "Compress (default)"
-complete -c zstdmt -s d -l decompress -l uncompress -d "Decompress" -x -a "
+complete -c zstdmt -s d -l decompress -l uncompress -d Decompress -x -a "
 (
     __fish_complete_suffix .zst
 )
diff --git a/share/completions/zypper.fish b/share/completions/zypper.fish
index be8365b99..a22efd8c3 100644
--- a/share/completions/zypper.fish
+++ b/share/completions/zypper.fish
@@ -37,7 +37,7 @@ function __fish_zypper_not_use_file
 end
 
 function __fish_zypper_print_repos
-    argparse 'e/enabled' -- $argv
+    argparse e/enabled -- $argv
     set -q _flag_e; and set -l enabled -E
     set -l zypper_lr (zypper -t lr $enabled)
     # Because spaces and special characters are allowed in repo aliases (bad
@@ -55,12 +55,12 @@ function __fish_zypper_print_packages
     set -l args (commandline -poc)
     while set -q args[1]
         switch $args[1]
-            case '-t' '--type'
+            case -t --type
                 set -e args[1]
                 if contains -- $args[1] $__fish_zypper_package_types
                     set type $args[1]
                 end
-            case '-r' '--repo' '--from'
+            case -r --repo --from
                 set -e args[1]
                 if contains -- $args[1] (__fish_zypper_print_repos -e | string replace -r '^(.+)\t.*$' '$1')
                     set repo $repo $args[1]
@@ -79,392 +79,392 @@ function __fish_zypper_print_packages
 
     if test -z "$type"
         cat $idx | string replace -rf '^([^\t]+)\t.*\t.*$' '$1'
-    else if test "$type" = "package"
+    else if test "$type" = package
         cat $idx | string match -rv '^('(string join \| $__fish_zypper_package_types)'):' | string replace -rf '^([^\t]+)\t.*\t.*$' '$1'
     else
         cat $idx | string replace -rf "^$type"':([^\t]+)\t.*\t.*$' '$1\t'"$type"
     end
 end
 
-complete -n '__fish_zypper_use_pkg' -c zypper -a '(__fish_zypper_print_packages)' -d 'Package'
-complete -f -n '__fish_zypper_use_repo' -c zypper -a '(__fish_zypper_print_repos)' -d 'Repo'
-complete -f -n '__fish_zypper_not_use_file' -c zypper
+complete -n __fish_zypper_use_pkg -c zypper -a '(__fish_zypper_print_packages)' -d Package
+complete -f -n __fish_zypper_use_repo -c zypper -a '(__fish_zypper_print_repos)' -d Repo
+complete -f -n __fish_zypper_not_use_file -c zypper
 
 # Commands:
 
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?' -d 'Print help'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'shell sh' -d 'Accept multiple commands at once'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'help ?' -d 'Print help'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'shell sh' -d 'Accept multiple commands at once'
 
 #  Repository Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr' -d 'List all defined repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar' -d 'Add a new repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removerepo rr' -d 'Remove specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'renamerepo nr' -d 'Rename specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyrepo mr' -d 'Modify specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref' -d 'Refresh all repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc' -d 'Clean local caches'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'repos lr' -d 'List all defined repositories'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'addrepo ar' -d 'Add a new repository'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'removerepo rr' -d 'Remove specified repository'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'renamerepo nr' -d 'Rename specified repository'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'modifyrepo mr' -d 'Modify specified repository'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'refresh ref' -d 'Refresh all repositories'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'clean cc' -d 'Clean local caches'
 
 #  Service Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls' -d 'List all defined services'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as' -d 'Add a new service'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyservice ms' -d 'Modify specified service'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removeservice rs' -d 'Remove specified service'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh-services refs' -d 'Refresh all services'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'services ls' -d 'List all defined services'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'addservice as' -d 'Add a new service'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'modifyservice ms' -d 'Modify specified service'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'removeservice rs' -d 'Remove specified service'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'refresh-services refs' -d 'Refresh all services'
 
 #  Software Management:
-complete -n '__fish_zypper_no_subcommand' -c zypper -a 'install in' -d 'Install packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm' -d 'Remove packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve' -d 'Verify integrity of package dependencies'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-install si' -d 'Install source packages and their build dependencies'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install-new-recommends inr' -d 'Install newly added packages recommended by installed packages'
+complete -n __fish_zypper_no_subcommand -c zypper -a 'install in' -d 'Install packages'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'remove rm' -d 'Remove packages'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'verify ve' -d 'Verify integrity of package dependencies'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'source-install si' -d 'Install source packages and their build dependencies'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'install-new-recommends inr' -d 'Install newly added packages recommended by installed packages'
 
 #  Update Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up' -d 'Update installed packages with newer versions'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu' -d 'List available updates'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch' -d 'Install needed patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp' -d 'List needed patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'dist-upgrade dup' -d 'Perform a distribution upgrade'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-check pchk' -d 'Check for patches'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'update up' -d 'Update installed packages with newer versions'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'list-updates lu' -d 'List available updates'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a patch -d 'Install needed patches'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'list-patches lp' -d 'List needed patches'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'dist-upgrade dup' -d 'Perform a distribution upgrade'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'patch-check pchk' -d 'Check for patches'
 
 #  Querying:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se' -d 'Search for packages matching a pattern'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if' -d 'Show full information for specified packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info' -d 'Show full information for specified patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info' -d 'Show full information for specified patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info' -d 'Show full information for specified products'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch' -d 'List all available patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa' -d 'List all available packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt' -d 'List all available patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd' -d 'List all available products'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'what-provides wp' -d 'List packages providing specified capability'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'search se' -d 'Search for packages matching a pattern'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'info if' -d 'Show full information for specified packages'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a patch-info -d 'Show full information for specified patches'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a pattern-info -d 'Show full information for specified patterns'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a product-info -d 'Show full information for specified products'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'patches pch' -d 'List all available patches'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'packages pa' -d 'List all available packages'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'patterns pt' -d 'List all available patterns'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'products pd' -d 'List all available products'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'what-provides wp' -d 'List packages providing specified capability'
 
 #  Package Locks:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al' -d 'Add a package lock'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelock rl' -d 'Remove a package lock'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll' -d 'List current package locks'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'cleanlocks cl' -d 'Remove unused locks'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'addlock al' -d 'Add a package lock'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'removelock rl' -d 'Remove a package lock'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'locks ll' -d 'List current package locks'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'cleanlocks cl' -d 'Remove unused locks'
 
 #  Locale Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locales lloc' -d 'List requested locales (languages codes)'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlocale aloc' -d 'Add locale(s) to requested locales'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelocale rloc' -d 'Remove locale(s) from requested locales'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'locales lloc' -d 'List requested locales (languages codes)'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'addlocale aloc' -d 'Add locale(s) to requested locales'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'removelocale rloc' -d 'Remove locale(s) from requested locales'
 
 #  Other Commands:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'versioncmp vcmp' -d 'Compare two version strings'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos' -d 'Print the target operating system ID string'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses' -d 'Print report about licenses and EULAs of installed packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'download' -d 'Download rpms specified on the commandline to a local directory'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-download' -d 'Download source rpms for all installed packages to a local directory'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'needs-rebooting' -d 'Check if the needs-reboot flag was set'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'ps' -d 'List running processes which might still use files and libraries deleted by recent upgrades'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'versioncmp vcmp' -d 'Compare two version strings'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a 'targetos tos' -d 'Print the target operating system ID string'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a licenses -d 'Print report about licenses and EULAs of installed packages'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a download -d 'Download rpms specified on the commandline to a local directory'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a source-download -d 'Download source rpms for all installed packages to a local directory'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a needs-rebooting -d 'Check if the needs-reboot flag was set'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a ps -d 'List running processes which might still use files and libraries deleted by recent upgrades'
 
 #  Subcommands:
 
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'subcommand' -d 'Lists available subcommands'
+complete -f -n __fish_zypper_no_subcommand -c zypper -a subcommand -d 'Lists available subcommands'
 
 # Global Options:
 
-complete -c zypper -n '__fish_zypper_no_subcommand' -l help -s h -d 'Help'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l version -s V -d 'Output the version number'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids -d 'Output a list of zypper user prompts'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l config -r -s c -d 'Use specified config file instead of the default'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata -d 'User defined transaction id used in history and plugins'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet -s q -d 'Suppress normal output, print only error messages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose -s v -d 'Increase verbosity'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev -s A -d 'Do not abbreviate text in tables'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style -s s -d 'Table style (integer)'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible -s r -d 'Turn on rug compatibility'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive -s n -d 'Do not ask anything, use default answers automatically'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive-include-reboot-patches -d 'Do not treat patches as interactive, which have the rebootSuggested-flag set'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout -s x -d 'Switch to XML output'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown -s i -d 'Ignore unknown packages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l terse -s t -d 'Terse output for machine consumption. Implies --no-abbrev and --no-color'
+complete -c zypper -n __fish_zypper_no_subcommand -l help -s h -d Help
+complete -c zypper -n __fish_zypper_no_subcommand -l version -s V -d 'Output the version number'
+complete -c zypper -n __fish_zypper_no_subcommand -l promptids -d 'Output a list of zypper user prompts'
+complete -c zypper -n __fish_zypper_no_subcommand -l config -r -s c -d 'Use specified config file instead of the default'
+complete -c zypper -n __fish_zypper_no_subcommand -l userdata -d 'User defined transaction id used in history and plugins'
+complete -c zypper -n __fish_zypper_no_subcommand -l quiet -s q -d 'Suppress normal output, print only error messages'
+complete -c zypper -n __fish_zypper_no_subcommand -l verbose -s v -d 'Increase verbosity'
+complete -c zypper -n __fish_zypper_no_subcommand -l no-abbrev -s A -d 'Do not abbreviate text in tables'
+complete -c zypper -n __fish_zypper_no_subcommand -l table-style -s s -d 'Table style (integer)'
+complete -c zypper -n __fish_zypper_no_subcommand -l rug-compatible -s r -d 'Turn on rug compatibility'
+complete -c zypper -n __fish_zypper_no_subcommand -l non-interactive -s n -d 'Do not ask anything, use default answers automatically'
+complete -c zypper -n __fish_zypper_no_subcommand -l non-interactive-include-reboot-patches -d 'Do not treat patches as interactive, which have the rebootSuggested-flag set'
+complete -c zypper -n __fish_zypper_no_subcommand -l xmlout -s x -d 'Switch to XML output'
+complete -c zypper -n __fish_zypper_no_subcommand -l ignore-unknown -s i -d 'Ignore unknown packages'
+complete -c zypper -n __fish_zypper_no_subcommand -l terse -s t -d 'Terse output for machine consumption. Implies --no-abbrev and --no-color'
 
-complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D -r -d 'Use alternative repository definition file directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir -s C -r -d 'Use alternative directory for all caches'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir -r -d 'Use alternative raw meta-data cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir -r -d 'Use alternative solv file cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir -r -d 'Use alternative package cache directory'
+complete -c zypper -n __fish_zypper_no_subcommand -l reposd-dir -s D -r -d 'Use alternative repository definition file directory'
+complete -c zypper -n __fish_zypper_no_subcommand -l cache-dir -s C -r -d 'Use alternative directory for all caches'
+complete -c zypper -n __fish_zypper_no_subcommand -l raw-cache-dir -r -d 'Use alternative raw meta-data cache directory'
+complete -c zypper -n __fish_zypper_no_subcommand -l solv-cache-dir -r -d 'Use alternative solv file cache directory'
+complete -c zypper -n __fish_zypper_no_subcommand -l pkg-cache-dir -r -d 'Use alternative package cache directory'
 
 #  Repository Options
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks -d 'Ignore GPG check failures and continue'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l gpg-auto-import-keys -d 'Automatically trust and import new repository signing keys'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo -s p -rf -d 'Use an additional repository'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-content -s p -rf -d 'Additionally use disabled repositories providing a specific keyword'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-repositories -d 'Do not read meta-data from repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh -d 'Do not refresh the repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd -d 'Ignore CD/DVD repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote -d 'Ignore remote repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l releasever -d 'Set the value of $releasever in all .repo files'
+complete -c zypper -n __fish_zypper_no_subcommand -l no-gpg-checks -d 'Ignore GPG check failures and continue'
+complete -c zypper -n __fish_zypper_no_subcommand -l gpg-auto-import-keys -d 'Automatically trust and import new repository signing keys'
+complete -c zypper -n __fish_zypper_no_subcommand -l plus-repo -s p -rf -d 'Use an additional repository'
+complete -c zypper -n __fish_zypper_no_subcommand -l plus-content -s p -rf -d 'Additionally use disabled repositories providing a specific keyword'
+complete -c zypper -n __fish_zypper_no_subcommand -l disable-repositories -d 'Do not read meta-data from repositories'
+complete -c zypper -n __fish_zypper_no_subcommand -l no-refresh -d 'Do not refresh the repositories'
+complete -c zypper -n __fish_zypper_no_subcommand -l no-cd -d 'Ignore CD/DVD repositories'
+complete -c zypper -n __fish_zypper_no_subcommand -l no-remote -d 'Ignore remote repositories'
+complete -c zypper -n __fish_zypper_no_subcommand -l releasever -d 'Set the value of $releasever in all .repo files'
 
 #  Target Options
-complete -c zypper -n '__fish_zypper_no_subcommand' -l root -s R -r -d 'Operate on a different root directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l installroot -r -d 'Operate on a different root directory, but share repositories with the host'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-system-resolvables -d 'Do not read installed packages'
+complete -c zypper -n __fish_zypper_no_subcommand -l root -s R -r -d 'Operate on a different root directory'
+complete -c zypper -n __fish_zypper_no_subcommand -l installroot -r -d 'Operate on a different root directory, but share repositories with the host'
+complete -c zypper -n __fish_zypper_no_subcommand -l disable-system-resolvables -d 'Do not read installed packages'
 
 function __fish_zypper_is_subcommand_lr
     __fish_zypper_cmd_in_array repos lr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export -r -s e -d 'Export all defined repositories as a single local .repo file'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias -s a -d 'Show also repository alias'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name -s n -d 'Show also repository name'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh -s r -d 'Show also the autorefresh flag'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri -s u -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority -s p -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details -s d -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service -s s -d 'Show also alias of parent service'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri -s U -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name -s N -d 'Sort the list by name'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority -s P -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias -s A -d 'Sort the list by alias'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l export -r -s e -d 'Export all defined repositories as a single local .repo file'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l alias -s a -d 'Show also repository alias'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l name -s n -d 'Show also repository name'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l refresh -s r -d 'Show also the autorefresh flag'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l uri -s u -d 'Show also base URI of repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l priority -s p -d 'Show also repository priority'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l details -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l service -s s -d 'Show also alias of parent service'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l show-enabled-only -s E -d 'Show enabled repos only'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l sort-by-uri -s U -d 'Sort the list by URI'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l sort-by-name -s N -d 'Sort the list by name'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l sort-by-priority -s P -d 'Sort the list by repository priority'
+complete -c zypper -n __fish_zypper_is_subcommand_lr -l sort-by-alias -s A -d 'Sort the list by alias'
 
 function __fish_zypper_is_subcommand_ar
     __fish_zypper_cmd_in_array addrepo ar
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo -r -s r -d 'Just another means to specify a .repo file to read'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check -s c -d 'Probe URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check -s C -d "Don't probe URI, probe later during refresh"
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority -s p -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages -s k -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages -s K -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck -s g -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l default-gpgcheck -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name -r -s n -d 'Specify descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l enable -s d -d 'Add the repository as enabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable -s d -d 'Add the repository as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh -s f -d 'Enable autorefresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-refresh -s F -d 'Disable autorefresh of the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l repo -r -s r -d 'Just another means to specify a .repo file to read'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l check -s c -d 'Probe URI'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l no-check -s C -d "Don't probe URI, probe later during refresh"
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l priority -s p -d 'Set the priority of the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l keep-packages -s k -d 'Enable RPM files caching'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l no-keep-packages -s K -d 'Disable RPM files caching'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l gpgcheck -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l default-gpgcheck -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l name -r -s n -d 'Specify descriptive name for the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l enable -s d -d 'Add the repository as enabled'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l disable -s d -d 'Add the repository as disabled'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l refresh -s f -d 'Enable autorefresh of the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_ar -l no-refresh -s F -d 'Disable autorefresh of the repository'
 
 function __fish_zypper_is_subcommand_rr
     __fish_zypper_cmd_in_array removerepo rr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth -d 'Ignore user authentication data in the URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-query -d 'Ignore query string in the URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l all -s a -d 'Apply changes to all repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l local -s l -d 'Apply changes to all local repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l remote -s t -d 'Apply changes to all remote repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l medium-type -r -s m -d 'Apply changes to repositories of specified type'
+complete -c zypper -n __fish_zypper_is_subcommand_rr -l loose-auth -d 'Ignore user authentication data in the URI'
+complete -c zypper -n __fish_zypper_is_subcommand_rr -l loose-query -d 'Ignore query string in the URI'
+complete -c zypper -n __fish_zypper_is_subcommand_rr -l all -s a -d 'Apply changes to all repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_rr -l local -s l -d 'Apply changes to all local repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_rr -l remote -s t -d 'Apply changes to all remote repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_rr -l medium-type -r -s m -d 'Apply changes to repositories of specified type'
 
 function __fish_zypper_is_subcommand_mr
     __fish_zypper_cmd_in_array modifyrepo mr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name -r -s n -d 'Set a descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable -s d -d "Disable the repository"
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable -s e -d 'Enable the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh -s f -d 'Enable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh -s F -d 'Disable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority -r -s p -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages -s k -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages -s K -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck -s g -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l default-gpgcheck -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all -s a -d 'Apply changes to all repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local -s l -d 'Apply changes to all local repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote -s t -d 'Apply changes to all remote repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type -r -s m -d 'Apply changes to repositories of specified type'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l name -r -s n -d 'Set a descriptive name for the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l disable -s d -d "Disable the repository"
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l enable -s e -d 'Enable the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l refresh -s f -d 'Enable auto-refresh of the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l no-refresh -s F -d 'Disable auto-refresh of the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l priority -r -s p -d 'Set the priority of the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l keep-packages -s k -d 'Enable RPM files caching'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l no-keep-packages -s K -d 'Disable RPM files caching'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l gpgcheck -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l default-gpgcheck -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l all -s a -d 'Apply changes to all repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l local -s l -d 'Apply changes to all local repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l remote -s t -d 'Apply changes to all remote repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_mr -l medium-type -r -s m -d 'Apply changes to repositories of specified type'
 
 function __fish_zypper_is_subcommand_ref
     __fish_zypper_cmd_in_array refresh ref
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force -s f -d 'Force a complete refresh'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build -s b -d 'Force rebuild of the database'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-download -s d -d 'Force download of raw metadata'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only -s B -d "Only build the database, don't download metadata"
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only -s D -d "Only download raw metadata, don't build the database"
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Refresh only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services -s s -d 'Refresh also services before refreshing repos'
+complete -c zypper -n __fish_zypper_is_subcommand_ref -l force -s f -d 'Force a complete refresh'
+complete -c zypper -n __fish_zypper_is_subcommand_ref -l force-build -s b -d 'Force rebuild of the database'
+complete -c zypper -n __fish_zypper_is_subcommand_ref -l force-download -s d -d 'Force download of raw metadata'
+complete -c zypper -n __fish_zypper_is_subcommand_ref -l build-only -s B -d "Only build the database, don't download metadata"
+complete -c zypper -n __fish_zypper_is_subcommand_ref -l download-only -s D -d "Only download raw metadata, don't build the database"
+complete -c zypper -n __fish_zypper_is_subcommand_ref -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Refresh only specified repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_ref -l services -s s -d 'Refresh also services before refreshing repos'
 
 function __fish_zypper_is_subcommand_ls
     __fish_zypper_cmd_in_array services ls
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri -s u -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority -s p -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details -s d -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos -s r -d 'Show also repositories belonging to the services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority -s P -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri -s U -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name -s N -d 'Sort the list by name'
+complete -c zypper -n __fish_zypper_is_subcommand_ls -l uri -s u -d 'Show also base URI of repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_ls -l priority -s p -d 'Show also repository priority'
+complete -c zypper -n __fish_zypper_is_subcommand_ls -l details -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n __fish_zypper_is_subcommand_ls -l with-repos -s r -d 'Show also repositories belonging to the services'
+complete -c zypper -n __fish_zypper_is_subcommand_ls -l show-enabled-only -s E -d 'Show enabled repos only'
+complete -c zypper -n __fish_zypper_is_subcommand_ls -l sort-by-priority -s P -d 'Sort the list by repository priority'
+complete -c zypper -n __fish_zypper_is_subcommand_ls -l sort-by-uri -s U -d 'Sort the list by URI'
+complete -c zypper -n __fish_zypper_is_subcommand_ls -l sort-by-name -s N -d 'Sort the list by name'
 
 function __fish_zypper_is_subcommand_as
     __fish_zypper_cmd_in_array addservice as
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name -r -s n -d 'Set a descriptive name for the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l enable -s d -d 'Add the service as enabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l disable -s d -d 'Add the service as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l refresh -s f -d 'Enable autorefresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l no-refresh -s F -d 'Disable autorefresh of the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_as -l name -r -s n -d 'Set a descriptive name for the service'
+complete -c zypper -n __fish_zypper_is_subcommand_as -l enable -s d -d 'Add the service as enabled'
+complete -c zypper -n __fish_zypper_is_subcommand_as -l disable -s d -d 'Add the service as disabled'
+complete -c zypper -n __fish_zypper_is_subcommand_as -l refresh -s f -d 'Enable autorefresh of the repository'
+complete -c zypper -n __fish_zypper_is_subcommand_as -l no-refresh -s F -d 'Disable autorefresh of the repository'
 
 function __fish_zypper_is_subcommand_ms
     __fish_zypper_cmd_in_array modifyservice ms
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name -r -s n -d 'Set a descriptive name for the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable -s e -d 'Enable a disabled service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable -s d -d "Disable the service (but don't remove it)"
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh -s r -d 'Enable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh -s R -d 'Disable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all -s a -d 'Apply changes to all services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local -s l -d 'Apply changes to all local services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote -s t -d 'Apply changes to all remote services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type -s m -d 'Apply changes to services of specified type'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l name -r -s n -d 'Set a descriptive name for the service'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l enable -s e -d 'Enable a disabled service'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l disable -s d -d "Disable the service (but don't remove it)"
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l refresh -s r -d 'Enable auto-refresh of the service'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l no-refresh -s R -d 'Disable auto-refresh of the service'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l all -s a -d 'Apply changes to all services'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l local -s l -d 'Apply changes to all local services'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l remote -s t -d 'Apply changes to all remote services'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l medium-type -s m -d 'Apply changes to services of specified type'
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable -r -s i -d 'Add a RIS service repository to enable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-disable -r -s I -d 'Add a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable -r -s j -d 'Remove a RIS service repository to enable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-disable -r -s J -d 'Remove a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable -s k -d 'Clear the list of RIS repositories to enable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-disable -s K -d 'Clear the list of RIS repositories to disable'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l ar-to-enable -r -s i -d 'Add a RIS service repository to enable'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l ar-to-disable -r -s I -d 'Add a RIS service repository to disable'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l rr-to-enable -r -s j -d 'Remove a RIS service repository to enable'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l rr-to-disable -r -s J -d 'Remove a RIS service repository to disable'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l cl-to-enable -s k -d 'Clear the list of RIS repositories to enable'
+complete -c zypper -n __fish_zypper_is_subcommand_ms -l cl-to-disable -s K -d 'Clear the list of RIS repositories to disable'
 
 function __fish_zypper_is_subcommand_rs
     __fish_zypper_cmd_in_array removeservice rs
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rs' -l loose-auth -d 'Ignore user authentication data in the URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_rs' -l loose-query -d 'Ignore query string in the URI'
+complete -c zypper -n __fish_zypper_is_subcommand_rs -l loose-auth -d 'Ignore user authentication data in the URI'
+complete -c zypper -n __fish_zypper_is_subcommand_rs -l loose-query -d 'Ignore query string in the URI'
 
 function __fish_zypper_is_subcommand_refs
     __fish_zypper_cmd_in_array refresh-services refs
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l force -s f -d 'Force a complete refresh'
-complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l with-repos -s r -d 'Refresh also repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l restore-status -s R -d 'Also restore service repositories enabled/disabled state'
+complete -c zypper -n __fish_zypper_is_subcommand_refs -l force -s f -d 'Force a complete refresh'
+complete -c zypper -n __fish_zypper_is_subcommand_refs -l with-repos -s r -d 'Refresh also repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_refs -l restore-status -s R -d 'Also restore service repositories enabled/disabled state'
 
 function __fish_zypper_subcommand_has_solver_expert_options
     __fish_zypper_cmd_in_array install in verify ve source-install si install-new-recommends inr update up dist-upgrade dup patch
 end
 
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l debug-solver -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l solver-focus -rf -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l recommends -d 'Install also recommended packages in addition to the required'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-recommends -d 'Do not install recommended packages, only required'
+complete -c zypper -n __fish_zypper_subcommand_has_solver_expert_options -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n __fish_zypper_subcommand_has_solver_expert_options -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n __fish_zypper_subcommand_has_solver_expert_options -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
+complete -c zypper -n __fish_zypper_subcommand_has_solver_expert_options -l solver-focus -rf -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
+complete -c zypper -n __fish_zypper_subcommand_has_solver_expert_options -l recommends -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n __fish_zypper_subcommand_has_solver_expert_options -l no-recommends -d 'Do not install recommended packages, only required'
 
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-downgrade -l no-allow-downgrade -d 'Whether to allow downgrading installed resolvables'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-name-change -l no-allow-name-change -d 'Whether to allow changing the names of installed resolvables'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-arch-change -l no-allow-arch-change -d 'Whether to allow changing the architecture of installed resolvables'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-vendor-change -l no-allow-vendor-change -d 'Whether to allow changing the vendor of installed resolvables'
+complete -c zypper -n __fish_zypper_subcommand_has_solver_expert_options -l allow-downgrade -l no-allow-downgrade -d 'Whether to allow downgrading installed resolvables'
+complete -c zypper -n __fish_zypper_subcommand_has_solver_expert_options -l allow-name-change -l no-allow-name-change -d 'Whether to allow changing the names of installed resolvables'
+complete -c zypper -n __fish_zypper_subcommand_has_solver_expert_options -l allow-arch-change -l no-allow-arch-change -d 'Whether to allow changing the architecture of installed resolvables'
+complete -c zypper -n __fish_zypper_subcommand_has_solver_expert_options -l allow-vendor-change -l no-allow-vendor-change -d 'Whether to allow changing the vendor of installed resolvables'
 
 function __fish_zypper_is_subcommand_in
     __fish_zypper_cmd_in_array install in
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name -s n -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability -s C -d 'Select packages by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l details -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l from -rf -a "(__fish_zypper_print_repos -e)" -d 'Select packages from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage -d 'Allow to replace a newer item with an older one.'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l allow-unsigned-rpm -d 'Silently install unsigned rpm packages given as commandline parameters'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-confirm -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run -s D -d 'Test the installation, do not actually install'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l name -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l capability -s C -d 'Select packages by capability'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l details -d 'Show the detailed installation summary'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l from -rf -a "(__fish_zypper_print_repos -e)" -d 'Select packages from the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l oldpackage -d 'Allow to replace a newer item with an older one.'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l allow-unsigned-rpm -d 'Silently install unsigned rpm packages given as commandline parameters'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l force -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l dry-run -s D -d 'Test the installation, do not actually install'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
+complete -c zypper -n __fish_zypper_is_subcommand_in -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n __fish_zypper_is_subcommand_in -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_rm
     __fish_zypper_cmd_in_array remove rm
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name -s n -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability -s C -d 'Select packages by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l details -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-confirm -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run -s D -d 'Test the removal, do not actually remove'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps -s u -d 'Automatically remove unneeded dependencies'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-clean-deps -s U -d 'No automatic removal of unneeded dependencies'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l name -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l capability -s C -d 'Select packages by capability'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l details -d 'Show the detailed installation summary'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l dry-run -s D -d 'Test the removal, do not actually remove'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l clean-deps -s u -d 'Automatically remove unneeded dependencies'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l no-clean-deps -s U -d 'No automatic removal of unneeded dependencies'
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l debug-solver -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l solver-focus -rf -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
+complete -c zypper -n __fish_zypper_is_subcommand_rm -l solver-focus -rf -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
 
 function __fish_zypper_is_subcommand_ve
     __fish_zypper_cmd_in_array verify ve
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l details -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run -s D -d 'Test the repair, do not actually do anything to the system'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n __fish_zypper_is_subcommand_ve -l details -d 'Show the detailed installation summary'
+complete -c zypper -n __fish_zypper_is_subcommand_ve -l dry-run -s D -d 'Test the repair, do not actually do anything to the system'
+complete -c zypper -n __fish_zypper_is_subcommand_ve -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n __fish_zypper_is_subcommand_ve -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n __fish_zypper_is_subcommand_ve -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_ve -l no-confirm -s y -d 'Don\'t require user interaction'
 
 function __fish_zypper_is_subcommand_si
     __fish_zypper_cmd_in_array source-install si
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l build-deps-only -s d -d 'Install only build dependencies of specified packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps -s D -d "Don't install build dependencies"
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Install packages only from specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n __fish_zypper_is_subcommand_si -l build-deps-only -s d -d 'Install only build dependencies of specified packages'
+complete -c zypper -n __fish_zypper_is_subcommand_si -l no-build-deps -s D -d "Don't install build dependencies"
+complete -c zypper -n __fish_zypper_is_subcommand_si -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Install packages only from specified repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_si -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n __fish_zypper_is_subcommand_si -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_inr
     __fish_zypper_cmd_in_array install-new-recommends inr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l details -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l dry-run -s D -d 'Test the installation, do not actually install'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_inr -l details -d 'Show the detailed installation summary'
+complete -c zypper -n __fish_zypper_is_subcommand_inr -l dry-run -s D -d 'Test the installation, do not actually install'
+complete -c zypper -n __fish_zypper_is_subcommand_inr -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n __fish_zypper_is_subcommand_inr -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n __fish_zypper_is_subcommand_inr -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repositories'
 
 function __fish_zypper_is_subcommand_up
     __fish_zypper_cmd_in_array update up
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l details -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-confirm -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l with-interactive -d 'Do not skip interactive updates'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive -d 'Skip interactive updates'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run -s D -d 'Test the update, do not actually update'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n __fish_zypper_is_subcommand_up -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n __fish_zypper_is_subcommand_up -l details -d 'Show the detailed installation summary'
+complete -c zypper -n __fish_zypper_is_subcommand_up -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
+complete -c zypper -n __fish_zypper_is_subcommand_up -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n __fish_zypper_is_subcommand_up -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_up -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n __fish_zypper_is_subcommand_up -l with-interactive -d 'Do not skip interactive updates'
+complete -c zypper -n __fish_zypper_is_subcommand_up -l skip-interactive -d 'Skip interactive updates'
+complete -c zypper -n __fish_zypper_is_subcommand_up -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
+complete -c zypper -n __fish_zypper_is_subcommand_up -l dry-run -s D -d 'Test the update, do not actually update'
+complete -c zypper -n __fish_zypper_is_subcommand_up -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n __fish_zypper_is_subcommand_up -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_lu
     __fish_zypper_cmd_in_array list-updates lu
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'List only updates from the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_lu -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n __fish_zypper_is_subcommand_lu -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
+complete -c zypper -n __fish_zypper_is_subcommand_lu -l all -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
+complete -c zypper -n __fish_zypper_is_subcommand_lu -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'List only updates from the specified repository'
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-downgrade -l no-allow-downgrade -d 'Whether to allow downgrading installed resolvables'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-name-change -l no-allow-name-change -d 'Whether to allow changing the names of installed resolvables'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-arch-change -l no-allow-arch-change -d 'Whether to allow changing the architecture of installed resolvables'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-vendor-change -l no-allow-vendor-change -d 'Whether to allow changing the vendor of installed resolvables'
+complete -c zypper -n __fish_zypper_is_subcommand_lu -l allow-downgrade -l no-allow-downgrade -d 'Whether to allow downgrading installed resolvables'
+complete -c zypper -n __fish_zypper_is_subcommand_lu -l allow-name-change -l no-allow-name-change -d 'Whether to allow changing the names of installed resolvables'
+complete -c zypper -n __fish_zypper_is_subcommand_lu -l allow-arch-change -l no-allow-arch-change -d 'Whether to allow changing the architecture of installed resolvables'
+complete -c zypper -n __fish_zypper_is_subcommand_lu -l allow-vendor-change -l no-allow-vendor-change -d 'Whether to allow changing the vendor of installed resolvables'
 
 function __fish_zypper_is_subcommand_lp
     __fish_zypper_cmd_in_array list-patches lp
@@ -473,223 +473,223 @@ end
 set -g __fish_zypper_patch_category security recommended optional feature document yast
 set -g __fish_zypper_patch_severity critical important moderate low unspecified
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all -s a -d 'List all patches, not only the needed ones'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'List only patches from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l category -s g -rf -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l severity -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date -rf -d 'Select patches issued up to, but not including, the specified date'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l bugzilla -s b -d 'Select applicable patches for the specified Bugzilla issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve -d 'Select applicable patches for the specified CVE issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issues -d 'Select issues matching the specified string'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
+complete -c zypper -n __fish_zypper_is_subcommand_lp -l all -s a -d 'List all patches, not only the needed ones'
+complete -c zypper -n __fish_zypper_is_subcommand_lp -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'List only patches from the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_lp -l category -s g -rf -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
+complete -c zypper -n __fish_zypper_is_subcommand_lp -l severity -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
+complete -c zypper -n __fish_zypper_is_subcommand_lp -l date -rf -d 'Select patches issued up to, but not including, the specified date'
+complete -c zypper -n __fish_zypper_is_subcommand_lp -l bugzilla -s b -d 'Select applicable patches for the specified Bugzilla issues'
+complete -c zypper -n __fish_zypper_is_subcommand_lp -l cve -d 'Select applicable patches for the specified CVE issues'
+complete -c zypper -n __fish_zypper_is_subcommand_lp -l issues -d 'Select issues matching the specified string'
+complete -c zypper -n __fish_zypper_is_subcommand_lp -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
 
 function __fish_zypper_is_subcommand_dup
     __fish_zypper_cmd_in_array dist-upgrade dup
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l from -rf -a "(__fish_zypper_print_repos -e)" -d 'Restrict upgrade to specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l details -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run -s D -d 'Test the upgrade, do not actually upgrade'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-confirm -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n __fish_zypper_is_subcommand_dup -l from -rf -a "(__fish_zypper_print_repos -e)" -d 'Restrict upgrade to specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_dup -l details -d 'Show the detailed installation summary'
+complete -c zypper -n __fish_zypper_is_subcommand_dup -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n __fish_zypper_is_subcommand_dup -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_dup -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
+complete -c zypper -n __fish_zypper_is_subcommand_dup -l dry-run -s D -d 'Test the upgrade, do not actually upgrade'
+complete -c zypper -n __fish_zypper_is_subcommand_dup -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n __fish_zypper_is_subcommand_dup -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n __fish_zypper_is_subcommand_dup -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_pchk
     __fish_zypper_cmd_in_array patch-check pchk
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l updatestack-only -d 'Consider only patches which affect the package management itself'
-complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Check for patches only in the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
+complete -c zypper -n __fish_zypper_is_subcommand_pchk -l updatestack-only -d 'Consider only patches which affect the package management itself'
+complete -c zypper -n __fish_zypper_is_subcommand_pchk -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Check for patches only in the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_pchk -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
 
 function __fish_zypper_is_subcommand_se
     __fish_zypper_cmd_in_array search se
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings -d 'Search for a match to partial words (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words -d 'Search for a match to whole words only'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact -s x -d 'Searches for an exact package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides -d 'Search for packages which provide the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires -d 'Search for packages which require the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends -d 'Search for packages which recommend the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l supplements -d 'Search for packages which supplements the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts -d 'Search packages conflicting with search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes -d 'Search for packages which obsolete the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests -d 'Search for packages which suggest the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Search only for packages of the specified type'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l name -s n -d 'Useful together with dependency options, otherwise searching in package name is default'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l file-list -s f -d 'Search for a match in the file list of packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l search-descriptions -s d -d 'Search also in package summaries and descriptions'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive -s C -d 'Perform case-sensitive search'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details -s s -d 'Show each available version in each repository on a separate line'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l verbose -s s -d 'Like --details, with additional information where the search has matched (useful for search in dependencies)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name -d 'Sort packages by name (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo -d 'Sort packages by repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Search only in the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only -s i -d 'Show only packages that are already installed'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l not-installed-only -s u -d 'Show only packages that are not currently installed'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l match-substrings -d 'Search for a match to partial words (default)'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l match-words -d 'Search for a match to whole words only'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l match-exact -s x -d 'Searches for an exact package name'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l provides -d 'Search for packages which provide the search strings'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l requires -d 'Search for packages which require the search strings'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l recommends -d 'Search for packages which recommend the search strings'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l supplements -d 'Search for packages which supplements the search strings'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l conflicts -d 'Search packages conflicting with search strings'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l obsoletes -d 'Search for packages which obsolete the search strings'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l suggests -d 'Search for packages which suggest the search strings'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Search only for packages of the specified type'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l name -s n -d 'Useful together with dependency options, otherwise searching in package name is default'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l file-list -s f -d 'Search for a match in the file list of packages'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l search-descriptions -s d -d 'Search also in package summaries and descriptions'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l case-sensitive -s C -d 'Perform case-sensitive search'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l details -s s -d 'Show each available version in each repository on a separate line'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l verbose -s s -d 'Like --details, with additional information where the search has matched (useful for search in dependencies)'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l sort-by-name -d 'Sort packages by name (default)'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l sort-by-repo -d 'Sort packages by repository'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Search only in the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l installed-only -s i -d 'Show only packages that are already installed'
+complete -c zypper -n __fish_zypper_is_subcommand_se -l not-installed-only -s u -d 'Show only packages that are not currently installed'
 
 function __fish_zypper_is_subcommand_if
     __fish_zypper_cmd_in_array info if
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l match-substrings -s s -d 'Print information for packages partially matching name'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides -d 'Show provides'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires -d 'Show requires and prerequires'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts -d 'Show conflicts'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes -d 'Show obsoletes'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l recommends -d 'Show recommends'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l supplements -d 'Show supplements'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests -d 'Show suggests'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Work only with the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_if -l match-substrings -s s -d 'Print information for packages partially matching name'
+complete -c zypper -n __fish_zypper_is_subcommand_if -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n __fish_zypper_is_subcommand_if -l provides -d 'Show provides'
+complete -c zypper -n __fish_zypper_is_subcommand_if -l requires -d 'Show requires and prerequires'
+complete -c zypper -n __fish_zypper_is_subcommand_if -l conflicts -d 'Show conflicts'
+complete -c zypper -n __fish_zypper_is_subcommand_if -l obsoletes -d 'Show obsoletes'
+complete -c zypper -n __fish_zypper_is_subcommand_if -l recommends -d 'Show recommends'
+complete -c zypper -n __fish_zypper_is_subcommand_if -l supplements -d 'Show supplements'
+complete -c zypper -n __fish_zypper_is_subcommand_if -l suggests -d 'Show suggests'
+complete -c zypper -n __fish_zypper_is_subcommand_if -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Work only with the specified repository'
 
 function __fish_zypper_is_subcommand_pch
     __fish_zypper_cmd_in_array patches pch
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pch' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
+complete -c zypper -n __fish_zypper_is_subcommand_pch -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
 
 function __fish_zypper_is_subcommand_pa
     __fish_zypper_cmd_in_array packages pa
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned -d 'Show packages which are orphaned (without repository)'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested -d 'Show packages which are suggested'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended -d 'Show packages which are recommended'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded -d 'Show packages which are unneeded'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name -s N -d 'Sort the list by package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo -s R -d 'Sort the list by repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only -s i -d 'Show only installed packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l not-installed-only -s u -d 'Show only packages which are not installed'
+complete -c zypper -n __fish_zypper_is_subcommand_pa -l orphaned -d 'Show packages which are orphaned (without repository)'
+complete -c zypper -n __fish_zypper_is_subcommand_pa -l suggested -d 'Show packages which are suggested'
+complete -c zypper -n __fish_zypper_is_subcommand_pa -l recommended -d 'Show packages which are recommended'
+complete -c zypper -n __fish_zypper_is_subcommand_pa -l unneeded -d 'Show packages which are unneeded'
+complete -c zypper -n __fish_zypper_is_subcommand_pa -l sort-by-name -s N -d 'Sort the list by package name'
+complete -c zypper -n __fish_zypper_is_subcommand_pa -l sort-by-repo -s R -d 'Sort the list by repository'
+complete -c zypper -n __fish_zypper_is_subcommand_pa -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
+complete -c zypper -n __fish_zypper_is_subcommand_pa -l installed-only -s i -d 'Show only installed packages'
+complete -c zypper -n __fish_zypper_is_subcommand_pa -l not-installed-only -s u -d 'Show only packages which are not installed'
 
 function __fish_zypper_is_subcommand_pt
     __fish_zypper_cmd_in_array patterns pt
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only -s i -d 'Show only installed patterns'
-complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l not-installed-only -s u -d 'Show only patterns which are not installed'
+complete -c zypper -n __fish_zypper_is_subcommand_pt -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
+complete -c zypper -n __fish_zypper_is_subcommand_pt -l installed-only -s i -d 'Show only installed patterns'
+complete -c zypper -n __fish_zypper_is_subcommand_pt -l not-installed-only -s u -d 'Show only patterns which are not installed'
 
 function __fish_zypper_is_subcommand_pd
     __fish_zypper_cmd_in_array products pd
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l xmlfwd -r -d 'XML output only: Literally forward the XML tags found in a product file'
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only -s i -d 'Show only installed products'
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l not-installed-only -s u -d 'Show only products which are not installed'
+complete -c zypper -n __fish_zypper_is_subcommand_pd -l xmlfwd -r -d 'XML output only: Literally forward the XML tags found in a product file'
+complete -c zypper -n __fish_zypper_is_subcommand_pd -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
+complete -c zypper -n __fish_zypper_is_subcommand_pd -l installed-only -s i -d 'Show only installed products'
+complete -c zypper -n __fish_zypper_is_subcommand_pd -l not-installed-only -s u -d 'Show only products which are not installed'
 
 function __fish_zypper_is_subcommand_al
     __fish_zypper_cmd_in_array addlock al
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_al' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Restrict the lock to the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_al' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n __fish_zypper_is_subcommand_al -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Restrict the lock to the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_al -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 
 function __fish_zypper_is_subcommand_rl
     __fish_zypper_cmd_in_array removelock rl
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Remove only locks with specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n __fish_zypper_is_subcommand_rl -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Remove only locks with specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_rl -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 
 function __fish_zypper_is_subcommand_cl
     __fish_zypper_cmd_in_array cleanlocks cl
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-duplicates -s d -d 'Clean only duplicate locks'
-complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty -s e -d "Clean only locks which doesn't lock anything"
+complete -c zypper -n __fish_zypper_is_subcommand_cl -l only-duplicates -s d -d 'Clean only duplicate locks'
+complete -c zypper -n __fish_zypper_is_subcommand_cl -l only-empty -s e -d "Clean only locks which doesn't lock anything"
 
 function __fish_zypper_is_subcommand_lloc
     __fish_zypper_cmd_in_array locales lloc
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lloc' -l packages -s p -d 'Show corresponding packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_lloc' -l all -s a -d 'List all available locales'
+complete -c zypper -n __fish_zypper_is_subcommand_lloc -l packages -s p -d 'Show corresponding packages'
+complete -c zypper -n __fish_zypper_is_subcommand_lloc -l all -s a -d 'List all available locales'
 
 function __fish_zypper_is_subcommand_aloc
     __fish_zypper_cmd_in_array addlocale aloc
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_aloc' -l no-packages -s n -d 'Do not install corresponding packages for given locale(s)'
+complete -c zypper -n __fish_zypper_is_subcommand_aloc -l no-packages -s n -d 'Do not install corresponding packages for given locale(s)'
 
 function __fish_zypper_is_subcommand_rloc
     __fish_zypper_cmd_in_array removelocale rloc
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rloc' -l no-packages -s n -d 'Do not remove corresponding packages for given locale(s)'
+complete -c zypper -n __fish_zypper_is_subcommand_rloc -l no-packages -s n -d 'Do not remove corresponding packages for given locale(s)'
 
 function __fish_zypper_is_subcommand_vcmp
     __fish_zypper_cmd_in_array versioncmp vcmp
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_vcmp' -l match -s m -d 'Takes missing release number as any release'
+complete -c zypper -n __fish_zypper_is_subcommand_vcmp -l match -s m -d 'Takes missing release number as any release'
 
 function __fish_zypper_is_subcommand_tos
     __fish_zypper_cmd_in_array targetos tos
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_tos' -l label -s l -d 'Show the operating system label'
+complete -c zypper -n __fish_zypper_is_subcommand_tos -l label -s l -d 'Show the operating system label'
 
 function __fish_zypper_is_subcommand_clean
     __fish_zypper_cmd_in_array clean
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l repo -s r -rf -a "(__fish_zypper_print_repos)" -d 'Clean only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata -s m -d 'Clean metadata cache'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l raw-metadata -s M -d 'Clean raw metadata cache'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all -s a -d 'Clean both metadata and package caches'
+complete -c zypper -n __fish_zypper_is_subcommand_clean -l repo -s r -rf -a "(__fish_zypper_print_repos)" -d 'Clean only specified repositories'
+complete -c zypper -n __fish_zypper_is_subcommand_clean -l metadata -s m -d 'Clean metadata cache'
+complete -c zypper -n __fish_zypper_is_subcommand_clean -l raw-metadata -s M -d 'Clean raw metadata cache'
+complete -c zypper -n __fish_zypper_is_subcommand_clean -l all -s a -d 'Clean both metadata and package caches'
 
 function __fish_zypper_is_subcommand_patch
     __fish_zypper_cmd_in_array patch
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l updatestack-only -d 'Consider only patches which affect the package management itself'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-update -d 'Additionally try to update all packages not covered by patches'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l details -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g -rf -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l severity -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date -r -d 'Select patches issued up to, but not including, the specified date'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla -s b -d 'Select applicable patches for the specified Bugzilla issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve -d 'Select applicable patches for the specified CVE issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-confirm -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive -d 'Do not skip interactive patches'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive -d 'Skip interactive patches'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run -s D -d 'Test the update, do not actually update'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l updatestack-only -d 'Consider only patches which affect the package management itself'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l with-update -d 'Additionally try to update all packages not covered by patches'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l details -d 'Show the detailed installation summary'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l category -s g -rf -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l severity -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l date -r -d 'Select patches issued up to, but not including, the specified date'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l bugzilla -s b -d 'Select applicable patches for the specified Bugzilla issues'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l cve -d 'Select applicable patches for the specified CVE issues'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l with-interactive -d 'Do not skip interactive patches'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l skip-interactive -d 'Skip interactive patches'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l dry-run -s D -d 'Test the update, do not actually update'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n __fish_zypper_is_subcommand_patch -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_sourcedownload
     __fish_zypper_cmd_in_array source-download
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l directory -r -s d -d 'Download all source rpms to this directory'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete -d 'Delete extraneous source rpms in the local directory'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete -d 'Do not delete extraneous source rpms'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
+complete -c zypper -n __fish_zypper_is_subcommand_sourcedownload -l directory -r -s d -d 'Download all source rpms to this directory'
+complete -c zypper -n __fish_zypper_is_subcommand_sourcedownload -l delete -d 'Delete extraneous source rpms in the local directory'
+complete -c zypper -n __fish_zypper_is_subcommand_sourcedownload -l no-delete -d 'Do not delete extraneous source rpms'
+complete -c zypper -n __fish_zypper_is_subcommand_sourcedownload -l status -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
 
 function __fish_zypper_is_subcommand_download
     __fish_zypper_cmd_in_array download
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_download' -l all-matches -d 'Download all versions matching the commandline arguments'
-complete -c zypper -n '__fish_zypper_is_subcommand_download' -l from -r -d 'Select packages from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_download' -l dry-run -s D -d 'Don\'t change anything, just report what would be done'
-complete -c zypper -n '__fish_zypper_is_subcommand_download' -l repo -r -s r -d 'Work only with the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_download -l all-matches -d 'Download all versions matching the commandline arguments'
+complete -c zypper -n __fish_zypper_is_subcommand_download -l from -r -d 'Select packages from the specified repository'
+complete -c zypper -n __fish_zypper_is_subcommand_download -l dry-run -s D -d 'Don\'t change anything, just report what would be done'
+complete -c zypper -n __fish_zypper_is_subcommand_download -l repo -r -s r -d 'Work only with the specified repository'
 
 function __fish_zypper_is_subcommand_ps
     __fish_zypper_cmd_in_array ps
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l short -s s -d 'Create a short table not showing the deleted files'
-complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l print -rf -d 'For each associated system service print <format> on the standard output, followed by a newline'
-complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l debugFile -r -s d -d 'Write debug output to file'
+complete -c zypper -n __fish_zypper_is_subcommand_ps -l short -s s -d 'Create a short table not showing the deleted files'
+complete -c zypper -n __fish_zypper_is_subcommand_ps -l print -rf -d 'For each associated system service print <format> on the standard output, followed by a newline'
+complete -c zypper -n __fish_zypper_is_subcommand_ps -l debugFile -r -s d -d 'Write debug output to file'
diff --git a/share/config.fish b/share/config.fish
index acba33c09..6d6412252 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -220,9 +220,9 @@ if status --is-login
             set -xg $argv[1] $result
         end
 
-        __fish_macos_set_env 'PATH' '/etc/paths' '/etc/paths.d'
+        __fish_macos_set_env PATH /etc/paths '/etc/paths.d'
         if [ -n "$MANPATH" ]
-            __fish_macos_set_env 'MANPATH' '/etc/manpaths' '/etc/manpaths.d'
+            __fish_macos_set_env MANPATH /etc/manpaths '/etc/manpaths.d'
         end
         functions -e __fish_macos_set_env
     end
diff --git a/share/functions/N_.fish b/share/functions/N_.fish
index 9b05f12ff..cf4a0ed34 100644
--- a/share/functions/N_.fish
+++ b/share/functions/N_.fish
@@ -1,6 +1,6 @@
 
 
-function N_ --description "No-op"
+function N_ --description No-op
     printf "%s" $argv
 end
 
diff --git a/share/functions/__fish_abbr_old.fish b/share/functions/__fish_abbr_old.fish
index b9017a7f2..51f92f90f 100644
--- a/share/functions/__fish_abbr_old.fish
+++ b/share/functions/__fish_abbr_old.fish
@@ -7,23 +7,23 @@ function __fish_abbr_old --description "Manage abbreviations using old fish 2.x
     while set -q argv[1]
         set -l new_mode
         switch $argv[1]
-            case '-h' '--help'
+            case -h --help
                 __fish_print_help abbr
                 return 0
-            case '-a' '--add'
+            case -a --add
                 set new_mode add
                 set needs_arg multi
-            case '-r' '--rename'
+            case -r --rename
                 set new_mode rename
                 set needs_arg double
-            case '-e' '--erase'
+            case -e --erase
                 set new_mode erase
                 set needs_arg single
-            case '-l' '--list'
+            case -l --list
                 set new_mode list
-            case '-s' '--show'
+            case -s --show
                 set new_mode show
-            case '--'
+            case --
                 set -e argv[1]
                 break
             case '-*'
@@ -87,7 +87,7 @@ function __fish_abbr_old --description "Manage abbreviations using old fish 2.x
     end
 
     switch $mode
-        case 'add'
+        case add
             # Convert from old "key=value" syntax
             # TODO: This should be removed later
             if not set -q mode_arg[2]
@@ -124,7 +124,7 @@ function __fish_abbr_old --description "Manage abbreviations using old fish 2.x
             set fish_user_abbreviations $fish_user_abbreviations "$key $value"
             return 0
 
-        case 'rename'
+        case rename
             set -l old_name $param1
             set -l new_name $param2
 
@@ -150,7 +150,7 @@ function __fish_abbr_old --description "Manage abbreviations using old fish 2.x
             set fish_user_abbreviations[$idx] "$new_name $value"
             return 0
 
-        case 'erase'
+        case erase
             if set -l idx (__fish_abbr_get_by_key $mode_arg)
                 set -e fish_user_abbreviations[$idx]
                 return 0
@@ -159,7 +159,7 @@ function __fish_abbr_old --description "Manage abbreviations using old fish 2.x
                 return 2
             end
 
-        case 'show'
+        case show
             for i in $fish_user_abbreviations
                 set -l opt_double_dash
                 set -l kv (string split " " -m 1 -- $i)
@@ -169,12 +169,12 @@ function __fish_abbr_old --description "Manage abbreviations using old fish 2.x
                 # Check to see if either key or value has a leading dash
                 # If so, we need to write --
                 string match -q -- '-*' $key $value
-                and set opt_double_dash '--'
+                and set opt_double_dash --
                 echo abbr $opt_double_dash (string escape -- $key $value)
             end
             return 0
 
-        case 'list'
+        case list
             for i in $fish_user_abbreviations
                 set -l key (string split " " -m 1 -- $i)[1]
                 printf "%s\n" $key
diff --git a/share/functions/__fish_complete_directories.fish b/share/functions/__fish_complete_directories.fish
index c0f127b49..cebdbeef6 100644
--- a/share/functions/__fish_complete_directories.fish
+++ b/share/functions/__fish_complete_directories.fish
@@ -5,7 +5,7 @@
 #
 function __fish_complete_directories -d "Complete directory prefixes" --argument comp desc
     if not set -q desc[1]
-        set desc "Directory"
+        set desc Directory
     end
 
     if not set -q comp[1]
diff --git a/share/functions/__fish_complete_ftp.fish b/share/functions/__fish_complete_ftp.fish
index b5e08481a..48d5d03e5 100644
--- a/share/functions/__fish_complete_ftp.fish
+++ b/share/functions/__fish_complete_ftp.fish
@@ -1,6 +1,6 @@
 function __fish_complete_ftp -d 'Complete ftp, pftp' --argument-names ftp
     # Common across all ftp implementations
-    complete -c $ftp -xa "(__fish_print_hostnames)" -d 'Hostname'
+    complete -c $ftp -xa "(__fish_print_hostnames)" -d Hostname
     complete -c $ftp -s 4 -d 'Use IPv4 only'
     complete -c $ftp -s 6 -d 'Use IPv6 only'
     complete -c $ftp -s A -d 'Use active mode for data transfers'
diff --git a/share/functions/__fish_complete_group_ids.fish b/share/functions/__fish_complete_group_ids.fish
index f6a1e408e..28ea7014b 100644
--- a/share/functions/__fish_complete_group_ids.fish
+++ b/share/functions/__fish_complete_group_ids.fish
@@ -2,6 +2,6 @@ function __fish_complete_group_ids --description "Complete group IDs with group
     if command -sq getent
         getent group | string replace -f -r '^([[:alpha:]][^:]*):[^:]*:(\d+).*' '$2\t$1'
     else if test -r /etc/group
-        string replace -f -r '^([[:alpha:]][^:]*):[^:]*:(\d+).*' '$2\t$1' < /etc/group
+        string replace -f -r '^([[:alpha:]][^:]*):[^:]*:(\d+).*' '$2\t$1' </etc/group
     end
 end
diff --git a/share/functions/__fish_complete_man.fish b/share/functions/__fish_complete_man.fish
index edb5511bd..22f6f790a 100644
--- a/share/functions/__fish_complete_man.fish
+++ b/share/functions/__fish_complete_man.fish
@@ -35,7 +35,7 @@ function __fish_complete_man
 
     set -l exclude_fish_commands
     # Only include fish commands when section is empty or 1
-    if test -z "$section" -o "$section" = "1"
+    if test -z "$section" -o "$section" = 1
         set -e exclude_fish_commands
     end
 
diff --git a/share/functions/__fish_complete_ssh.fish b/share/functions/__fish_complete_ssh.fish
index 7f3ae4056..f92ac009a 100644
--- a/share/functions/__fish_complete_ssh.fish
+++ b/share/functions/__fish_complete_ssh.fish
@@ -7,7 +7,7 @@ function __fish_complete_ssh -d "common completions for ssh commands" --argument
     complete -xc $command -s c -d "Encryption algorithm" -a "blowfish 3des des"
     complete -r -c $command -s F -d "Configuration file"
     complete -r -c $command -s i -d "Identity file"
-    complete -x -c $command -s o -d "Options" -a "
+    complete -x -c $command -s o -d Options -a "
 		AddressFamily
 		BatchMode
 		BindAddress
diff --git a/share/functions/__fish_complete_subcommand.fish b/share/functions/__fish_complete_subcommand.fish
index bd7cc5009..ea249ef21 100644
--- a/share/functions/__fish_complete_subcommand.fish
+++ b/share/functions/__fish_complete_subcommand.fish
@@ -14,9 +14,9 @@ function __fish_complete_subcommand -d "Complete subcommand" --no-scope-shadowin
         switch $arg
             case '--fcs-skip=*'
                 set skip_next (string split = -- $arg)[2]
-            case '--allow-functions-and-builtins'
+            case --allow-functions-and-builtins
                 set allow_functions_and_builtins true
-            case '--commandline'
+            case --commandline
                 set subcommand $argv
                 set -e argv
                 break
diff --git a/share/functions/__fish_complete_user_ids.fish b/share/functions/__fish_complete_user_ids.fish
index 24bf2add6..2f5e3b675 100644
--- a/share/functions/__fish_complete_user_ids.fish
+++ b/share/functions/__fish_complete_user_ids.fish
@@ -2,6 +2,6 @@ function __fish_complete_user_ids --description "Complete user IDs with user nam
     if command -sq getent
         getent passwd | string replace -f -r '^([[:alpha:]][^:]*):[^:]*:(\d+).*' '$2\t$1'
     else if test -r /etc/passwd
-        string replace -f -r '^([[:alpha:]][^:]*):[^:]*:(\d+).*' '$2\t$1' < /etc/passwd
+        string replace -f -r '^([[:alpha:]][^:]*):[^:]*:(\d+).*' '$2\t$1' </etc/passwd
     end
 end
diff --git a/share/functions/__fish_complete_zfs_mountpoint_properties.fish b/share/functions/__fish_complete_zfs_mountpoint_properties.fish
index ea0c118a2..88f59a96b 100644
--- a/share/functions/__fish_complete_zfs_mountpoint_properties.fish
+++ b/share/functions/__fish_complete_zfs_mountpoint_properties.fish
@@ -2,26 +2,26 @@ function __fish_complete_zfs_mountpoint_properties -d "Completes with ZFS mountp
     set -l OS ""
     switch (uname)
         case Linux
-            set OS "Linux"
+            set OS Linux
         case Darwin
-            set OS "macOS"
+            set OS macOS
         case FreeBSD
-            set OS "FreeBSD"
+            set OS FreeBSD
         case SunOS
-            set OS "SunOS"
+            set OS SunOS
             # Others?
         case "*"
-            set OS "unknown"
+            set OS unknown
     end
     echo -e "atime\tUpdate access time on read (on, off)"
     echo -e "devices\tAre contained device nodes openable (on, off)"
     echo -e "exec\tCan contained executables be executed (on, off)"
     echo -e "readonly\tRead-only (on, off)"
     echo -e "setuid\tRespect set-UID bit (on, off)"
-    if test $OS = "SunOS"
+    if test $OS = SunOS
         echo -e "nbmand\tMount with Non Blocking mandatory locks (on, off)"
         echo -e "xattr\tExtended attributes (on, off, sa)"
-    else if test $OS = "Linux"
+    else if test $OS = Linux
         echo -e "nbmand\tMount with Non Blocking mandatory locks (on, off)"
         echo -e "relatime\tSometimes update access time on read (on, off)"
         echo -e "xattr\tExtended attributes (on, off, sa)"
diff --git a/share/functions/__fish_complete_zfs_rw_properties.fish b/share/functions/__fish_complete_zfs_rw_properties.fish
index cd34e910b..95a05e3d0 100644
--- a/share/functions/__fish_complete_zfs_rw_properties.fish
+++ b/share/functions/__fish_complete_zfs_rw_properties.fish
@@ -2,16 +2,16 @@ function __fish_complete_zfs_rw_properties -d "Completes with ZFS read-write pro
     set -l OS ""
     switch (uname)
         case Linux
-            set OS "Linux"
+            set OS Linux
         case Darwin
-            set OS "macOS"
+            set OS macOS
         case FreeBSD
-            set OS "FreeBSD"
+            set OS FreeBSD
         case SunOS
-            set OS "SunOS"
+            set OS SunOS
             # Others?
         case "*"
-            set OS "unknown"
+            set OS unknown
     end
     echo -e "aclinherit\tInheritance of ACL entries (discard, noallow, restricted, passthrough, passthrough-x)"
     echo -e "atime\tUpdate access time on read (on, off)"
@@ -68,7 +68,7 @@ function __fish_complete_zfs_rw_properties -d "Completes with ZFS read-write pro
         set -l tabAndBefore (echo -e "groupquota@$group\t")
         printf "%sMax usage by group %s\n" $tabAndBefore $group
     end
-    if test $OS = "SunOS"
+    if test $OS = SunOS
         echo -e "aclmode\tHow is ACL modified by chmod (discard, groupmask, passthrough, restricted)"
         echo -e "mlslabel\tCan the dataset be mounted in a zone with Trusted Extensions enabled (LABEL, none)"
         echo -e "nbmand\tMount with Non Blocking mandatory locks (on, off)"
@@ -78,7 +78,7 @@ function __fish_complete_zfs_rw_properties -d "Completes with ZFS read-write pro
         echo -e "vscan\tScan regular files for viruses on opening and closing (on, off)"
         echo -e "xattr\tExtended attributes (on, off, sa)"
         echo -e "zoned\tManaged from a non-global zone (on, off)"
-    else if test $OS = "Linux"
+    else if test $OS = Linux
         echo -e "acltype\tUse no ACL or POSIX ACL (noacl, posixacl)"
         echo -e "nbmand\tMount with Non Blocking mandatory locks (on, off)"
         echo -e "relatime\tSometimes update access time on read (on, off)"
@@ -88,7 +88,7 @@ function __fish_complete_zfs_rw_properties -d "Completes with ZFS read-write pro
         echo -e "version\tOn-disk version of filesystem (1, 2, current)"
         echo -e "vscan\tScan regular files for viruses on opening and closing (on, off)"
         echo -e "xattr\tExtended attributes (on, off, sa)"
-    else if test $OS = "FreeBSD"
+    else if test $OS = FreeBSD
         echo -e "aclmode\tHow is ACL modified by chmod (discard, groupmask, passthrough, restricted)"
         echo -e "volmode\tHow to expose volumes to OS (default, geom, dev, none)"
     end
diff --git a/share/functions/__fish_complete_zfs_write_once_properties.fish b/share/functions/__fish_complete_zfs_write_once_properties.fish
index 7354049f1..1f0b90860 100644
--- a/share/functions/__fish_complete_zfs_write_once_properties.fish
+++ b/share/functions/__fish_complete_zfs_write_once_properties.fish
@@ -2,20 +2,20 @@ function __fish_complete_zfs_write_once_properties -d "Completes with ZFS proper
     set -l OS ""
     switch (uname)
         case Linux
-            set OS "Linux"
+            set OS Linux
         case Darwin
-            set OS "macOS"
+            set OS macOS
         case FreeBSD
-            set OS "FreeBSD"
+            set OS FreeBSD
         case SunOS
-            set OS "SunOS"
+            set OS SunOS
             # Others?
         case "*"
-            set OS "unknown"
+            set OS unknown
     end
     echo -e "normalization\tUnicode normalization (none, formC, formD, formKC, formKD)"
     echo -e "utf8only\tReject non-UTF-8-compliant filenames (on, off)"
-    if test $OS = "Linux"
+    if test $OS = Linux
         echo -e "overlay\tAllow overlay mount (on, off)"
         if command -sq sestatus # SELinux is enabled
             echo -e "context\tSELinux context for the child filesystem"
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 70d1ecd64..e472ba03c 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -269,7 +269,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 
     # Notify terminals when $PWD changes (issue #906).
     # VTE based terminals, Terminal.app, and iTerm.app (TODO) support this.
-    if test 0"$VTE_VERSION" -ge 3405 -o "$TERM_PROGRAM" = "Apple_Terminal" -a (string match -r '\d+' 0"$TERM_PROGRAM_VERSION") -ge 309
+    if test 0"$VTE_VERSION" -ge 3405 -o "$TERM_PROGRAM" = Apple_Terminal -a (string match -r '\d+' 0"$TERM_PROGRAM_VERSION") -ge 309
         function __update_cwd_osc --on-variable PWD --description 'Notify capable terminals when $PWD changes'
             if status --is-command-substitution || set -q INSIDE_EMACS
                 return
diff --git a/share/functions/__fish_md5.fish b/share/functions/__fish_md5.fish
index f9f1d6c99..fe0e9f3ae 100644
--- a/share/functions/__fish_md5.fish
+++ b/share/functions/__fish_md5.fish
@@ -2,7 +2,7 @@ function __fish_md5
     if type -q md5sum
         # GNU systems
         if set -q argv[2]
-            if test $argv[1] = "-s"
+            if test $argv[1] = -s
                 echo (echo $argv[2] | md5sum | string split ' ')[1]
             else
                 printf (_ "%s: Too many arguments %s\n") fish_md5 $argv
@@ -14,7 +14,7 @@ function __fish_md5
     else if type -q md5
         # BSD systems
         if set -q argv[2]
-            if test $argv[1] = "-s"
+            if test $argv[1] = -s
                 md5 -s $argv[1]
             else
                 printf (_ "%s: Too many arguments %s\n") fish_md5 $argv
diff --git a/share/functions/__fish_prepend_sudo.fish b/share/functions/__fish_prepend_sudo.fish
index b681d1ca0..5eafc488e 100644
--- a/share/functions/__fish_prepend_sudo.fish
+++ b/share/functions/__fish_prepend_sudo.fish
@@ -1,6 +1,6 @@
 function __fish_prepend_sudo -d "Prepend 'sudo ' to the beginning of the current commandline"
     set -l cmd (commandline -poc)
-    if test "$cmd[1]" != "sudo"
+    if test "$cmd[1]" != sudo
         set -l cursor (commandline -C)
         commandline -C 0
         commandline -i "sudo "
diff --git a/share/functions/__fish_print_encodings.fish b/share/functions/__fish_print_encodings.fish
index 28ec1d0bf..6d1722fae 100644
--- a/share/functions/__fish_print_encodings.fish
+++ b/share/functions/__fish_print_encodings.fish
@@ -1,7 +1,7 @@
 function __fish_print_encodings -d "Complete using available character encodings"
     if iconv --usage &>/dev/null # only GNU has this flag
         # Note: GNU iconv changes its output to contain the forward slashes below when stdout is not a tty.
-        iconv --list | string replace -ra '//' ''
+        iconv --list | string replace -ra // ''
     else # non-GNU
         iconv --list | string replace -ra '\s+' '\n'
     end
diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index 30ee6a5c3..9d3d3322f 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -40,10 +40,10 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
         set -l ssh_func_tokens (functions ssh | string match '*command ssh *' | string split ' ')
         set -l ssh_command $ssh_func_tokens (commandline -cpo)
         # Extract ssh config path from last -F short option.
-        if contains -- '-F' $ssh_command
+        if contains -- -F $ssh_command
             set -l ssh_config_path_is_next 1
             for token in $ssh_command
-                if contains -- '-F' $token
+                if contains -- -F $token
                     set ssh_config_path_is_next 0
                 else if test $ssh_config_path_is_next -eq 0
                     set ssh_config (eval "echo $token")
@@ -59,7 +59,7 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
         # system or user level config. -F will not override this behaviour
         set -l relative_path $HOME/.ssh
         if string match '/etc/ssh/*' -- $ssh_config
-            set relative_path '/etc/ssh'
+            set relative_path /etc/ssh
         end
 
         function _recursive --no-scope-shadowing
diff --git a/share/functions/__fish_print_interfaces.fish b/share/functions/__fish_print_interfaces.fish
index b806b8968..01a497640 100644
--- a/share/functions/__fish_print_interfaces.fish
+++ b/share/functions/__fish_print_interfaces.fish
@@ -4,7 +4,7 @@ function __fish_print_interfaces --description "Print a list of known network in
         string replace /sys/class/net/ '' $interfaces
     else # OSX/BSD
         set -l os (uname)
-        if string match -e -q "BSD" -- $os
+        if string match -e -q BSD -- $os
             command ifconfig | string match -e -r '^[a-z]' | string replace -r ':.*' '' | string split ' '
         else
             command ifconfig -l | string split ' '
diff --git a/share/functions/__fish_print_mounted.fish b/share/functions/__fish_print_mounted.fish
index 2a390fdb9..1b1486a81 100644
--- a/share/functions/__fish_print_mounted.fish
+++ b/share/functions/__fish_print_mounted.fish
@@ -7,6 +7,6 @@ function __fish_print_mounted --description 'Print mounted devices'
         # and tabs because of descriptions
         string replace -r '\S+ (\S+) .*' '$1' </etc/mtab | string replace -a "\040" " " | string replace -a "\011" \t | string replace -a "\012" \n | string replace -a "\\\\" "\\"
     else
-        mount | string replace -r '^(\S+) \S+ (\S+) .*' '$1\n$2' | string replace -r '[\d.]*:/' '/' | string match '/*'
+        mount | string replace -r '^(\S+) \S+ (\S+) .*' '$1\n$2' | string replace -r '[\d.]*:/' / | string match '/*'
     end
 end
diff --git a/share/functions/__fish_print_packages.fish b/share/functions/__fish_print_packages.fish
index e8fa1b7ba..f15399ebf 100644
--- a/share/functions/__fish_print_packages.fish
+++ b/share/functions/__fish_print_packages.fish
@@ -1,6 +1,6 @@
 # Use --installed to limit to installed packages only
 function __fish_print_packages
-    argparse --name=__fish_print_packages 'i/installed' -- $argv
+    argparse --name=__fish_print_packages i/installed -- $argv
     or return
 
     set -l only_installed 1
@@ -46,7 +46,7 @@ function __fish_print_packages
     # Listing /var/db/pkg is a clean alternative.
     if type -q -f pkg_add
         set -l files /var/db/pkg/*
-        string replace '/var/db/pkg/' '' -- $files
+        string replace /var/db/pkg/ '' -- $files
         return
     end
 
diff --git a/share/functions/__fish_shared_key_bindings.fish b/share/functions/__fish_shared_key_bindings.fish
index 3a030ee64..b4adcefc6 100644
--- a/share/functions/__fish_shared_key_bindings.fish
+++ b/share/functions/__fish_shared_key_bindings.fish
@@ -103,7 +103,7 @@ function __fish_shared_key_bindings -d "Bindings shared between emacs and vi mod
     # This will make sure the output of the current command is paged using the default pager when
     # you press Meta-p.
     # If none is set, less will be used.
-    bind --preset $argv \ep '__fish_paginate'
+    bind --preset $argv \ep __fish_paginate
 
     # Make it easy to turn an unexecuted command into a comment in the shell history. Also,
     # remove the commenting chars so the command can be further edited then executed.
@@ -144,10 +144,10 @@ function __fish_shared_key_bindings -d "Bindings shared between emacs and vi mod
     # Bind the starting sequence in every bind mode, even user-defined ones.
     # Exclude paste mode or there'll be an additional binding after switching between emacs and vi
     for mode in (bind --list-modes | string match -v paste)
-        bind --preset -M $mode -m paste \e\[200~ '__fish_start_bracketed_paste'
+        bind --preset -M $mode -m paste \e\[200~ __fish_start_bracketed_paste
     end
     # This sequence ends paste-mode and returns to the previous mode we have saved before.
-    bind --preset -M paste \e\[201~ '__fish_stop_bracketed_paste'
+    bind --preset -M paste \e\[201~ __fish_stop_bracketed_paste
     # In paste-mode, everything self-inserts except for the sequence to get out of it
     bind --preset -M paste "" self-insert
     # Without this, a \r will overwrite the other text, rendering it invisible - which makes the exercise kinda pointless.
diff --git a/share/functions/__terlar_git_prompt.fish b/share/functions/__terlar_git_prompt.fish
index 46b4c241d..070fda465 100644
--- a/share/functions/__terlar_git_prompt.fish
+++ b/share/functions/__terlar_git_prompt.fish
@@ -65,7 +65,7 @@ function __terlar_git_prompt --description 'Write out the git prompt'
                 set -a gs deleted
             case "$dq"
                 set -a gs untracked
-            case 'U*' '*U' 'DD' 'AA'
+            case 'U*' '*U' DD AA
                 set -a gs unmerged
         end
     end
diff --git a/share/functions/alias.fish b/share/functions/alias.fish
index ea3c15863..43c3a0ffc 100644
--- a/share/functions/alias.fish
+++ b/share/functions/alias.fish
@@ -1,5 +1,5 @@
 function alias --description 'Creates a function wrapping a command'
-    set -l options 'h/help' 's/save'
+    set -l options h/help s/save
     argparse -n alias --max-args=2 $options -- $argv
     or return
 
diff --git a/share/functions/cd.fish b/share/functions/cd.fish
index df7b0c8c9..e7c868868 100644
--- a/share/functions/cd.fish
+++ b/share/functions/cd.fish
@@ -18,8 +18,8 @@ function cd --description "Change directory"
     # Avoid set completions.
     set -l previous $PWD
 
-    if test "$argv" = "-"
-        if test "$__fish_cd_direction" = "next"
+    if test "$argv" = -
+        if test "$__fish_cd_direction" = next
             nextd
         else
             prevd
diff --git a/share/functions/dirh.fish b/share/functions/dirh.fish
index 111a76a83..9c6d7d7c3 100644
--- a/share/functions/dirh.fish
+++ b/share/functions/dirh.fish
@@ -1,5 +1,5 @@
 function dirh --description "Print the current directory history (the prev and next lists)"
-    set -l options 'h/help'
+    set -l options h/help
     argparse -n dirh --max-args=0 $options -- $argv
     or return
 
diff --git a/share/functions/dirs.fish b/share/functions/dirs.fish
index 3017a148d..a1d2bd653 100644
--- a/share/functions/dirs.fish
+++ b/share/functions/dirs.fish
@@ -1,5 +1,5 @@
 function dirs --description 'Print directory stack'
-    set -l options 'h/help' 'c'
+    set -l options h/help c
     argparse -n dirs --max-args=0 $options -- $argv
     or return
 
diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
index e161a3d7f..de109e699 100644
--- a/share/functions/fish_default_key_bindings.fish
+++ b/share/functions/fish_default_key_bindings.fish
@@ -7,7 +7,7 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
 
     if not set -q argv[1]
         bind --erase --all --preset # clear earlier bindings, if any
-        if test "$fish_key_bindings" != "fish_default_key_bindings"
+        if test "$fish_key_bindings" != fish_default_key_bindings
             # Allow the user to set the variable universally
             set -q fish_key_bindings
             or set -g fish_key_bindings
@@ -20,7 +20,7 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
 
     # Silence warnings about unavailable keys. See #4431, 4188
     if not contains -- -s $argv
-        set argv "-s" $argv
+        set argv -s $argv
     end
 
     # These are shell-specific bindings that we share with vi mode.
@@ -95,7 +95,7 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
             bind --preset $argv \e\[8~ end-of-line
             bind --preset $argv \eOc forward-word
             bind --preset $argv \eOd backward-word
-        case 'xterm-256color'
+        case xterm-256color
             # Microsoft's conemu uses xterm-256color plus
             # the following to tell a console to paste:
             bind --preset $argv \e\x20ep fish_clipboard_paste
diff --git a/share/functions/fish_default_mode_prompt.fish b/share/functions/fish_default_mode_prompt.fish
index afd5e38ca..43bcb79b3 100644
--- a/share/functions/fish_default_mode_prompt.fish
+++ b/share/functions/fish_default_mode_prompt.fish
@@ -1,7 +1,7 @@
 function fish_default_mode_prompt --description "Display the default mode for the prompt"
     # Do nothing if not in vi mode
-    if test "$fish_key_bindings" = "fish_vi_key_bindings"
-        or test "$fish_key_bindings" = "fish_hybrid_key_bindings"
+    if test "$fish_key_bindings" = fish_vi_key_bindings
+        or test "$fish_key_bindings" = fish_hybrid_key_bindings
         switch $fish_bind_mode
             case default
                 set_color --bold --background red white
diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index d3820bc67..2e6d97694 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -394,7 +394,7 @@ function fish_git_prompt --description "Prompt function for Git"
         and set untracked true
     end
 
-    if test "true" = $inside_worktree
+    if test true = $inside_worktree
         # Use informative status if it has been enabled locally, or it has been
         # enabled globally (via the fish variable) and dirty or untracked are not false.
         #
@@ -561,7 +561,7 @@ function __fish_git_prompt_informative_status
         set info $___fish_git_prompt_color_cleanstate$___fish_git_prompt_char_cleanstate$___fish_git_prompt_color_cleanstate_done
     else
         for i in $___fish_git_prompt_status_order
-            if [ $$i != "0" ]
+            if [ $$i != 0 ]
                 set -l color_var ___fish_git_prompt_color_$i
                 set -l color_done_var ___fish_git_prompt_color_{$i}_done
                 set -l symbol_var ___fish_git_prompt_char_$i
@@ -665,8 +665,8 @@ function __fish_git_prompt_operation_branch_bare --description "fish_git_prompt
         end
     end
 
-    if test "true" = $inside_gitdir
-        if test "true" = $bare_repo
+    if test true = $inside_gitdir
+        if test true = $bare_repo
             set bare "BARE:"
         else
             # Let user know they're inside the git dir of a non-bare repo
diff --git a/share/functions/fish_hg_prompt.fish b/share/functions/fish_hg_prompt.fish
index d0131bced..567416a03 100644
--- a/share/functions/fish_hg_prompt.fish
+++ b/share/functions/fish_hg_prompt.fish
@@ -74,7 +74,7 @@ function fish_hg_prompt --description 'Write out the hg prompt'
                     set -a hg_statuses deleted
                 case "$dq "
                     set -a hg_statuses untracked
-                case 'U*' '*U' 'DD' 'AA'
+                case 'U*' '*U' DD AA
                     set -a hg_statuses unmerged
             end
         end
diff --git a/share/functions/fish_hybrid_key_bindings.fish b/share/functions/fish_hybrid_key_bindings.fish
index 2d0ad6c75..8bd7b4a8c 100644
--- a/share/functions/fish_hybrid_key_bindings.fish
+++ b/share/functions/fish_hybrid_key_bindings.fish
@@ -1,7 +1,7 @@
 function fish_hybrid_key_bindings --description "Vi-style bindings that inherit emacs-style bindings in all modes"
     bind --erase --all --preset # clear earlier bindings, if any
 
-    if test "$fish_key_bindings" != "fish_hybrid_key_bindings"
+    if test "$fish_key_bindings" != fish_hybrid_key_bindings
         # Allow the user to set the variable universally
         set -q fish_key_bindings
         or set -g fish_key_bindings
diff --git a/share/functions/fish_opt.fish b/share/functions/fish_opt.fish
index 84a91bcc8..902978b6a 100644
--- a/share/functions/fish_opt.fish
+++ b/share/functions/fish_opt.fish
@@ -11,8 +11,8 @@ end
 
 # The `fish_opt` command.
 function fish_opt -d 'Produce an option specification suitable for use with `argparse`.'
-    set -l options 'h/help' 's/short=' 'l/long=' 'o/optional-val' 'r/required-val'
-    set options $options 'L-long-only' 'M-multiple-vals'
+    set -l options h/help 's/short=' 'l/long=' o/optional-val r/required-val
+    set options $options L-long-only M-multiple-vals
     argparse -n fish_opt --max-args=0 --exclusive=r,o --exclusive=M,o $options -- $argv
     or return
 
diff --git a/share/functions/fish_print_git_action.fish b/share/functions/fish_print_git_action.fish
index 4d61a4aed..8040afb58 100644
--- a/share/functions/fish_print_git_action.fish
+++ b/share/functions/fish_print_git_action.fish
@@ -13,11 +13,11 @@ function fish_print_git_action --argument-names git_dir
     for action_dir in "$git_dir/rebase-apply" "$git_dir/rebase"
         if test -d "$action_dir"
             if test -f "$action_dir/rebasing"
-                echo -n 'rebase'
+                echo -n rebase
             else if test -f "$action_dir/applying"
-                echo -n 'apply'
+                echo -n apply
             else
-                echo -n 'rebase/apply'
+                echo -n rebase/apply
             end
             return 0
         end
@@ -25,43 +25,43 @@ function fish_print_git_action --argument-names git_dir
 
     for action_dir in "$git_dir/rebase-merge/interactive" "$git_dir/.dotest-merge/interactive"
         if test -f "$action_dir"
-            echo -n 'rebase-interactive'
+            echo -n rebase-interactive
             return 0
         end
     end
 
     for action_dir in "$git_dir/rebase-merge" "$git_dir/.dotest-merge"
         if test -d "$action_dir"
-            echo -n 'rebase-merge'
+            echo -n rebase-merge
             return 0
         end
     end
 
     if test -f "$git_dir/MERGE_HEAD"
-        echo -n 'merge'
+        echo -n merge
         return 0
     end
 
     if test -f "$git_dir/CHERRY_PICK_HEAD"
         if test -d "$git_dir/sequencer"
-            echo -n 'cherry-pick-sequence'
+            echo -n cherry-pick-sequence
         else
-            echo -n 'cherry-pick'
+            echo -n cherry-pick
         end
         return 0
     end
 
     if test -f "$git_dir/REVERT_HEAD"
         if test -d "$git_dir/sequencer"
-            echo -n 'revert-sequence'
+            echo -n revert-sequence
         else
-            echo -n 'revert'
+            echo -n revert
         end
         return 0
     end
 
     if test -f "$git_dir/BISECT_LOG"
-        echo -n 'bisect'
+        echo -n bisect
         return 0
     end
 
diff --git a/share/functions/fish_print_hg_root.fish b/share/functions/fish_print_hg_root.fish
index 728c42937..5942a9483 100644
--- a/share/functions/fish_print_hg_root.fish
+++ b/share/functions/fish_print_hg_root.fish
@@ -10,7 +10,7 @@ function fish_print_hg_root
     set -l dir (pwd -P 2>/dev/null)
     or return 1
 
-    while test $dir != "/"
+    while test $dir != /
         if test -f $dir'/.hg/dirstate'
             echo $dir/.hg
             return 0
diff --git a/share/functions/fish_svn_prompt.fish b/share/functions/fish_svn_prompt.fish
index 013fcd5db..308fbc50a 100644
--- a/share/functions/fish_svn_prompt.fish
+++ b/share/functions/fish_svn_prompt.fish
@@ -13,25 +13,25 @@ set -g __fish_svn_prompt_char_separator "|"
 #
 # these variables are user-configurable and can be set to customize the display output
 
-set -g __fish_svn_prompt_char_added_display 'A'
+set -g __fish_svn_prompt_char_added_display A
 set -g __fish_svn_prompt_char_added_color green
 
-set -g __fish_svn_prompt_char_conflicted_display 'C'
+set -g __fish_svn_prompt_char_conflicted_display C
 set -g __fish_svn_prompt_char_conflicted_color --underline magenta
 
-set -g __fish_svn_prompt_char_deleted_display 'D'
+set -g __fish_svn_prompt_char_deleted_display D
 set -g __fish_svn_prompt_char_deleted_color red
 
-set -g __fish_svn_prompt_char_ignored_display 'I'
+set -g __fish_svn_prompt_char_ignored_display I
 set -g __fish_svn_prompt_char_ignored_color --bold yellow
 
-set -g __fish_svn_prompt_char_modified_display 'M'
+set -g __fish_svn_prompt_char_modified_display M
 set -g __fish_svn_prompt_char_modified_color blue
 
-set -g __fish_svn_prompt_char_replaced_display 'R'
+set -g __fish_svn_prompt_char_replaced_display R
 set -g __fish_svn_prompt_char_replaced_color cyan
 
-set -g __fish_svn_prompt_char_unversioned_external_display 'X'
+set -g __fish_svn_prompt_char_unversioned_external_display X
 set -g __fish_svn_prompt_char_unversioned_external_color --underline cyan
 
 set -g __fish_svn_prompt_char_unversioned_display '?'
@@ -43,25 +43,25 @@ set -g __fish_svn_prompt_char_missing_color yellow
 set -g __fish_svn_prompt_char_versioned_obstructed_display '~'
 set -g __fish_svn_prompt_char_versioned_obstructed_color magenta
 
-set -g __fish_svn_prompt_char_locked_display 'L'
+set -g __fish_svn_prompt_char_locked_display L
 set -g __fish_svn_prompt_char_locked_color --bold red
 
 set -g __fish_svn_prompt_char_scheduled_display '+'
 set -g __fish_svn_prompt_char_scheduled_color --bold green
 
-set -g __fish_svn_prompt_char_switched_display 'S'
+set -g __fish_svn_prompt_char_switched_display S
 set -g __fish_svn_prompt_char_switched_color --bold blue
 
-set -g __fish_svn_prompt_char_token_present_display 'K'
+set -g __fish_svn_prompt_char_token_present_display K
 set -g __fish_svn_prompt_char_token_present_color --bold cyan
 
-set -g __fish_svn_prompt_char_token_other_display 'O'
+set -g __fish_svn_prompt_char_token_other_display O
 set -g __fish_svn_prompt_char_token_other_color --underline purple
 
-set -g __fish_svn_prompt_char_token_stolen_display 'T'
+set -g __fish_svn_prompt_char_token_stolen_display T
 set -g __fish_svn_prompt_char_token_stolen_color --bold purple
 
-set -g __fish_svn_prompt_char_token_broken_display 'B'
+set -g __fish_svn_prompt_char_token_broken_display B
 set -g __fish_svn_prompt_char_token_broken_color --bold magenta
 
 
diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index da146141c..d18d474ca 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -10,7 +10,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     # This needs to be checked here because if we are called again
     # via the variable handler the argument will be gone.
     set -l rebind true
-    if test "$argv[1]" = "--no-erase"
+    if test "$argv[1]" = --no-erase
         set rebind false
         set -e argv[1]
     else
@@ -20,8 +20,8 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     # Allow just calling this function to correctly set the bindings.
     # Because it's a rather discoverable name, users will execute it
     # and without this would then have subtly broken bindings.
-    if test "$fish_key_bindings" != "fish_vi_key_bindings"
-        and test "$rebind" = "true"
+    if test "$fish_key_bindings" != fish_vi_key_bindings
+        and test "$rebind" = true
         # Allow the user to set the variable universally.
         set -q fish_key_bindings
         or set -g fish_key_bindings
diff --git a/share/functions/funced.fish b/share/functions/funced.fish
index 5d8afb956..703701693 100644
--- a/share/functions/funced.fish
+++ b/share/functions/funced.fish
@@ -12,7 +12,7 @@ function __funced_md5
 end
 
 function funced --description 'Edit function definition'
-    set -l options 'h/help' 'e/editor=' 'i/interactive' 's/save'
+    set -l options h/help 'e/editor=' i/interactive s/save
     argparse -n funced --max-args=1 $options -- $argv
     or return
 
diff --git a/share/functions/funcsave.fish b/share/functions/funcsave.fish
index 31b553fbd..20e60c06e 100644
--- a/share/functions/funcsave.fish
+++ b/share/functions/funcsave.fish
@@ -1,5 +1,5 @@
 function funcsave --description "Save the current definition of all specified functions to file"
-    set -l options 'h/help'
+    set -l options h/help
     argparse -n funcsave $options -- $argv
     or return
 
diff --git a/share/functions/help.fish b/share/functions/help.fish
index 59cd5bacf..7cac6cbd9 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -1,5 +1,5 @@
 function help --description 'Show help for the fish shell'
-    set -l options 'h/help'
+    set -l options h/help
     argparse -n help --max-args=1 $options -- $argv
     or return
 
@@ -98,7 +98,7 @@ function help --description 'Show help for the fish shell'
     # In Cygwin, start the user-specified browser using cygstart,
     # only if a Windows browser is to be used.
     if type -q cygstart
-        if test $fish_browser != "cygstart"
+        if test $fish_browser != cygstart
             and not command -sq $fish_browser[1]
             # Escaped quotes are necessary to work with spaces in the path
             # when the command is finally eval'd.
@@ -145,7 +145,7 @@ function help --description 'Show help for the fish shell'
         # For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
         # but only if a Windows browser is being used
         if type -q cygpath
-            and string match -qr "cygstart" $fish_browser[1]
+            and string match -qr cygstart $fish_browser[1]
             set page_url file://(cygpath -m $__fish_help_dir)/$fish_help_page
         else if type -q wslpath
             and string match -qr '.exe' $fish_browser[1]
@@ -174,7 +174,7 @@ function help --description 'Show help for the fish shell'
             # For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
             # but only if a Windows browser is being used
             if type -q cygpath
-                and string match -qr "cygstart" $fish_browser[1]
+                and string match -qr cygstart $fish_browser[1]
                 set page_url file://(cygpath -m $tmpname)
             else if type -q wslpath
                 and string match -qr '.exe' $fish_browser[1]
@@ -189,7 +189,7 @@ function help --description 'Show help for the fish shell'
         # If browser is known to be graphical, put into background
     else if contains -- $fish_browser[1] $graphical_browsers
         switch $fish_browser[1]
-            case 'htmlview' 'x-www-browser'
+            case htmlview x-www-browser
                 printf (_ 'help: Help is being displayed in your default browser.\n')
             case '*'
                 printf (_ 'help: Help is being displayed in %s.\n') $fish_browser[1]
diff --git a/share/functions/history.fish b/share/functions/history.fish
index 3573a01c7..4d81580d5 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -17,11 +17,11 @@ end
 function history --description "display or manipulate interactive command history"
     set -l cmd history
     set -l options --exclusive 'c,e,p' --exclusive 'S,D,M,V,X'
-    set -a options 'h/help' 'c/contains' 'e/exact' 'p/prefix'
-    set -a options 'C/case-sensitive' 'R/reverse' 'z/null' 't/show-time=?' 'n#max'
+    set -a options h/help c/contains e/exact p/prefix
+    set -a options C/case-sensitive R/reverse z/null 't/show-time=?' 'n#max'
     # The following options are deprecated and will be removed in the next major release.
     # Note that they do not have usable short flags.
-    set -a options 'S-search' 'D-delete' 'M-merge' 'V-save' 'X-clear'
+    set -a options S-search D-delete M-merge V-save X-clear
     argparse -n $cmd $options -- $argv
     or return
 
@@ -81,7 +81,7 @@ function history --description "display or manipulate interactive command histor
     switch $hist_cmd
         case search # search the interactive command history
             test -z "$search_mode"
-            and set search_mode "--contains"
+            and set search_mode --contains
 
             if isatty stdout
                 set -l pager less
@@ -110,10 +110,10 @@ function history --description "display or manipulate interactive command histor
             end
 
             if test -z "$search_mode"
-                set search_mode "--contains"
+                set search_mode --contains
             end
 
-            if test $search_mode = "--exact"
+            if test $search_mode = --exact
                 builtin history delete $search_mode $_flag_case_sensitive $searchterm
                 return
             end
@@ -140,7 +140,7 @@ function history --description "display or manipulate interactive command histor
                     return
                 end
 
-                if test "$choice" = "all"
+                if test "$choice" = all
                     printf "Deleting all matching entries!\n"
                     for item in $found_items
                         builtin history delete --exact --case-sensitive -- $item
@@ -181,7 +181,7 @@ function history --description "display or manipulate interactive command histor
 
             printf (_ "If you enter 'yes' your entire interactive command history will be erased\n")
             read --local --prompt "echo 'Are you sure you want to clear history? (yes/no) '" choice
-            if test "$choice" = "yes"
+            if test "$choice" = yes
                 builtin history clear -- $argv
                 and printf (_ "Command history cleared!")
             else
diff --git a/share/functions/isatty.fish b/share/functions/isatty.fish
index 406e5287c..8575a25fe 100644
--- a/share/functions/isatty.fish
+++ b/share/functions/isatty.fish
@@ -1,5 +1,5 @@
 function isatty -d "Tests if a file descriptor is a tty"
-    set -l options 'h/help'
+    set -l options h/help
     argparse -n isatty $options -- $argv
     or return
 
diff --git a/share/functions/nextd.fish b/share/functions/nextd.fish
index 3d3d3cdfb..bee91c0c0 100644
--- a/share/functions/nextd.fish
+++ b/share/functions/nextd.fish
@@ -1,5 +1,5 @@
 function nextd --description "Move forward in the directory history"
-    set -l options 'h/help' 'l/list'
+    set -l options h/help l/list
     argparse -n nextd --max-args=1 $options -- $argv
     or return
 
diff --git a/share/functions/open.fish b/share/functions/open.fish
index 2848e6faa..e14bce183 100644
--- a/share/functions/open.fish
+++ b/share/functions/open.fish
@@ -4,7 +4,7 @@
 #
 if not command -sq open
     function open --description "Open file in default application"
-        set -l options 'h/help'
+        set -l options h/help
         argparse -n open $options -- $argv
         or return
 
diff --git a/share/functions/prevd.fish b/share/functions/prevd.fish
index acb119705..a708909df 100644
--- a/share/functions/prevd.fish
+++ b/share/functions/prevd.fish
@@ -1,5 +1,5 @@
 function prevd --description "Move back in the directory history"
-    set -l options 'h/help' 'l/list'
+    set -l options h/help l/list
     argparse -n prevd --max-args=1 $options -- $argv
     or return
 
diff --git a/share/functions/prompt_pwd.fish b/share/functions/prompt_pwd.fish
index c57f3a69a..73597a593 100644
--- a/share/functions/prompt_pwd.fish
+++ b/share/functions/prompt_pwd.fish
@@ -1,5 +1,5 @@
 function prompt_pwd --description "Print the current working directory, shortened to fit the prompt"
-    set -l options 'h/help'
+    set -l options h/help
     argparse -n prompt_pwd --max-args=0 $options -- $argv
     or return
 
diff --git a/share/functions/psub.fish b/share/functions/psub.fish
index c88ad89bb..74cb30b56 100644
--- a/share/functions/psub.fish
+++ b/share/functions/psub.fish
@@ -1,5 +1,5 @@
 function psub --description "Read from stdin into a file and output the filename. Remove the file when the command that called psub exits."
-    set -l options -x 'f,F' -x 'F,s' 'h/help' 'f/file' 'F/fifo' 's/suffix=' 'T-testing'
+    set -l options -x 'f,F' -x 'F,s' h/help f/file F/fifo 's/suffix=' T-testing
     argparse -n psub --max-args=0 $options -- $argv
     or return
 
diff --git a/share/functions/realpath.fish b/share/functions/realpath.fish
index 3b0881cc7..1bb0a8f5e 100644
--- a/share/functions/realpath.fish
+++ b/share/functions/realpath.fish
@@ -22,8 +22,8 @@ if command -sq grealpath
 end
 
 function realpath -d "return an absolute path without symlinks"
-    set -l options 'h/help' 'q/quiet' 'V-version' 's/strip' 'N-no-symlinks' 'z/zero'
-    set -a options 'e/canonicalize-existing' 'm/canonicalize-missing' 'L/logical' 'P/physical'
+    set -l options h/help q/quiet V-version s/strip N-no-symlinks z/zero
+    set -a options e/canonicalize-existing m/canonicalize-missing L/logical P/physical
     set -a options 'R-relative-to=' 'B-relative-base='
     argparse -n realpath $options -- $argv
     or return
diff --git a/share/functions/seq.fish b/share/functions/seq.fish
index 49014f59e..f91ffdc01 100644
--- a/share/functions/seq.fish
+++ b/share/functions/seq.fish
@@ -21,7 +21,7 @@ if not command -sq seq
         set -l to 1
 
         # Remove a "--" argument if it happens first.
-        if test "x$argv[1]" = "x--"
+        if test "x$argv[1]" = x--
             set -e argv[1]
         end
 
diff --git a/share/functions/suspend.fish b/share/functions/suspend.fish
index 0babd35c4..c4703aa36 100644
--- a/share/functions/suspend.fish
+++ b/share/functions/suspend.fish
@@ -1,5 +1,5 @@
 function suspend --description 'Suspend the current shell.'
-    set -l options 'h/help' 'f/force'
+    set -l options h/help f/force
     argparse -n suspend --max-args=1 $options -- $argv
     or return
 
diff --git a/share/functions/trap.fish b/share/functions/trap.fish
index fab5cd952..cdb35e5bb 100644
--- a/share/functions/trap.fish
+++ b/share/functions/trap.fish
@@ -16,7 +16,7 @@ function __trap_switch
 end
 
 function trap -d 'Perform an action when the shell receives a signal'
-    set -l options 'h/help' 'l/list-signals' 'p/print'
+    set -l options h/help l/list-signals p/print
     argparse -n trap $options -- $argv
     or return
 
diff --git a/share/functions/type.fish b/share/functions/type.fish
index 795b01cad..f957dfe07 100644
--- a/share/functions/type.fish
+++ b/share/functions/type.fish
@@ -3,7 +3,7 @@ function type --description 'Print the type of a command'
     set -q argv[1]
     or return 1
 
-    set -l options 'h/help' 'a/all' 's/short' 'f/no-functions' 't/type' 'p/path' 'P/force-path' 'q/quiet'
+    set -l options h/help a/all s/short f/no-functions t/type p/path P/force-path q/quiet
     argparse -n type -x t,p,P $options -- $argv
     or return
 
@@ -68,9 +68,9 @@ function type --description 'Print the type of a command'
                     case path
                         set -l func_path (functions --details $i)
                         switch $func_path
-                            case "-"
-                            case "n/a"
-                            case "stdin"
+                            case -
+                            case n/a
+                            case stdin
                                 break
                             case "*"
                                 echo $func_path
diff --git a/share/functions/umask.fish b/share/functions/umask.fish
index d6147d680..779dc436c 100644
--- a/share/functions/umask.fish
+++ b/share/functions/umask.fish
@@ -112,7 +112,7 @@ function __fish_umask_parse
                 case '+'
                     set res[$j] (__fish_umask_add $res[$j] $val)
 
-                case '-'
+                case -
                     set res[$j] (__fish_umask_remove $res[$j] $val)
             end
         end
@@ -149,7 +149,7 @@ function __fish_umask_print_symbolic
 end
 
 function umask --description "Set default file permission mask"
-    set -l options 'h/help' 'p/as-command' 'S/symbolic'
+    set -l options h/help p/as-command S/symbolic
     argparse -n umask $options -- $argv
     or return
 
diff --git a/share/functions/vared.fish b/share/functions/vared.fish
index 2104757ac..9ecfb5c5e 100644
--- a/share/functions/vared.fish
+++ b/share/functions/vared.fish
@@ -7,7 +7,7 @@ function vared --description "Edit variable value"
     if test (count $argv) = 1
         switch $argv
 
-            case '-h' '--h' '--he' '--hel' '--help'
+            case -h --h --he --hel --help
                 __fish_print_help vared
                 return 0
 
diff --git a/share/tools/web_config/sample_prompts/informative_vcs.fish b/share/tools/web_config/sample_prompts/informative_vcs.fish
index 6726dcdb3..b36c248e6 100644
--- a/share/tools/web_config/sample_prompts/informative_vcs.fish
+++ b/share/tools/web_config/sample_prompts/informative_vcs.fish
@@ -15,7 +15,7 @@ function fish_prompt --description 'Write out the prompt'
         set -g __fish_git_prompt_color_branch magenta --bold
     end
     if not set -q __fish_git_prompt_showupstream
-        set -g __fish_git_prompt_showupstream "informative"
+        set -g __fish_git_prompt_showupstream informative
     end
     if not set -q __fish_git_prompt_char_upstream_ahead
         set -g __fish_git_prompt_char_upstream_ahead "↑"
diff --git a/share/tools/web_config/sample_prompts/robbyrussell.fish b/share/tools/web_config/sample_prompts/robbyrussell.fish
index 65275ccd9..51ec7584c 100644
--- a/share/tools/web_config/sample_prompts/robbyrussell.fish
+++ b/share/tools/web_config/sample_prompts/robbyrussell.fish
@@ -47,10 +47,10 @@ function fish_prompt
 
         function _repo_type
             if _is_hg_repo
-                echo 'hg'
+                echo hg
                 return 0
             else if _is_git_repo
-                echo 'git'
+                echo git
                 return 0
             end
             return 1
@@ -70,7 +70,7 @@ function fish_prompt
     end
 
     set -l arrow "$arrow_color➜ "
-    if test "$USER" = 'root'
+    if test "$USER" = root
         set arrow "$arrow_color# "
     end
 
diff --git a/share/tools/web_config/sample_prompts/sorin.fish b/share/tools/web_config/sample_prompts/sorin.fish
index 3836bb33d..e912c6d23 100644
--- a/share/tools/web_config/sample_prompts/sorin.fish
+++ b/share/tools/web_config/sample_prompts/sorin.fish
@@ -13,7 +13,7 @@ function fish_prompt
     echo -n (set_color blue)(prompt_pwd)' '
 
     set_color -o
-    if test "$USER" = 'root'
+    if test "$USER" = root
         echo -n (set_color red)'# '
     end
     echo -n (set_color red)'❯'(set_color yellow)'❯'(set_color green)'❯ '
@@ -122,7 +122,7 @@ function fish_right_prompt
         set status_modified 1
     end
     set -l status_renamed 0
-    if string match -qe 'R' $porcelain_status
+    if string match -qe R $porcelain_status
         set status_renamed 1
     end
     set -l status_unmerged 0
diff --git a/tests/checks/abbr.fish b/tests/checks/abbr.fish
index b2c3a64ef..0757531d8 100644
--- a/tests/checks/abbr.fish
+++ b/tests/checks/abbr.fish
@@ -37,10 +37,10 @@ abbr | grep __abbr2
 abbr -e '~__abbr2'
 
 # Ensure we handle leading dashes in abbreviation names properly
-abbr -- '--__abbr3' 'xyz'
+abbr -- --__abbr3 xyz
 abbr | grep __abbr3
 # CHECK: abbr -a -U -- --__abbr3 xyz
-abbr -e -- '--__abbr3'
+abbr -e -- --__abbr3
 
 # Test that an abbr word containing spaces is rejected
 abbr "a b c" "d e f"
diff --git a/tests/checks/andor.fish b/tests/checks/andor.fish
index 0dd7b5476..1698a1884 100644
--- a/tests/checks/andor.fish
+++ b/tests/checks/andor.fish
@@ -9,14 +9,38 @@ eval 'true | or'
 # CHECKERR: {{.*}}: The 'or' command can not be used in a pipeline
 
 # Verify and/or behavior with if and while
-if false ; or true ; echo "success1" ; end
+if false; or true
+    echo success1
+end
 # CHECK: success1
-if false ; and false ; echo "failure1" ; end
-while false ; and false ; or true ; echo "success2"; break ; end
+if false; and false
+    echo failure1
+end
+while false; and false; or true
+    echo success2
+    break
+end
 # CHECK: success2
-while false; or begin ; false; or true; end; echo "success3"; break ; end
+while false; or begin
+        false; or true
+    end
+    echo success3
+    break
+end
 # CHECK: success3
-if false ; else if false ; and true ; else if false ; and false ; else if false; or true; echo "success4"; end
+if false
+else if false; and true
+else if false; and false
+else if false; or true
+    echo success4
+end
 # CHECK: success4
-if false ; else if false ; and true ; else if false ; or false ; else if false; echo "failure 4"; end
-if false ; or true | false ; echo "failure5" ; end
+if false
+else if false; and true
+else if false; or false
+else if false
+    echo "failure 4"
+end
+if false; or true | false
+    echo failure5
+end
diff --git a/tests/checks/argparse.fish b/tests/checks/argparse.fish
index 7d0a5f3dd..642b20fac 100644
--- a/tests/checks/argparse.fish
+++ b/tests/checks/argparse.fish
@@ -61,19 +61,19 @@ end
 
 # Defining a short flag more than once
 begin
-    argparse 's/short' 'x/xray' 's/long' -- -s -x --long
+    argparse s/short x/xray s/long -- -s -x --long
     # CHECKERR: argparse: Short flag 's' already defined
 end
 
 # Defining a long flag more than once
 begin
-    argparse 's/short' 'x/xray' 'l/short' -- -s -x --long
+    argparse s/short x/xray l/short -- -s -x --long
     # CHECKERR: argparse: Long flag 'short' already defined
 end
 
 # Defining an implicit int flag more than once
 begin
-    argparse '#-val' 'x/xray' 'v#val' -- -s -x --long
+    argparse '#-val' x/xray 'v#val' -- -s -x --long
     # CHECKERR: argparse: Implicit int flag '#' already defined
 end
 
@@ -109,7 +109,7 @@ end
 
 # Required, optional, and multiple flags
 begin
-    argparse 'h/help' 'a/abc=' 'd/def=?' 'g/ghk=+' -- help --help me --ghk=g1 --abc=ABC --ghk g2 --d -g g3
+    argparse h/help 'a/abc=' 'd/def=?' 'g/ghk=+' -- help --help me --ghk=g1 --abc=ABC --ghk g2 --d -g g3
     set -l
     # CHECK: _flag_a ABC
     # CHECK: _flag_abc ABC
@@ -124,7 +124,7 @@ end
 
 # --stop-nonopt works
 begin
-    argparse --stop-nonopt 'h/help' 'a/abc=' -- -a A1 -h --abc A2 non-opt 'second non-opt' --help
+    argparse --stop-nonopt h/help 'a/abc=' -- -a A1 -h --abc A2 non-opt 'second non-opt' --help
     set -l
     # CHECK: _flag_a A2
     # CHECK: _flag_abc A2
@@ -141,7 +141,7 @@ begin
     # CHECK: argv 'abc'  'def'
 end
 begin
-    argparse 'v/verbose' '#-val' 't/token=' -- -123 a1 --token woohoo --234 -v a2 --verbose
+    argparse v/verbose '#-val' 't/token=' -- -123 a1 --token woohoo --234 -v a2 --verbose
     set -l
     # CHECK: _flag_t woohoo
     # CHECK: _flag_token woohoo
@@ -171,7 +171,7 @@ end
 
 # Bool short flag only
 begin
-    argparse 'C' 'v' -- -C -v arg1 -v arg2
+    argparse C v -- -C -v arg1 -v arg2
     set -l
     # CHECK: _flag_C -C
     # CHECK: _flag_v '-v'  '-v'
@@ -180,7 +180,7 @@ end
 
 # Value taking short flag only
 begin
-    argparse 'x=' 'v/verbose' -- --verbose arg1 -v -x arg2
+    argparse 'x=' v/verbose -- --verbose arg1 -v -x arg2
     set -l
     # CHECK: _flag_v '--verbose'  '-v'
     # CHECK: _flag_verbose '--verbose'  '-v'
@@ -190,7 +190,7 @@ end
 
 # Implicit int short flag only
 begin
-    argparse 'x#' 'v/verbose' -- -v -v argle -v -x 321 bargle
+    argparse 'x#' v/verbose -- -v -v argle -v -x 321 bargle
     set -l
     # CHECK: _flag_v '-v'  '-v'  '-v'
     # CHECK: _flag_verbose '-v'  '-v'  '-v'
@@ -200,7 +200,7 @@ end
 
 # Implicit int short flag only with custom validation passes
 begin
-    argparse 'x#!_validate_int --max 500' 'v/verbose' -- -v -v -x 499 -v
+    argparse 'x#!_validate_int --max 500' v/verbose -- -v -v -x 499 -v
     set -l
     # CHECK: _flag_v '-v'  '-v'  '-v'
     # CHECK: _flag_verbose '-v'  '-v'  '-v'
@@ -210,7 +210,7 @@ end
 
 # Implicit int short flag only with custom validation fails
 begin
-    argparse 'x#!_validate_int --min 500' 'v/verbose' -- -v -v -x 499 -v
+    argparse 'x#!_validate_int --min 500' v/verbose -- -v -v -x 499 -v
     set -l
     # CHECKERR: argparse: Value '499' for flag 'x' less than min allowed of '500'
 end
diff --git a/tests/checks/braces.fish b/tests/checks/braces.fish
index c42fd8e76..13dea02c3 100644
--- a/tests/checks/braces.fish
+++ b/tests/checks/braces.fish
@@ -44,7 +44,7 @@ end
 
 for foo in {hello
 world}
-   echo \'$foo\'
+    echo \'$foo\'
 end
 #CHECK: '{hello
 #CHECK: world}'
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 583e5b1bc..665c6af7d 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -47,7 +47,7 @@ complete -C't --fileoption ' | string match bind.expect
 # Make sure bare `complete` is reasonable,
 complete -p '/complete test/beta1' -d 'desc, desc' -sZ
 complete -c 'complete test beta2' -r -d 'desc \' desc2 [' -a 'foo bar'
-complete -c 'complete_test_beta2' -x -n 'false' -A -o test
+complete -c complete_test_beta2 -x -n false -A -o test
 complete
 
 # CHECK: complete --no-files -c complete_test_alpha1 -a '(commandline)'
@@ -96,13 +96,13 @@ complete -C'complete_test_recurse1 '
 # short options
 complete -c foo -f -a non-option-argument
 complete -c foo -f --short-option x
-complete -c foo -f --short-option y -a 'ARGY'
-complete -c foo -f --short-option z -a 'ARGZ' -r
+complete -c foo -f --short-option y -a ARGY
+complete -c foo -f --short-option z -a ARGZ -r
 complete -c foo -f --old-option single-long-ending-in-z
 complete -c foo -f --old-option x-single-long
 complete -c foo -f --old-option y-single-long
 complete -c foo -f --old-option z-single-long
-complete -c foo -f --long-option x-long -a 'ARGLONG'
+complete -c foo -f --long-option x-long -a ARGLONG
 # Make sure that arguments of concatenated short options are expanded (#332)
 complete -C'foo -xy'
 # CHECK: -xyARGY
@@ -130,7 +130,7 @@ complete -C'foo -z'
 
 
 # Builtins (with subcommands; #2705)
-complete -c complete_test_subcommand -n 'test (commandline -op)[1] = complete_test_subcommand' -xa 'ok'
+complete -c complete_test_subcommand -n 'test (commandline -op)[1] = complete_test_subcommand' -xa ok
 complete -C'not complete_test_subcommand '
 # CHECK: ok
 complete -C'echo; and complete_test_subcommand '
@@ -287,7 +287,9 @@ echo "Expect --backup=all  --backup=none  --backup=simple:" (complete -C'TestOpt
 #CHECK: Expect --backup=all  --backup=none  --backup=simple: --backup=all --backup=none --backup=simple
 
 # Test that directory completions work correctly
-if begin; rm -rf test6.tmp.dir; and mkdir test6.tmp.dir; end
+if begin
+        rm -rf test6.tmp.dir; and mkdir test6.tmp.dir
+    end
     pushd test6.tmp.dir
     set -l dir (mktemp -d XXXXXXXX)
     if complete -C$dir | grep "^$dir/.*Directory" >/dev/null
@@ -319,36 +321,36 @@ end
 
 # Test command expansion with parened PATHs (#952)
 begin
-  set -l parened_path $PWD/'test6.tmp2.(paren).dir'
-  set -l parened_subpath $parened_path/subdir
-  if not begin
-        rm -rf $parened_path
-	    and mkdir $parened_path
-		and mkdir $parened_subpath
-	    and ln -s /bin/ls $parened_path/'__test6_(paren)_command'
-	    and ln -s /bin/ls $parened_subpath/'__test6_subdir_(paren)_command'
-      end
-    echo "error: could not create command expansion temp environment" >&2
-  end
-  
-  # Verify that we can expand commands when PATH has parens
-  set -l PATH $parened_path $PATH
-  set -l completed (complete -C__test6_ | cut -f 1 -d \t)
-  if test "$completed" = '__test6_(paren)_command'
-    echo "Command completion with parened PATHs test passed"
-  else
-    echo "Command completion with parened PATHs test failed. Expected __test6_(paren)_command, got $completed" >&2
-  end
-  #CHECK: Command completion with parened PATHs test passed
-  
-  # Verify that commands with intermediate slashes do NOT expand with respect to PATH
-  set -l completed (complete -Csubdir/__test6_subdir)
-  if test -z "$completed"
-    echo "Command completion with intermediate slashes passed"
-  else
-    echo "Command completion with intermediate slashes: should output nothing, instead got $completed" >&2
-  end
-  #CHECK: Command completion with intermediate slashes passed
-  
-  rm -rf $parened_path
+    set -l parened_path $PWD/'test6.tmp2.(paren).dir'
+    set -l parened_subpath $parened_path/subdir
+    if not begin
+            rm -rf $parened_path
+            and mkdir $parened_path
+            and mkdir $parened_subpath
+            and ln -s /bin/ls $parened_path/'__test6_(paren)_command'
+            and ln -s /bin/ls $parened_subpath/'__test6_subdir_(paren)_command'
+        end
+        echo "error: could not create command expansion temp environment" >&2
+    end
+
+    # Verify that we can expand commands when PATH has parens
+    set -l PATH $parened_path $PATH
+    set -l completed (complete -C__test6_ | cut -f 1 -d \t)
+    if test "$completed" = '__test6_(paren)_command'
+        echo "Command completion with parened PATHs test passed"
+    else
+        echo "Command completion with parened PATHs test failed. Expected __test6_(paren)_command, got $completed" >&2
+    end
+    #CHECK: Command completion with parened PATHs test passed
+
+    # Verify that commands with intermediate slashes do NOT expand with respect to PATH
+    set -l completed (complete -Csubdir/__test6_subdir)
+    if test -z "$completed"
+        echo "Command completion with intermediate slashes passed"
+    else
+        echo "Command completion with intermediate slashes: should output nothing, instead got $completed" >&2
+    end
+    #CHECK: Command completion with intermediate slashes passed
+
+    rm -rf $parened_path
 end
diff --git a/tests/checks/contains_opt.fish b/tests/checks/contains_opt.fish
index 76cc43174..70bfeb56e 100644
--- a/tests/checks/contains_opt.fish
+++ b/tests/checks/contains_opt.fish
@@ -1,8 +1,8 @@
 #RUN: %fish %s
 function commandline
-    if test $argv[1] = '-ct'
+    if test $argv[1] = -ct
         echo --long4\n-4
-    else if test $argv[1] = '-cpo'
+    else if test $argv[1] = -cpo
         echo cmd\n-z\n-bc\n--long1\narg1\n-d\narg2\n--long2
     end
 end
diff --git a/tests/checks/exec.fish b/tests/checks/exec.fish
index b7658f1a2..067d0e07e 100644
--- a/tests/checks/exec.fish
+++ b/tests/checks/exec.fish
@@ -1,13 +1,13 @@
 #RUN: %fish %s
-exec cat < nosuchfile
+exec cat <nosuchfile
 #CHECKERR: warning: An error occurred while redirecting file 'nosuchfile'
 #CHECKERR: open: No such file or directory
 echo "failed: $status"
 #CHECK: failed: 1
-not exec cat < nosuchfile
+not exec cat <nosuchfile
 #CHECKERR: warning: An error occurred while redirecting file 'nosuchfile'
 #CHECKERR: open: No such file or directory
 echo "neg failed: $status"
 #CHECK: neg failed: 0
-exec cat < /dev/null
+exec cat </dev/null
 echo "not reached"
diff --git a/tests/checks/expansion.fish b/tests/checks/expansion.fish
index c9aa0bf48..8617e704f 100644
--- a/tests/checks/expansion.fish
+++ b/tests/checks/expansion.fish
@@ -37,24 +37,30 @@ echo \'{ hello , world }\'
 #CHECK: 'hello' 'world'
 
 # expansion with escapes
-for phrase in {good\,,   beautiful ,morning}; echo -n "$phrase "; end | string trim;
-for phrase in {goodbye\,,\ cruel\ ,world\n}; echo -n $phrase; end;
+for phrase in {good\,,   beautiful ,morning}
+    echo -n "$phrase "
+end | string trim
+for phrase in {goodbye\,,\ cruel\ ,world\n}
+    echo -n $phrase
+end
 #CHECK: good, beautiful morning
 #CHECK: goodbye, cruel world
 
 # dual expansion cartesian product
-echo { alpha, beta }\ {lambda, gamma }, |  string replace -r ',$' ''
+echo { alpha, beta }\ {lambda, gamma }, | string replace -r ',$' ''
 #CHECK: alpha lambda, beta lambda, alpha gamma, beta gamma
 
 # expansion with subshells
 for name in { (echo Meg), (echo Jo) }
-	echo $name
+    echo $name
 end
 #CHECK: Meg
 #CHECK: Jo
 
 # subshells with expansion
-for name in (for name in {Beth, Amy}; printf "$name\n"; end); printf "$name\n"; end
+for name in (for name in {Beth, Amy}; printf "$name\n"; end)
+    printf "$name\n"
+end
 #CHECK: Beth
 #CHECK: Amy
 
diff --git a/tests/checks/functions.fish b/tests/checks/functions.fish
index 1cf336f1b..313f8a482 100644
--- a/tests/checks/functions.fish
+++ b/tests/checks/functions.fish
@@ -21,7 +21,7 @@ functions --details f1
 # Verify that `functions --details` works as expected when given the name of an
 # unknown function.
 set x (functions -D f2)
-if test "$x" != "n/a"
+if test "$x" != n/a
     echo "Unexpected output for 'functions --details f2': $x" >&2
 end
 
@@ -30,7 +30,7 @@ end
 # function that could be autoloaded but isn't currently loaded.
 set x (functions -D abbr)
 if test (count $x) -ne 1
-or not string match -q '*/share/functions/abbr.fish' "$x"
+    or not string match -q '*/share/functions/abbr.fish' "$x"
     echo "Unexpected output for 'functions -D abbr': $x" >&2
 end
 
@@ -39,11 +39,11 @@ end
 # function that was autoloaded.
 set x (functions -v -D abbr)
 if test (count $x) -ne 5
-or not string match -q '*/share/functions/abbr.fish' $x[1]
-or test $x[2] != autoloaded
-or test $x[3] != 1
-or test $x[4] != scope-shadowing
-or test $x[5] != 'Manage abbreviations'
+    or not string match -q '*/share/functions/abbr.fish' $x[1]
+    or test $x[2] != autoloaded
+    or test $x[3] != 1
+    or test $x[4] != scope-shadowing
+    or test $x[5] != 'Manage abbreviations'
     echo "Unexpected output for 'functions -v -D abbr': $x" >&2
 end
 
@@ -60,7 +60,8 @@ end
 
 # ==========
 # Verify function description setting
-function test_func_desc ; end
+function test_func_desc
+end
 functions test_func_desc | string match --quiet '*description*'
 and echo "Unexpected description" >&2
 
diff --git a/tests/checks/jobs.fish b/tests/checks/jobs.fish
index 8026c444b..1c2499639 100644
--- a/tests/checks/jobs.fish
+++ b/tests/checks/jobs.fish
@@ -1,5 +1,6 @@
 #RUN: %fish %s
-jobs -q; echo $status
+jobs -q
+echo $status
 #CHECK: 1
 sleep 5 &
 sleep 5 &
@@ -7,7 +8,8 @@ jobs -c
 #CHECK: Command
 #CHECK: sleep
 #CHECK: sleep
-jobs -q; echo $status
+jobs -q
+echo $status
 #CHECK: 0
 bg -23 1 2>/dev/null
 or echo bg: invalid option -23 >&2
@@ -46,13 +48,15 @@ sleep 2
 
 # Verify `jobs -l` works and returns the right status codes
 # https://github.com/fish-shell/fish-shell/issues/6104
-jobs --last --command; echo $status
+jobs --last --command
+echo $status
 #CHECK: Command
 #CHECK: sleep
 #CHECK: sleep is done
 #CHECK: 1
 sleep 0.2 &
-jobs -lc; echo $status
+jobs -lc
+echo $status
 #CHECK: Command
 #CHECK: sleep
 #CHECK: 0
diff --git a/tests/checks/line-continuation.fish b/tests/checks/line-continuation.fish
index 22f17d6ea..ba9edeec2 100644
--- a/tests/checks/line-continuation.fish
+++ b/tests/checks/line-continuation.fish
@@ -14,18 +14,15 @@ d echo true
 \i\
 \U00000066\
  true
-	echo if true
-\
-\145n\
+    echo if true
+ \
+    \145n\
 d\
-;
+
 #CHECK: if true
 
 'if'\
  true
-	echo if true
-"\
-en\
-d\
-";
+    echo if true
+end
 #CHECK: if true
diff --git a/tests/checks/locale.fish b/tests/checks/locale.fish
index 55180b570..87a653821 100644
--- a/tests/checks/locale.fish
+++ b/tests/checks/locale.fish
@@ -17,8 +17,8 @@ echo -n A\u00FCA | display_bytes
 # Verify that exporting a change to the C locale produces the expected output.
 # The output should include the literal byte \xFC rather than the UTF-8 sequence for \u00FC.
 begin
-	set -lx LC_ALL C
-	echo -n B\u00FCB | display_bytes
+    set -lx LC_ALL C
+    echo -n B\u00FCB | display_bytes
 end
 #CHECK: 0000000 102 374 102
 #CHECK: 0000003
@@ -33,8 +33,8 @@ echo -n C\u00FCC | display_bytes
 # The output should include the UTF-8 sequence for \u00FC rather than that literal byte.
 # Just like the previous test.
 begin
-	set -l LC_ALL C
-	echo -n D\u00FCD | display_bytes
+    set -l LC_ALL C
+    echo -n D\u00FCD | display_bytes
 end
 #CHECK: 0000000 104 303 274 104
 #CHECK: 0000004
diff --git a/tests/checks/loops.fish b/tests/checks/loops.fish
index 9342c463e..cb826e9a0 100644
--- a/tests/checks/loops.fish
+++ b/tests/checks/loops.fish
@@ -1,65 +1,70 @@
 #RUN: %fish -C 'set -g fish %fish' %s
 
 function never_runs
-	while false
-	end
+    while false
+    end
 end
 
 function early_return
-	while true
-		return 2
-	end
+    while true
+        return 2
+    end
 end
 
 function runs_once
-	set -l i 1
-	while test $i -ne 0 && set i (math $i - 1)
-	end
+    set -l i 1
+    while test $i -ne 0 && set i (math $i - 1)
+    end
 end
 
 # this should return 0
-never_runs; echo "Empty Loop in Function: $status"
+never_runs
+echo "Empty Loop in Function: $status"
 #CHECK: Empty Loop in Function: 0
 
 # this should return 0
-runs_once; echo "Runs Once: $status"
+runs_once
+echo "Runs Once: $status"
 #CHECK: Runs Once: 0
 
 # this should return 2
-early_return; echo "Early Return: $status"
+early_return
+echo "Early Return: $status"
 #CHECK: Early Return: 2
 
-function set_status ; return $argv[1]; end
+function set_status
+    return $argv[1]
+end
 
 # The previous status is visible in the loop condition.
 # This includes both the incoming status, and the last command in the
 # loop body.
 set_status 36
 while begin
-    set -l saved $status
-    echo "Condition Status: $status"
-    set_status $saved
-end
-true
+        set -l saved $status
+        echo "Condition Status: $status"
+        set_status $saved
+    end
+    true
 end
 #CHECK: Condition Status: 36
 
 # The condition status IS visible in the loop body.
 set_status 55
 while true
-  echo "Body Status: $status"
-  break
+    echo "Body Status: $status"
+    break
 end
 #CHECK: Body Status: 0
 
 # The status of the last command is visible in the loop condition
 set_status 13
 while begin
-     set -l saved $status
-     echo "Condition 2 Status: $saved"
-     test $saved -ne 5
-  end
-  set_status 5
+        set -l saved $status
+        echo "Condition 2 Status: $saved"
+        test $saved -ne 5
+    end
+    set_status 5
 end
 #CHECK: Condition 2 Status: 13
 #CHECK: Condition 2 Status: 5
@@ -67,29 +72,33 @@ end
 # The status of the last command is visible outside the loop
 set rem 5 7 11
 while [ (count $rem) -gt 0 ]
-  set_status $rem[1]
-  set rem $rem[2..-1]
+    set_status $rem[1]
+    set rem $rem[2..-1]
 end
 echo "Loop Exit Status: $status"
 #CHECK: Loop Exit Status: 11
 
 # Empty loops succeed.
 false
-while false; end
+while false
+end
 echo "Empty Loop Status: $status"
 #CHECK: Empty Loop Status: 0
 
 # Loop control in conditions, should have no output.
 for i in 1 2 3
-    while break; end
+    while break
+    end
     echo $i
 end
 for i in 1 2 3
-    while continue; end
+    while continue
+    end
     echo $i
 end
 
-if false ; or --help ; end
+if false; or --help
+end
 
 # Make sure while loops don't run forever with no-exec (#1543)
 echo "while true; end" | $fish --no-execute
diff --git a/tests/checks/pipestatus.fish b/tests/checks/pipestatus.fish
index e1063d946..fed646453 100644
--- a/tests/checks/pipestatus.fish
+++ b/tests/checks/pipestatus.fish
@@ -1,98 +1,176 @@
 #RUN: %fish %s
 
 # pipestatus variable - builtins only
-false | false | false; echo $pipestatus : $status
+false | false | false
+echo $pipestatus : $status
 #CHECK: 1 1 1 : 1
-true | true | true; echo $pipestatus : $status
+true | true | true
+echo $pipestatus : $status
 #CHECK: 0 0 0 : 0
-false | true | false; echo $pipestatus : $status
+false | true | false
+echo $pipestatus : $status
 #CHECK: 1 0 1 : 1
-true | false | true; echo $pipestatus : $status
+true | false | true
+echo $pipestatus : $status
 #CHECK: 0 1 0 : 0
 
 # pipestatus variable - no builtins
 # Note: On some systems `command false` fails with 255, not 1. We allow both.
-command false | command false | command false; echo $pipestatus : $status
+command false | command false | command false
+echo $pipestatus : $status
 #CHECK: {{1|255}} {{1|255}} {{1|255}} : 1
-command true | command true | command true; echo $pipestatus : $status
+command true | command true | command true
+echo $pipestatus : $status
 #CHECK: 0 0 0 : 0
-command false | command true | command false; echo $pipestatus : $status
+command false | command true | command false
+echo $pipestatus : $status
 #CHECK: {{1|255}} 0 {{1|255}} : 1
-command true | command false | command true; echo $pipestatus : $status
+command true | command false | command true
+echo $pipestatus : $status
 #CHECK: 0 {{1|255}} 0 : 0
 
 # pipestatus variable - mixed
-command false | command false | false; echo $pipestatus : $status
+command false | command false | false
+echo $pipestatus : $status
 #CHECK: {{1|255}} {{1|255}} 1 : 1
-command true | true | command true; echo $pipestatus : $status
+command true | true | command true
+echo $pipestatus : $status
 #CHECK: 0 0 0 : 0
-false | command true | command false; echo $pipestatus : $status
+false | command true | command false
+echo $pipestatus : $status
 #CHECK: 1 0 {{1|255}} : 1
-true | false | command true; echo $pipestatus : $status
+true | false | command true
+echo $pipestatus : $status
 #CHECK: 0 1 0 : 0
-sh -c 'exit 5' | sh -c 'exit 2'; echo $pipestatus : $status
+sh -c 'exit 5' | sh -c 'exit 2'
+echo $pipestatus : $status
 #CHECK: 5 2 : 2
-sh -c 'exit 3' | false | sh -c 'exit 6'; echo $pipestatus : $status
+sh -c 'exit 3' | false | sh -c 'exit 6'
+echo $pipestatus : $status
 #CHECK: 3 1 6 : 6
-sh -c 'exit 9' | true | sh -c 'exit 3' | false; echo $pipestatus : $status
+sh -c 'exit 9' | true | sh -c 'exit 3' | false
+echo $pipestatus : $status
 #CHECK: 9 0 3 1 : 1
 
 # pipestatus variable - non-pipe
-true; echo $pipestatus : $status
+true
+echo $pipestatus : $status
 #CHECK: 0 : 0
-false; echo $pipestatus : $status
+false
+echo $pipestatus : $status
 #CHECK: 1 : 1
-command true; echo $pipestatus : $status
+command true
+echo $pipestatus : $status
 #CHECK: 0 : 0
-command false; echo $pipestatus : $status
+command false
+echo $pipestatus : $status
 #CHECK: {{1|255}} : 1
-sh -c 'exit 4'; echo $pipestatus : $status
+sh -c 'exit 4'
+echo $pipestatus : $status
 #CHECK: 4 : 4
 
 # pipestatus variable - negate
-! true; echo $pipestatus : $status
+! true
+echo $pipestatus : $status
 #CHECK: 0 : 1
-! false; echo $pipestatus : $status
+! false
+echo $pipestatus : $status
 #CHECK: 1 : 0
-! false | false | false; echo $pipestatus : $status
+! false | false | false
+echo $pipestatus : $status
 #CHECK: 1 1 1 : 0
-! true | command true | true; echo $pipestatus : $status
+! true | command true | true
+echo $pipestatus : $status
 #CHECK: 0 0 0 : 1
-! false | true | command false; echo $pipestatus : $status
+! false | true | command false
+echo $pipestatus : $status
 #CHECK: 1 0 {{1|255}} : 0
-! command true | command false | command true; echo $pipestatus : $status
+! command true | command false | command true
+echo $pipestatus : $status
 #CHECK: 0 {{1|255}} 0 : 1
-! sh -c 'exit 9' | true | sh -c 'exit 3'; echo $pipestatus : $status
+! sh -c 'exit 9' | true | sh -c 'exit 3'
+echo $pipestatus : $status
 #CHECK: 9 0 3 : 0
 
 # pipestatus variable - block
-begin; true; end; echo $pipestatus : $status
+begin
+    true
+end
+echo $pipestatus : $status
 #CHECK: 0 : 0
-begin; false; end; echo $pipestatus : $status
+begin
+    false
+end
+echo $pipestatus : $status
 #CHECK: 1 : 1
-begin; ! true; end; echo $pipestatus : $status
+begin
+    ! true
+end
+echo $pipestatus : $status
 #CHECK: 0 : 1
-begin; ! false; end; echo $pipestatus : $status
+begin
+    ! false
+end
+echo $pipestatus : $status
 #CHECK: 1 : 0
-true | begin; true; end; echo $pipestatus : $status
+true | begin
+    true
+end
+echo $pipestatus : $status
 #CHECK: 0 0 : 0
-false | begin; false; end; echo $pipestatus : $status
+false | begin
+    false
+end
+echo $pipestatus : $status
 #CHECK: 1 1 : 1
-true | begin; ! true; end; echo $pipestatus : $status
+true | begin
+    ! true
+end
+echo $pipestatus : $status
 #CHECK: 0 1 : 1
-false | begin; ! false; end; echo $pipestatus : $status
+false | begin
+    ! false
+end
+echo $pipestatus : $status
 #CHECK: 1 0 : 0
-begin; true | false; end; echo $pipestatus : $status
+begin
+    true | false
+end
+echo $pipestatus : $status
 #CHECK: 0 1 : 1
-begin; false | true; end; echo $pipestatus : $status
+begin
+    false | true
+end
+echo $pipestatus : $status
 #CHECK: 1 0 : 0
-begin; ! true; end | false ; echo $pipestatus : $status
+begin
+    ! true
+end | false
+echo $pipestatus : $status
 #CHECK: 1 1 : 1
-begin; ! false; end | true; echo $pipestatus : $status
+begin
+    ! false
+end | true
+echo $pipestatus : $status
 #CHECK: 0 0 : 0
-begin; sh -c 'exit 3'; end | begin; sh -c 'exit 5'; end; echo $pipestatus : $status
+begin
+    sh -c 'exit 3'
+end | begin
+    sh -c 'exit 5'
+end
+echo $pipestatus : $status
 #CHECK: 3 5 : 5
-begin; ! sh -c 'exit 3'; end | begin; sh -c 'exit 5'; end; echo $pipestatus : $status
+begin
+    ! sh -c 'exit 3'
+end | begin
+    sh -c 'exit 5'
+end
+echo $pipestatus : $status
 #CHECK: 0 5 : 5
-begin; ! sh -c 'exit 3'; end | begin; ! sh -c 'exit 5'; end; echo $pipestatus : $status
+begin
+    ! sh -c 'exit 3'
+end | begin
+    ! sh -c 'exit 5'
+end
+echo $pipestatus : $status
 #CHECK: 0 0 : 0
diff --git a/tests/checks/printf.fish b/tests/checks/printf.fish
index 3e255a92c..4b0fec975 100644
--- a/tests/checks/printf.fish
+++ b/tests/checks/printf.fish
@@ -84,7 +84,7 @@ for locale in {$acceptable_locales}.{UTF-8,UTF8}
 end
 
 # OpenBSD's wcstod does not honor LC_NUMERIC, meaning this feature is broken there.
-if set -q numeric_locale[1]; and test (uname) != "OpenBSD"
+if set -q numeric_locale[1]; and test (uname) != OpenBSD
     set -x LC_NUMERIC $numeric_locale
     printf '%e\n' "3,45" # should succeed, output should be 3,450000e+00
     printf '%e\n' "4.56" # should succeed, output should be 4,560000e+00
diff --git a/tests/checks/psub.fish b/tests/checks/psub.fish
index bf3676c7b..d277072e2 100644
--- a/tests/checks/psub.fish
+++ b/tests/checks/psub.fish
@@ -15,7 +15,7 @@ or echo 'psub is not a fifo' >&2
 # hack: the background write that psub peforms may block
 # until someone opens the fifo for reading. So make sure we
 # actually read it.
-cat $filename > /dev/null
+cat $filename >/dev/null
 rm $filename
 
 cat (echo foo | psub)
diff --git a/tests/checks/random.fish b/tests/checks/random.fish
index 6b4e1b718..3eddeb8de 100644
--- a/tests/checks/random.fish
+++ b/tests/checks/random.fish
@@ -40,7 +40,7 @@ random choic a b c
 #CHECKERR: random: Too many arguments
 
 function check_boundaries
-    if not test $argv[1] -ge $argv[2] -a $argv[1] -le $argv[3] 
+    if not test $argv[1] -ge $argv[2] -a $argv[1] -le $argv[3]
         printf "Unexpected: %s <= %s <= %s not verified\n" $argv[2] $argv[1] $argv[3] >&2
         return 1
     end
@@ -93,7 +93,7 @@ for i in (seq 10)
     test_step 0 $i 10
     test_step -5 $i 5
     test_step -10 $i 0
-    
+
     test_choice a
     test_choice foo bar
     test_choice bass trout salmon zander perch carp
diff --git a/tests/checks/read.fish b/tests/checks/read.fish
index 41dee9135..b9e93ca1a 100644
--- a/tests/checks/read.fish
+++ b/tests/checks/read.fish
@@ -38,13 +38,13 @@ begin
 end
 
 function print_vars --no-scope-shadowing
-	set -l space
-	set -l IFS \n # ensure our command substitution works right
-	for var in $argv
-		echo -n $space (count $$var) \'$$var\'
-		set space ''
-	end
-	echo
+    set -l space
+    set -l IFS \n # ensure our command substitution works right
+    for var in $argv
+        echo -n $space (count $$var) \'$$var\'
+        set space ''
+    end
+    echo
 end
 
 # Test splitting input
@@ -60,34 +60,34 @@ print_vars one
 echo '' | read -l one two
 print_vars one two
 #CHECK: 1 '' 1 ''
-echo 'test' | read -l one two three
+echo test | read -l one two three
 print_vars one two three
 #CHECK: 1 'test' 1 '' 1 ''
 echo 'foo   bar   baz' | read -l one two three
 print_vars one two three
 #CHECK: 1 'foo' 1 'bar' 1 '  baz'
-echo -n 'a' | read -l one
+echo -n a | read -l one
 echo "$status $one"
 #CHECK: 0 a
 
 # Test splitting input with IFS empty
 set -l IFS
-echo 'hello' | read -l one
+echo hello | read -l one
 print_vars one
 #CHECK: 1 'hello'
-echo 'hello' | read -l one two
+echo hello | read -l one two
 print_vars one two
 #CHECK: 1 'h' 1 'ello'
-echo 'hello' | read -l one two three
+echo hello | read -l one two three
 print_vars one two three
 #CHECK: 1 'h' 1 'e' 1 'llo'
 echo '' | read -l one
 print_vars one
 #CHECK: 0
-echo 't' | read -l one two
+echo t | read -l one two
 print_vars one two
 #CHECK: 1 't' 0
-echo 't' | read -l one two three
+echo t | read -l one two three
 print_vars one two three
 #CHECK: 1 't' 0 0
 echo ' t' | read -l one two
@@ -98,7 +98,7 @@ set -le IFS
 echo 'hello there' | read -la ary
 print_vars ary
 #CHECK: 2 'hello' 'there'
-echo 'hello' | read -la ary
+echo hello | read -la ary
 print_vars ary
 #CHECK: 1 'hello'
 echo 'this is a bunch of words' | read -la ary
@@ -112,10 +112,10 @@ print_vars ary
 #CHECK: 0
 
 set -l IFS
-echo 'hello' | read -la ary
+echo hello | read -la ary
 print_vars ary
 #CHECK: 5 'h' 'e' 'l' 'l' 'o'
-echo 'h' | read -la ary
+echo h | read -la ary
 print_vars ary
 #CHECK: 1 'h'
 echo '' | read -la ary
@@ -124,32 +124,35 @@ print_vars ary
 set -le IFS
 
 # read -n tests
-echo 'testing' | read -n 3 foo
+echo testing | read -n 3 foo
 echo $foo
 #CHECK: tes
-echo 'test' | read -n 10 foo
+echo test | read -n 10 foo
 echo $foo
 #CHECK: test
-echo 'test' | read -n 0 foo
+echo test | read -n 0 foo
 echo $foo
 #CHECK: test
-echo 'testing' | begin; read -n 3 foo; read -n 3 bar; end
+echo testing | begin
+    read -n 3 foo
+    read -n 3 bar
+end
 echo $foo
 #CHECK: tes
 echo $bar
 #CHECK: tin
-echo 'test' | read -n 1 foo
+echo test | read -n 1 foo
 echo $foo
 #CHECK: t
 
 # read -z tests
-echo -n 'testing' | read -lz foo
+echo -n testing | read -lz foo
 echo $foo
 #CHECK: testing
 echo -n 'test ing' | read -lz foo
 echo $foo
 #CHECK: test ing
-echo 'newline' | read -lz foo
+echo newline | read -lz foo
 echo $foo
 #CHECK: newline
 #CHECK: 
@@ -171,8 +174,8 @@ end
 # Chunked read tests
 set -l path /tmp/fish_chunked_read_test.txt
 set -l longstr (seq 1024 | string join ',')
-echo -n $longstr > $path
-read -l longstr2 < $path
+echo -n $longstr >$path
+read -l longstr2 <$path
 test "$longstr" = "$longstr2"
 and echo "Chunked reads test pass"
 or echo "Chunked reads test failure: long strings don't match!"
@@ -319,7 +322,9 @@ echo $c
 begin
     set -l IFS "..."
     echo a...b...c | read -l a b c
-    echo $a; echo $b; echo $c
+    echo $a
+    echo $b
+    echo $c
 end
 #CHECK: a
 #CHECK: b
diff --git a/tests/checks/redirect.fish b/tests/checks/redirect.fish
index f7f72cae3..3c2ef6b2f 100644
--- a/tests/checks/redirect.fish
+++ b/tests/checks/redirect.fish
@@ -52,7 +52,11 @@ rm -Rf $tmpdir
 
 # Verify that we can turn stderr into stdout and then pipe it
 # Note that the order here has historically been unspecified - 'errput' could conceivably appear before 'output'.
-begin ; echo output ; echo errput 1>&2  ; end 2>&1 | sort | tee ../test/temp/tee_test.txt ; cat ../test/temp/tee_test.txt
+begin
+    echo output
+    echo errput 1>&2
+end 2>&1 | sort | tee ../test/temp/tee_test.txt
+cat ../test/temp/tee_test.txt
 #CHECK: errput
 #CHECK: output
 #CHECK: errput
@@ -65,8 +69,12 @@ echo caret_no_redirect 12345^
 # Verify that we can pipe something other than stdout
 # The first line should be printed, since we output to stdout but pipe stderr to /dev/null
 # The second line should not be printed, since we output to stderr and pipe it to /dev/null
-begin ; echo is_stdout ; end 2>| cat > /dev/null
-begin ; echo is_stderr 1>&2 ; end 2>| cat > /dev/null
+begin
+    echo is_stdout
+end 2>| cat >/dev/null
+begin
+    echo is_stderr 1>&2
+end 2>| cat >/dev/null
 #CHECK: is_stdout
 
 # "Verify that pipes don't conflict with fd redirections"
diff --git a/tests/checks/scoping.fish b/tests/checks/scoping.fish
index 9bde31199..c07848c8c 100644
--- a/tests/checks/scoping.fish
+++ b/tests/checks/scoping.fish
@@ -4,19 +4,31 @@
 set -e smurf
 
 function setter
-set smurf green
+    set smurf green
 end
 
 function unsetter
-set -e smurf
+    set -e smurf
 end
 
 function call1
-set smurf blue; setter; if test $smurf = blue; echo Test 1 pass; else; echo Test 1 fail; end
+    set smurf blue
+    setter
+    if test $smurf = blue
+        echo Test 1 pass
+    else
+        echo Test 1 fail
+    end
 end
 
 function call2
-set smurf blue; unsetter; if test $smurf = blue; echo Test 2 pass; else; echo Test 2 fail; end
+    set smurf blue
+    unsetter
+    if test $smurf = blue
+        echo Test 2 pass
+    else
+        echo Test 2 fail
+    end
 end
 
 call1
@@ -25,11 +37,21 @@ call2
 #CHECK: Test 2 pass
 
 function call3
-setter; if test $smurf = green; echo Test 3 pass; else; echo Test 3 fail; end
+    setter
+    if test $smurf = green
+        echo Test 3 pass
+    else
+        echo Test 3 fail
+    end
 end
 
 function call4
-unsetter; if not set -q smurf; echo Test 4 pass; else; echo Test 4 fail; end
+    unsetter
+    if not set -q smurf
+        echo Test 4 pass
+    else
+        echo Test 4 fail
+    end
 end
 
 set -g smurf yellow
@@ -48,21 +70,21 @@ if test $status -ne 0
     echo Test 5 fail
 else
     echo Test 5 pass
-end;
+end
 #CHECK: Test 5 pass
 
 if not set -g -q bar
     echo Test 6 fail
 else
     echo Test 6 pass
-end;
+end
 #CHECK: Test 6 pass
 
 if not set -U -q baz
     echo Test 7 fail
 else
     echo Test 7 pass
-end;
+end
 #CHECK: Test 7 pass
 
 set -u -l -q foo
@@ -71,21 +93,21 @@ if test $status -ne 0
 else
     echo Test 8 pass
 
-end;
+end
 #CHECK: Test 8 pass
 
 if not set -u -g -q bar
     echo Test 9 fail
 else
     echo Test 9 pass
-end;
+end
 #CHECK: Test 9 pass
 
 if not set -u -U -q baz
     echo Test 10 fail
 else
     echo Test 10 pass
-end;
+end
 #CHECK: Test 10 pass
 
 set -x -l -q foo
@@ -93,21 +115,21 @@ if test $status -eq 0
     echo Test 11 fail
 else
     echo Test 11 pass
-end;
+end
 #CHECK: Test 11 pass
 
 if set -x -g -q bar
     echo Test 12 fail
 else
     echo Test 12 pass
-end;
+end
 #CHECK: Test 12 pass
 
 if set -x -U -q baz
     echo Test 13 fail
 else
     echo Test 13 pass
-end;
+end
 #CHECK: Test 13 pass
 
 set -x -l foo 1
@@ -119,14 +141,14 @@ if test $status -ne 0
     echo Test 14 fail
 else
     echo Test 14 pass
-end;
+end
 #CHECK: Test 14 pass
 
 if not set -g -q bar
     echo Test 15 fail
 else
     echo Test 15 pass
-end;
+end
 #CHECK: Test 15 pass
 
 if not set -U -q baz
@@ -134,7 +156,7 @@ if not set -U -q baz
 else
     echo Test 16 pass
 
-end;
+end
 #CHECK: Test 16 pass
 
 set -u -l -q foo
@@ -142,14 +164,14 @@ if test $status -ne 1
     echo Test 17 fail
 else
     echo Test 17 pass
-end;
+end
 #CHECK: Test 17 pass
 
 if set -u -g -q bar
     echo Test 18 fail
 else
     echo Test 18 pass
-end;
+end
 #CHECK: Test 18 pass
 
 if set -u -U -q baz
@@ -157,7 +179,7 @@ if set -u -U -q baz
 else
     echo Test 19 pass
 
-end;
+end
 #CHECK: Test 19 pass
 
 set -x -l -q foo
@@ -165,21 +187,21 @@ if test $status -ne 0
     echo Test 20 fail
 else
     echo Test 20 pass
-end;
+end
 #CHECK: Test 20 pass
 
 if not set -x -g -q bar
     echo Test 21 fail
 else
     echo Test 21 pass
-end;
+end
 #CHECK: Test 21 pass
 
 if not set -x -U -q baz
     echo Test 22 fail
 else
     echo Test 22 pass
-end;
+end
 #CHECK: Test 22 pass
 
 set -U -e baz
@@ -189,37 +211,59 @@ echo (false) $status (true) $status (false) $status
 #CHECK: 1 0 1
 
 # Verify that set passes through exit status, except when passed -n or -q or -e
-false ; set foo bar ; echo 1 $status # passthrough
+false
+set foo bar
+echo 1 $status # passthrough
 #CHECK: 1 1
-true ; set foo bar ; echo 2 $status # passthrough
+true
+set foo bar
+echo 2 $status # passthrough
 #CHECK: 2 0
-false ; set -q foo ; echo 3 $status # no passthrough
+false
+set -q foo
+echo 3 $status # no passthrough
 #CHECK: 3 0
-true ; set -q foo ; echo 4 $status  # no passthrough
+true
+set -q foo
+echo 4 $status # no passthrough
 #CHECK: 4 0
-false ; set -n > /dev/null ; echo 5 $status # no passthrough
+false
+set -n >/dev/null
+echo 5 $status # no passthrough
 #CHECK: 5 0
-false ; set -e foo ; echo 6 $status # no passthrough
+false
+set -e foo
+echo 6 $status # no passthrough
 #CHECK: 6 0
-true ; set -e foo ; echo 7 $status # no passthrough
+true
+set -e foo
+echo 7 $status # no passthrough
 #CHECK: 7 4
-false ; set -h > /dev/null ; echo 8 $status # no passthrough
+false
+set -h >/dev/null
+echo 8 $status # no passthrough
 #CHECK: 8 0
-true ; set -NOT_AN_OPTION 2> /dev/null ; echo 9 $status # no passthrough
+true
+set -NOT_AN_OPTION 2>/dev/null
+echo 9 $status # no passthrough
 #CHECK: 9 2
-false ; set foo (echo A; true) ; echo 10 $status $foo
+false
+set foo (echo A; true)
+echo 10 $status $foo
 #CHECK: 10 0 A
-true ; set foo (echo B; false) ; echo 11 $status $foo
+true
+set foo (echo B; false)
+echo 11 $status $foo
 #CHECK: 11 1 B
 true
 
 function setql_check
-  set -l setql_foo val
-  if set -ql setql_foo
-    echo Pass
-  else
-    echo Fail
-  end
+    set -l setql_foo val
+    if set -ql setql_foo
+        echo Pass
+    else
+        echo Fail
+    end
 end
 setql_check
 #CHECK: Pass
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index 8dc65b762..35011c72d 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -618,10 +618,15 @@ env | grep TESTVAR | cat -v
 
 # if/for/while scope
 function test_ifforwhile_scope
-    if set -l ifvar1 (true && echo val1) ; end
-    if set -l ifvar2 (echo val2 && false) ; end
-    if false ; else if set -l ifvar3 (echo val3 && false) ; end
-    while set -l whilevar1 (echo val3 ; false) ; end
+    if set -l ifvar1 (true && echo val1)
+    end
+    if set -l ifvar2 (echo val2 && false)
+    end
+    if false
+    else if set -l ifvar3 (echo val3 && false)
+    end
+    while set -l whilevar1 (echo val3 ; false)
+    end
     set --show ifvar1 ifvar2 ifvar3 whilevar1
 end
 test_ifforwhile_scope
diff --git a/tests/checks/sigint2.fish b/tests/checks/sigint2.fish
index a8b1d18e8..7b6c78da3 100644
--- a/tests/checks/sigint2.fish
+++ b/tests/checks/sigint2.fish
@@ -7,7 +7,7 @@ echo About to sigint
 #CHECK: About to sigint
 
 while true
-  sh -c 'echo Here we go; sleep .25; kill -s INT $$'
+    sh -c 'echo Here we go; sleep .25; kill -s INT $$'
 end
 #CHECK: Here we go
 
diff --git a/tests/checks/slices.fish b/tests/checks/slices.fish
index 3579a0837..f4f9b5114 100644
--- a/tests/checks/slices.fish
+++ b/tests/checks/slices.fish
@@ -1,27 +1,31 @@
 #RUN: %fish %s
 set n 10
 set test (seq $n)
-echo $test[1..$n]      # normal range
+echo $test[1..$n] # normal range
 #CHECK: 1 2 3 4 5 6 7 8 9 10
-echo $test[1 .. 2]     # spaces are allowed
+echo $test[1 .. 2] # spaces are allowed
 #CHECK: 1 2
-echo $test[$n..1]      # inverted range
+echo $test[$n..1] # inverted range
 #CHECK: 10 9 8 7 6 5 4 3 2 1
-echo $test[2..5 8..6]  # several ranges
+echo $test[2..5 8..6] # several ranges
 #CHECK: 2 3 4 5 8 7 6
-echo $test[-1..-2]     # range with negative limits
+echo $test[-1..-2] # range with negative limits
 #CHECK: 10 9
-echo $test[-1..1]      # range with mixed limits
+echo $test[-1..1] # range with mixed limits
 #CHECK: 10 9 8 7 6 5 4 3 2 1
 
 set test1 $test
-set test1[-1..1] $test; echo $test1
+set test1[-1..1] $test
+echo $test1
 #CHECK: 10 9 8 7 6 5 4 3 2 1
-set test1[1..$n] $test; echo $test1
+set test1[1..$n] $test
+echo $test1
 #CHECK: 1 2 3 4 5 6 7 8 9 10
-set test1[$n..1] $test; echo $test1
+set test1[$n..1] $test
+echo $test1
 #CHECK: 10 9 8 7 6 5 4 3 2 1
-set test1[2..4 -2..-4] $test1[4..2 -4..-2]; echo $test1
+set test1[2..4 -2..-4] $test1[4..2 -4..-2]
+echo $test1
 #CHECK: 10 7 8 9 6 5 2 3 4 1
 
 echo (seq 5)[-1..1]
diff --git a/tests/checks/status-command.fish b/tests/checks/status-command.fish
index e13c2af88..fdd0c2d5f 100644
--- a/tests/checks/status-command.fish
+++ b/tests/checks/status-command.fish
@@ -11,8 +11,12 @@ test "$status_fish_path" = "$env_fish_path"
 or echo "Fish path disagreement: $status_fish_path vs $env_fish_path"
 
 # Check is-block
-status is-block ; echo $status
-begin ; status is-block ; echo $status ; end
+status is-block
+echo $status
+begin
+    status is-block
+    echo $status
+end
 # CHECK: 1
 # CHECK: 0
 
@@ -27,7 +31,8 @@ end
 print_my_name
 # CHECK: print_my_name
 
-status is-command-substitution; echo $status
+status is-command-substitution
+echo $status
 echo (status is-command-substitution; echo $status)
 # CHECK: 1
 # CHECK: 0
diff --git a/tests/checks/status.fish b/tests/checks/status.fish
index 26de571d6..5257a64f3 100644
--- a/tests/checks/status.fish
+++ b/tests/checks/status.fish
@@ -57,20 +57,26 @@ status features
 #CHECK: stderr-nocaret	off	3.0	^ no longer redirects stderr
 #CHECK: qmark-noglob	off	3.0	? no longer globs
 #CHECK: regex-easyesc	off	3.1	string replace -r needs fewer \'s
-status test-feature stderr-nocaret ; echo $status
+status test-feature stderr-nocaret
+echo $status
 #CHECK: 1
-status test-feature not-a-feature ; echo $status
+status test-feature not-a-feature
+echo $status
 #CHECK: 2
 
 # Ensure $status isn't reset before a function is executed
 function echo_last
-	echo $status
+    echo $status
 end
 
-false; echo_last; echo $status #1
+false
+echo_last
+echo $status #1
 #CHECK: 1
 #CHECK: 0
 
 # Verify that if swallows failure - see #1061
-if false ; end ; echo $status
+if false
+end
+echo $status
 #CHECK: 0
diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index be2b77e76..da967c93a 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -92,10 +92,10 @@ string escape --style=var 'a b#c"\'d'
 string escape --style=var a\nghi_
 # CHECK: a_0A_ghi__
 
-string escape --style=var 'abc'
+string escape --style=var abc
 # CHECK: abc
 
-string escape --style=var '_a_b_c_'
+string escape --style=var _a_b_c_
 # CHECK: __a__b__c__
 
 string escape --style=var -- -
@@ -238,7 +238,7 @@ or echo Unexpected exit status at line (status --current-line-number)
 # CHECK: dXf
 # CHECK: jkX
 
-string replace --regex -f "Z" X 1bc axc 2 d3f jk4 xyz
+string replace --regex -f Z X 1bc axc 2 d3f jk4 xyz
 and echo Unexpected exit status at line (status --current-line-number)
 
 # From https://github.com/fish-shell/fish-shell/issues/5201
@@ -272,22 +272,22 @@ string match -rvn a bbb; or echo "exit 1"
 # CHECK: 1 3
 
 ### Test repeat subcommand
-string repeat -n 2 "foo"
+string repeat -n 2 foo
 # CHECK: foofoo
 
-string repeat --count 2 "foo"
+string repeat --count 2 foo
 # CHECK: foofoo
 
 echo foo | string repeat -n 2
 # CHECK: foofoo
 
-string repeat -n2 -q "foo"; and echo "exit 0"
+string repeat -n2 -q foo; and echo "exit 0"
 # CHECK: exit 0
 
-string repeat -n2 --quiet "foo"; and echo "exit 0"
+string repeat -n2 --quiet foo; and echo "exit 0"
 # CHECK: exit 0
 
-string repeat -n0 "foo"; or echo "exit 1"
+string repeat -n0 foo; or echo "exit 1"
 # CHECK: exit 1
 
 string repeat -n0; or echo "exit 1"
@@ -304,31 +304,31 @@ string repeat -n1 --no-newline "there is "
 echo "no newline"
 # CHECK: there is no newline
 
-string repeat -n10 -m4 "foo"
+string repeat -n10 -m4 foo
 # CHECK: foof
 
-string repeat -n10 --max 5 "foo"
+string repeat -n10 --max 5 foo
 # CHECK: foofo
 
-string repeat -n3 -m20 "foo"
+string repeat -n3 -m20 foo
 # CHECK: foofoofoo
 
-string repeat -m4 "foo"
+string repeat -m4 foo
 # CHECK: foof
 
-string repeat -n-1 "foo"; and echo "exit 0"
+string repeat -n-1 foo; and echo "exit 0"
 # CHECKERR: string repeat: Invalid count value '-1'
 
-string repeat -m-1 "foo"; and echo "exit 0"
+string repeat -m-1 foo; and echo "exit 0"
 # CHECKERR: string repeat: Invalid max value '-1'
 
-string repeat -n notanumber "foo"; and echo "exit 0"
+string repeat -n notanumber foo; and echo "exit 0"
 # CHECKERR: string repeat: Argument 'notanumber' is not a valid integer
 
-string repeat -m notanumber "foo"; and echo "exit 0"
+string repeat -m notanumber foo; and echo "exit 0"
 # CHECKERR: string repeat: Argument 'notanumber' is not a valid integer
 
-echo "stdin" | string repeat -n1 "and arg"; and echo "exit 0"
+echo stdin | string repeat -n1 "and arg"; and echo "exit 0"
 # CHECKERR: string repeat: Too many arguments
 
 string repeat -n; and echo "exit 0"
@@ -417,7 +417,7 @@ or echo exit 1
 # Test `string lower` and `string upper`.
 set x (string lower abc DEF gHi)
 or echo string lower exit 1
-test $x[1] = 'abc' -a $x[2] = 'def' -a $x[3] = 'ghi'
+test $x[1] = abc -a $x[2] = def -a $x[3] = ghi
 or echo strings not converted to lowercase
 
 set x (echo abc DEF gHi | string lower)
@@ -430,7 +430,7 @@ and echo lowercasing a lowercase string did not fail as expected
 
 set x (string upper abc DEF gHi)
 or echo string upper exit 1
-test $x[1] = 'ABC' -a $x[2] = 'DEF' -a $x[3] = 'GHI'
+test $x[1] = ABC -a $x[2] = DEF -a $x[3] = GHI
 or echo strings not converted to uppercase
 
 set x (echo abc DEF gHi | string upper)
@@ -444,7 +444,7 @@ and echo uppercasing a uppercase string did not fail as expected
 # 'Check NUL'
 # Note: We do `string escape` at the end to make a `\0` literal visible.
 printf 'a\0b' | string escape
-printf 'a\0c' | string match -e 'a' | string escape
+printf 'a\0c' | string match -e a | string escape
 printf 'a\0d' | string split '' | string escape
 printf 'a\0b' | string match -r '.*b$' | string escape
 printf 'a\0b' | string replace b g | string escape
diff --git a/tests/checks/switch.fish b/tests/checks/switch.fish
index 4898f7d93..f0706867d 100644
--- a/tests/checks/switch.fish
+++ b/tests/checks/switch.fish
@@ -72,21 +72,21 @@ end
 
 set smurf green
 
-switch $smurf;
-	case "*ee*"
-		echo Test 1 pass
-	case "*"
-		echo Test 1 fail
-end;
+switch $smurf
+    case "*ee*"
+        echo Test 1 pass
+    case "*"
+        echo Test 1 fail
+end
 #CHECK: Test 1 pass
 
 switch $smurf
-	case *ee*
-		echo Test 2 fail
-	case red green blue
-		echo Test 2 pass
-	case "*"
-		echo Test 2 fail
+    case *ee*
+        echo Test 2 fail
+    case red green blue
+        echo Test 2 pass
+    case "*"
+        echo Test 2 fail
 end
 #CHECKERR: {{.*}}switch.fish (line {{\d+}}): No matches for wildcard '*ee*'. See `help expand`.
 #CHECKERR: case *ee*
@@ -94,9 +94,9 @@ end
 #CHECK: Test 2 pass
 
 switch $smurf
-	case cyan magenta yellow
-		echo Test 3 fail
-	case "*"
-		echo Test 3 pass
+    case cyan magenta yellow
+        echo Test 3 fail
+    case "*"
+        echo Test 3 pass
 end
 #CHECK: Test 3 pass
diff --git a/tests/checks/test.fish b/tests/checks/test.fish
index 7c630c09a..cce83f0cf 100644
--- a/tests/checks/test.fish
+++ b/tests/checks/test.fish
@@ -13,5 +13,5 @@ test 5 -eq nan
 # CHECKERR: test 5 -eq nan
 # CHECKERR: ^
 
-test -z "nan" || echo nan is fine
+test -z nan || echo nan is fine
 # CHECK: nan is fine
diff --git a/tests/checks/threads.fish b/tests/checks/threads.fish
index dc54253e6..024bf77db 100644
--- a/tests/checks/threads.fish
+++ b/tests/checks/threads.fish
@@ -1,3 +1,3 @@
 #RUN: %fish %s
 # Check we can handle more than 64 threads (if not this HANGS!):
-true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true )))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
+true (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true )))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
diff --git a/tests/interactive.fish b/tests/interactive.fish
index 3cac395f9..f167877c4 100644
--- a/tests/interactive.fish
+++ b/tests/interactive.fish
@@ -63,7 +63,7 @@ function test_file
         rm -f $file.tmp.{err,out,log}
         return 0
     else
-        say red "fail"
+        say red fail
         if test $out_status -ne 0
             say yellow "Output differs for file $file. Diff follows:"
             colordiff -u $file.out $file.tmp.out
diff --git a/tests/test.fish b/tests/test.fish
index fa471f357..61bf3e353 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -52,7 +52,7 @@ function test_in_file
         rm -f $base.tmp.{err,out}
         return 0
     else
-        say red "fail"
+        say red fail
         if test $out_status -ne 0
             say yellow "Output differs for file $file. Diff follows:"
             colordiff -u $base.out $base.tmp.out