diff --git a/docs/development/plugin-creation.md b/docs/development/plugin-creation.md
index 77c240dcf..2fbf7b77b 100644
--- a/docs/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -235,8 +235,8 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-hello-default() {
   declare desc="prints Hello \$APP"
-  declare cmd="hello" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="hello"
+  [[ "$1" == "$cmd" ]] && shift 1
   # Support --app/$DOKKU_APP_NAME flag
   # Use the following lines to reorder args into "$cmd $DOKKU_APP_NAME $@""
   [[ -n $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@
@@ -263,8 +263,8 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-hello-world() {
   declare desc="prints Hello world"
-  declare cmd="hello:world" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="hello:world"
+  [[ "$1" == "$cmd" ]] && shift 1
 
   echo "Hello world"
 }
diff --git a/plugins/00_dokku-standard/subcommands/report b/plugins/00_dokku-standard/subcommands/report
index 67a29e175..64ceccc8d 100755
--- a/plugins/00_dokku-standard/subcommands/report
+++ b/plugins/00_dokku-standard/subcommands/report
@@ -5,8 +5,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-report() {
   declare desc="reports dokku vitals for troubleshooting"
-  local cmd="report"
-  declare APP="$2"
+  declare cmd="report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
   dokku_log_info1 "uname: $(uname -a)"
   dokku_log_info1 "memory: "
diff --git a/plugins/00_dokku-standard/subcommands/run b/plugins/00_dokku-standard/subcommands/run
index e7a82c1df..aee53826a 100755
--- a/plugins/00_dokku-standard/subcommands/run
+++ b/plugins/00_dokku-standard/subcommands/run
@@ -2,12 +2,12 @@
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 cmd-run() {
   declare desc="runs command in container based on app image"
-  declare cmd="run" APP=""
-  shift
+  declare cmd="run"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP=""
 
   declare -a RUN_ENV
   RUN_ENV=()
diff --git a/plugins/00_dokku-standard/subcommands/urls b/plugins/00_dokku-standard/subcommands/urls
index 8a2be2cbe..8c37b1e53 100755
--- a/plugins/00_dokku-standard/subcommands/urls
+++ b/plugins/00_dokku-standard/subcommands/urls
@@ -4,8 +4,11 @@ set -eo pipefail
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-urls() {
+  declare desc="reports dokku vitals for troubleshooting"
+  declare cmd="url"
+  declare APP="$2"
+
   [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  local APP="$2"
 
   get_app_urls "$@"
 }
diff --git a/plugins/20_events/subcommands/default b/plugins/20_events/subcommands/default
index 93f7e646f..fdbbbf36b 100755
--- a/plugins/20_events/subcommands/default
+++ b/plugins/20_events/subcommands/default
@@ -5,9 +5,12 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-events-default() {
   declare desc="shows contents of dokku events log"
-  local cmd="events"
+  declare cmd="events"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare TAIL="$1"
+
   if [[ -f $DOKKU_EVENTS_LOGFILE ]]; then
-    if [[ $2 == "-t" ]]; then
+    if [[ "$TAIL" == "-t" ]]; then
       tail -F "$DOKKU_EVENTS_LOGFILE"
     else
       tail -n 100 "$DOKKU_EVENTS_LOGFILE"
diff --git a/plugins/20_events/subcommands/list b/plugins/20_events/subcommands/list
index c8e22dc65..b71e2ad3e 100755
--- a/plugins/20_events/subcommands/list
+++ b/plugins/20_events/subcommands/list
@@ -5,7 +5,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-events-list() {
   declare desc="lists enabled events"
-  local cmd="events:list"
+  declare cmd="events:list"
+  [[ "$1" == "$cmd" ]] && shift 1
+
   local PLUGIN_DIR="$(dirname "$0")/.."
   local logged hook
 
diff --git a/plugins/20_events/subcommands/off b/plugins/20_events/subcommands/off
index 6adf893d0..f19559dbc 100755
--- a/plugins/20_events/subcommands/off
+++ b/plugins/20_events/subcommands/off
@@ -5,7 +5,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-events-off() {
   declare desc="disables dokku events logger"
-  local cmd="events:off"
+  declare cmd="events:off"
+  [[ "$1" == "$cmd" ]] && shift 1
+
   echo "Disabling dokku events logger"
   rm -f "$DOKKU_ROOT/.dokkurc/DOKKU_EVENTS"
 }
diff --git a/plugins/20_events/subcommands/on b/plugins/20_events/subcommands/on
index 15738c528..4d7af3ecc 100755
--- a/plugins/20_events/subcommands/on
+++ b/plugins/20_events/subcommands/on
@@ -5,7 +5,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-events-on() {
   declare desc="enables dokku events logger"
-  local cmd="events:on"
+  declare cmd="events:on"
+  [[ "$1" == "$cmd" ]] && shift 1
+
   echo "Enabling dokku events logger"
   [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
   echo "export DOKKU_EVENTS=1" >"$DOKKU_ROOT/.dokkurc/DOKKU_EVENTS"
diff --git a/plugins/apps/internal-functions b/plugins/apps/internal-functions
index 7ed59bcf6..87f5546aa 100755
--- a/plugins/apps/internal-functions
+++ b/plugins/apps/internal-functions
@@ -6,9 +6,10 @@ set -eo pipefail
 
 cmd-apps-report() {
   declare desc="displays the app report for one or more apps"
-  local cmd="apps:report"
+  declare cmd="apps:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
@@ -80,7 +81,8 @@ cmd-apps-report-single() {
 
 cmd-apps-list() {
   declare desc="lists all apps"
-  local cmd="apps"
+  declare cmd="apps"
+  [[ "$1" == "$cmd" ]] && shift 1
   local app
 
   dokku_log_info2_quiet "My Apps"
diff --git a/plugins/apps/subcommands/clone b/plugins/apps/subcommands/clone
index 21b405d11..7ba17a6a9 100755
--- a/plugins/apps/subcommands/clone
+++ b/plugins/apps/subcommands/clone
@@ -7,11 +7,10 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 cmd-apps-clone() {
   declare desc="clones an app"
-  declare cmd="apps:clone" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="apps:clone"
+  [[ "$1" == "$cmd" ]] && shift 1
   declare OLD_APP="$1" NEW_APP="$2"
-  local IGNORE_EXISTING=false
-  local SKIP_REBUILD=false
+  local IGNORE_EXISTING=false SKIP_REBUILD=false
 
   for arg in "$@"; do
     [[ "$arg" == "--skip-deploy" ]] && shift 1 && SKIP_REBUILD=true
diff --git a/plugins/apps/subcommands/create b/plugins/apps/subcommands/create
index ca0b1783d..0a538f940 100755
--- a/plugins/apps/subcommands/create
+++ b/plugins/apps/subcommands/create
@@ -5,8 +5,11 @@ source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 
 cmd-apps-create() {
   declare desc="creates app via command line"
-  local cmd="apps:create"
-  apps_create "$2"
+  declare cmd="apps:create"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  apps_create "$APP"
 }
 
 cmd-apps-create "$@"
diff --git a/plugins/apps/subcommands/destroy b/plugins/apps/subcommands/destroy
index 1cdd0c97c..6accc0a29 100755
--- a/plugins/apps/subcommands/destroy
+++ b/plugins/apps/subcommands/destroy
@@ -6,11 +6,14 @@ source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 
 cmd-apps-destroy() {
   declare desc="destroys an app"
-  local cmd="apps:destroy"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  [[ "$2" == "tls" ]] && dokku_log_fail "Unable to destroy tls directory"
-  [[ "$3" == "force" ]] && export DOKKU_APPS_FORCE_DELETE=1
-  local APP="$2"
+  declare cmd="apps:destroy"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" FORCE="$2"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  [[ "$APP" == "tls" ]] && dokku_log_fail "Unable to destroy tls directory"
+  [[ "$FORCE" == "force" ]] && export DOKKU_APPS_FORCE_DELETE=1
+
   apps_destroy "$APP"
 }
 
diff --git a/plugins/apps/subcommands/exists b/plugins/apps/subcommands/exists
index bb3c6b9fc..1bbc9113e 100755
--- a/plugins/apps/subcommands/exists
+++ b/plugins/apps/subcommands/exists
@@ -5,7 +5,7 @@ source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 
 cmd-apps-exist() {
   declare desc="checks if an app exists"
-  local cmd="apps:exists"
+  declare cmd="apps:exists"
   [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1"
 
diff --git a/plugins/apps/subcommands/lock b/plugins/apps/subcommands/lock
index 0905c8952..4659902c4 100755
--- a/plugins/apps/subcommands/lock
+++ b/plugins/apps/subcommands/lock
@@ -9,10 +9,9 @@ cmd-apps-lock() {
   declare cmd="apps:lock"
   [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1"
+
   verify_app_name "$APP"
-
   touch "$DOKKU_ROOT/$APP/.deploy.lock" || dokku_log_fail "Unable to create deploy lock"
-
   dokku_log_info1 "Deploy lock created"
 }
 
diff --git a/plugins/apps/subcommands/locked b/plugins/apps/subcommands/locked
index 5d1391e13..6dc51b779 100755
--- a/plugins/apps/subcommands/locked
+++ b/plugins/apps/subcommands/locked
@@ -9,6 +9,7 @@ cmd-apps-locked() {
   declare cmd="apps:locked"
   [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1"
+
   verify_app_name "$APP"
   local LOCKED="$(apps_is_locked "$APP")"
 
diff --git a/plugins/apps/subcommands/rename b/plugins/apps/subcommands/rename
index 1cd5a2f28..0ce98e154 100755
--- a/plugins/apps/subcommands/rename
+++ b/plugins/apps/subcommands/rename
@@ -7,11 +7,12 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 cmd-apps-rename() {
   declare desc="renames an app"
-  local cmd="apps:rename"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  [[ -d "$DOKKU_ROOT/$3" ]] && dokku_log_fail "Name is already taken"
-  local OLD_APP="$2"
-  local NEW_APP="$3"
+  declare cmd="apps:rename"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare OLD_APP="$1" NEW_APP="$2"
+
+  [[ -z "$OLD_APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  [[ -d "$DOKKU_ROOT/$NEW_APP" ]] && dokku_log_fail "Name is already taken"
   local OLD_CACHE_DIR="$DOKKU_ROOT/$OLD_APP/cache"
   local OLD_CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$OLD_APP/cache"
 
diff --git a/plugins/certs/internal-functions b/plugins/certs/internal-functions
index 76cdeaa92..231a6ed70 100755
--- a/plugins/certs/internal-functions
+++ b/plugins/certs/internal-functions
@@ -6,9 +6,10 @@ set -eo pipefail
 
 cmd-certs-report() {
   declare desc="displays an ssl report for one or more apps"
-  local cmd="certs:report"
+  declare cmd="certs:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
@@ -74,10 +75,12 @@ cmd-certs-report-single() {
 cmd-certs-info() {
   # This is here because it's used in both the info and the default
   declare desc="prints SSL certificate info for app"
-  local cmd="certs:info"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2"
-  local APP="$2"
+  declare cmd="certs:info"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
   local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
 
   if is_ssl_enabled "$APP"; then
diff --git a/plugins/certs/subcommands/add b/plugins/certs/subcommands/add
index 5d0a084e4..b86ba2f10 100755
--- a/plugins/certs/subcommands/add
+++ b/plugins/certs/subcommands/add
@@ -30,12 +30,12 @@ is_file_import() {
 
 cmd-certs-set() {
   declare desc="imports an SSL cert/key combo either on STDIN via a tarball or from specified cert/key filenames"
-  local cmd="$1"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2"
-  local APP="$2"
-  local CRT_FILE="$3"
-  local KEY_FILE="$4"
+  declare cmd="$1"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" CRT_FILE="$2" KEY_FILE="$3"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
   local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
 
   if is_file_import "$CRT_FILE" "$KEY_FILE"; then
diff --git a/plugins/certs/subcommands/generate b/plugins/certs/subcommands/generate
index bb6ee7099..8f82e8a32 100755
--- a/plugins/certs/subcommands/generate
+++ b/plugins/certs/subcommands/generate
@@ -6,8 +6,10 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-certs-generate() {
   declare desc="generates a self-signed SSL certificate/key combo"
-  declare APP="$2" DOMAIN="$3"
-  local cmd="certs:generate"
+  declare cmd="certs:generate"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" DOMAIN="$2"
+
   [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   verify_app_name "$APP"
   local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
diff --git a/plugins/certs/subcommands/remove b/plugins/certs/subcommands/remove
index ac6b02bf2..717dc7e57 100755
--- a/plugins/certs/subcommands/remove
+++ b/plugins/certs/subcommands/remove
@@ -5,10 +5,12 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-certs-remove() {
   declare desc="removes SSL cert/key from specified app"
-  local cmd="certs:remove"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2"
-  local APP="$2"
+  declare cmd="certs:remove"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
   local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
 
   if [[ -d "$APP_SSL_PATH" ]]; then
diff --git a/plugins/checks/internal-functions b/plugins/checks/internal-functions
index 75dc5d3bf..bf78f4c96 100755
--- a/plugins/checks/internal-functions
+++ b/plugins/checks/internal-functions
@@ -6,9 +6,10 @@ set -eo pipefail
 
 cmd-checks-report() {
   declare desc="shows reports for an app"
-  local cmd="checks:report"
+  declare cmd="checks:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
diff --git a/plugins/checks/subcommands/default b/plugins/checks/subcommands/default
index 8c4b0f876..ffe4a5fdb 100755
--- a/plugins/checks/subcommands/default
+++ b/plugins/checks/subcommands/default
@@ -6,11 +6,13 @@ source "$PLUGIN_AVAILABLE_PATH/checks/functions"
 
 cmd-checks-default() {
   declare desc="displays app zero-downtime checks status"
-  local cmd="checks"
+  declare cmd="checks"
   [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
   local APPS=$(dokku_apps)
-  if [[ -n "$1" ]]; then
-    local APPS="$1"
+  if [[ -n "$APP" ]]; then
+    local APPS="$APP"
   fi
 
   dokku_log_warn "Deprecated: Please use checks:report"
diff --git a/plugins/checks/subcommands/disable b/plugins/checks/subcommands/disable
index 85b7aae58..8f6058cc2 100755
--- a/plugins/checks/subcommands/disable
+++ b/plugins/checks/subcommands/disable
@@ -6,9 +6,10 @@ source "$PLUGIN_AVAILABLE_PATH/checks/functions"
 
 cmd-checks-disable() {
   declare desc="disable zero-downtime checks for app/proctypes"
-  local cmd="checks:disable"
+  declare cmd="checks:disable"
   [[ "$1" == "$cmd" ]] && shift 1
-  local APP="$1"
+  declare APP="$1"
+
   verify_app_name "$APP"
   local PROCTYPES="${2:-_all_}"
   local DOKKU_CHECKS_DISABLED=$(config_get "$APP" DOKKU_CHECKS_DISABLED || true)
diff --git a/plugins/checks/subcommands/enable b/plugins/checks/subcommands/enable
index 3db35d07e..9431aca0b 100755
--- a/plugins/checks/subcommands/enable
+++ b/plugins/checks/subcommands/enable
@@ -6,9 +6,10 @@ source "$PLUGIN_AVAILABLE_PATH/checks/functions"
 
 cmd-checks-enable() {
   declare desc="enable zero-downtime checks for app/proctypes"
-  local cmd="checks:enable"
+  declare cmd="checks:enable"
   [[ "$1" == "$cmd" ]] && shift 1
-  local APP="$1"
+  declare APP="$1"
+
   verify_app_name "$APP"
   local PROCTYPES="${2:-_all_}"
 
diff --git a/plugins/checks/subcommands/run b/plugins/checks/subcommands/run
index fb50a8d34..3a5e97816 100755
--- a/plugins/checks/subcommands/run
+++ b/plugins/checks/subcommands/run
@@ -69,9 +69,10 @@ check_process() {
 
 cmd-checks-run() {
   declare desc="run zero-downtime checks for app/proctypes"
-  local cmd="checks:run"
+  declare cmd="checks:run"
   [[ "$1" == "$cmd" ]] && shift 1
-  local APP="$1"
+  declare APP="$1"
+
   verify_app_name "$APP"
   local PROCTYPES="${2:-_all_}"
 
diff --git a/plugins/checks/subcommands/skip b/plugins/checks/subcommands/skip
index 8c3e57137..ff8719a1f 100755
--- a/plugins/checks/subcommands/skip
+++ b/plugins/checks/subcommands/skip
@@ -6,9 +6,10 @@ source "$PLUGIN_AVAILABLE_PATH/checks/functions"
 
 cmd-checks-skip() {
   declare desc="skip zero-downtime checks for app/proctypes"
-  local cmd="checks:skip"
+  declare cmd="checks:skip"
   [[ "$1" == "$cmd" ]] && shift 1
-  local APP="$1"
+  declare APP="$1"
+
   verify_app_name "$APP"
   local PROCTYPES="${2:-_all_}"
   local DOKKU_CHECKS_DISABLED=$(config_get "$APP" DOKKU_CHECKS_DISABLED || true)
diff --git a/plugins/common/functions b/plugins/common/functions
index ddb074bde..294472f3c 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -295,8 +295,7 @@ get_running_image_tag() {
 
 is_image_herokuish_based() {
   declare desc="returns true if app image is based on herokuish"
-  declare IMAGE="$1"
-  declare APP="$2"
+  declare IMAGE="$1" APP="$2"
   local DOKKU_APP_USER
   if [[ -n "$APP" ]]; then
     DOKKU_APP_USER=$(config_get "$APP" DOKKU_APP_USER || true)
diff --git a/plugins/docker-options/internal-functions b/plugins/docker-options/internal-functions
index 5d3f4494f..870c9ebf6 100755
--- a/plugins/docker-options/internal-functions
+++ b/plugins/docker-options/internal-functions
@@ -6,9 +6,10 @@ set -eo pipefail
 
 cmd-docker-options-report() {
   declare desc="displays a docker options report for one or more apps"
-  local cmd="docker-options:report"
+  declare cmd="docker-options:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
diff --git a/plugins/docker-options/subcommands/add b/plugins/docker-options/subcommands/add
index 799c9831e..5d1a692a8 100755
--- a/plugins/docker-options/subcommands/add
+++ b/plugins/docker-options/subcommands/add
@@ -6,11 +6,13 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
 
 cmd-docker-options-add() {
   declare desc="Add a docker option to application"
-  local cmd="docker-options:add"
+  declare cmd="docker-options:add"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
-  verify_app_name "$2" && local APP="$2"
-  read -ra passed_phases <<<"$(get_phases "$3")"
-  shift 3 # everything else passed is the docker option
+  verify_app_name "$2"
+  read -ra passed_phases <<<"$(get_phases "$2")"
+  shift 2 # everything else passed is the docker option
   local passed_docker_option="$*"
   [[ -z "$passed_docker_option" ]] && dokku_log_fail "Please specify docker options to add to the phase"
   add_passed_docker_option passed_phases[@] "${passed_docker_option[@]}"
diff --git a/plugins/docker-options/subcommands/clear b/plugins/docker-options/subcommands/clear
index 6a6c6ae9f..66b331ac0 100755
--- a/plugins/docker-options/subcommands/clear
+++ b/plugins/docker-options/subcommands/clear
@@ -6,8 +6,8 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
 
 cmd-docker-options-clear() {
   declare desc="clear a docker options from application"
-  declare cmd="docker-options:clear" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="docker-options:clear"
+  [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1" PHASES="$2"
 
   [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
diff --git a/plugins/docker-options/subcommands/default b/plugins/docker-options/subcommands/default
index 9ffe4fe01..ba6e59a96 100755
--- a/plugins/docker-options/subcommands/default
+++ b/plugins/docker-options/subcommands/default
@@ -6,11 +6,13 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
 
 cmd-docker-options-default() {
   declare desc="Display applications docker options"
-  local cmd="docker-options"
-  dokku_log_warn "Deprecated: Please use docker-options:report"
+  declare cmd="docker-options"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
-  verify_app_name "$2" && local APP="$2"
-  read -ra passed_phases <<<"$(get_phases "$3")"
+  dokku_log_warn "Deprecated: Please use docker-options:report"
+  verify_app_name "$APP"
+  read -ra passed_phases <<<"$(get_phases "$2")"
   if [[ ! "${passed_phases[@]}" ]]; then
     display_all_phases_options
   else
diff --git a/plugins/docker-options/subcommands/remove b/plugins/docker-options/subcommands/remove
index a57a8080d..f258a0b34 100755
--- a/plugins/docker-options/subcommands/remove
+++ b/plugins/docker-options/subcommands/remove
@@ -6,11 +6,13 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
 
 cmd-docker-options-remove() {
   declare desc="Remove a docker option from application"
-  local cmd="docker-options:remove"
+  declare cmd="docker-options:remove"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
-  verify_app_name "$2" && local APP="$2"
-  read -ra passed_phases <<<"$(get_phases "$3")"
-  shift 3 # everything else passed is the docker option
+  verify_app_name "$APP"
+  read -ra passed_phases <<<"$(get_phases "$2")"
+  shift 2 # everything else passed is the docker option
   # shellcheck disable=SC2154
   [[ -z ${passed_docker_option="$@"} ]] && dokku_log_fail "Please specify docker options to remove from the phase"
   remove_passed_docker_option passed_phases[@] "${passed_docker_option[@]}"
diff --git a/plugins/domains/internal-functions b/plugins/domains/internal-functions
index f1d193448..9ca372a84 100755
--- a/plugins/domains/internal-functions
+++ b/plugins/domains/internal-functions
@@ -6,9 +6,10 @@ set -eo pipefail
 
 cmd-domains-report() {
   declare desc="displays a domains report for one or more apps"
-  local cmd="domains:report"
+  declare cmd="domains:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ "$APP" == "--global" ]]; then
     cmd-domains-report-single "$APP" "$INFO_FLAG"
diff --git a/plugins/domains/subcommands/add b/plugins/domains/subcommands/add
index e8e8cd5b9..2178add1c 100755
--- a/plugins/domains/subcommands/add
+++ b/plugins/domains/subcommands/add
@@ -6,11 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-add() {
   declare desc="adds domains to app via command line"
-  local cmd="domains:add"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  [[ -z $3 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 $2 <domain> [<domain> ...]"
+  declare cmd="domains:add"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" DOMAIN_NAME="$2"
 
-  shift 1
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  [[ -z "$DOMAIN_NAME" ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 $2 <domain> [<domain> ...]"
   domains_add "$@"
 }
 
diff --git a/plugins/domains/subcommands/add-global b/plugins/domains/subcommands/add-global
index 4ccf1b825..0a0816d32 100755
--- a/plugins/domains/subcommands/add-global
+++ b/plugins/domains/subcommands/add-global
@@ -6,10 +6,11 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-add-global() {
   declare desc="add global domain names via command line"
-  local cmd="domains:add-global"
-  [[ -z $2 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 <domain> [<domain> ...]"
+  declare cmd="domains:add-global"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare DOMAIN_NAME="$1"
 
-  shift 1
+  [[ -z "$DOMAIN_NAME" ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 <domain> [<domain> ...]"
   domains_add_global "$@"
 }
 
diff --git a/plugins/domains/subcommands/clear b/plugins/domains/subcommands/clear
index 759c132a2..965f14165 100755
--- a/plugins/domains/subcommands/clear
+++ b/plugins/domains/subcommands/clear
@@ -6,10 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-clear() {
   declare desc="clear all app domains"
-  local cmd="domains:clear"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2"
-  local APP="$2"
+  declare cmd="domains:clear"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
   local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
 
   rm -f "$APP_VHOST_PATH"
diff --git a/plugins/domains/subcommands/clear-global b/plugins/domains/subcommands/clear-global
index 9024a6430..ff7ae757b 100755
--- a/plugins/domains/subcommands/clear-global
+++ b/plugins/domains/subcommands/clear-global
@@ -6,8 +6,8 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-clear-global() {
   declare desc="clear global domain names via command line"
-  local cmd="domains:clear-global"
-  shift 1
+  declare cmd="domains:clear-global"
+  [[ "$1" == "$cmd" ]] && shift 1
 
   dokku_log_info1_quiet "Clearing global domains"
   domains_clear_global "$@"
diff --git a/plugins/domains/subcommands/default b/plugins/domains/subcommands/default
index 6b9650fa1..49f3e9087 100755
--- a/plugins/domains/subcommands/default
+++ b/plugins/domains/subcommands/default
@@ -6,8 +6,9 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-default() {
   declare desc="print app domains"
-  local cmd="domains"
-  local APP="$2"
+  declare cmd="domains"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
   dokku_log_warn "Deprecated: Please use domains:report"
   if [[ "$(is_global_vhost_enabled)" == "true" ]]; then
diff --git a/plugins/domains/subcommands/disable b/plugins/domains/subcommands/disable
index 224176e30..0757a77fe 100755
--- a/plugins/domains/subcommands/disable
+++ b/plugins/domains/subcommands/disable
@@ -6,9 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-disable() {
   declare desc="disable domains/VHOST support via command line"
-  local cmd="domains:disable"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  domains_disable "$2"
+  declare cmd="domains:disable"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  domains_disable "$APP"
 }
 
 cmd-domains-disable "$@"
diff --git a/plugins/domains/subcommands/enable b/plugins/domains/subcommands/enable
index 5cb4d10da..d4f641cb5 100755
--- a/plugins/domains/subcommands/enable
+++ b/plugins/domains/subcommands/enable
@@ -6,9 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-enable() {
   declare desc="enable domains/VHOST support via command line"
-  local cmd="domains:enable"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  domains_enable "$2"
+  declare cmd="domains:enable"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  domains_enable "$APP"
 }
 
 cmd-domains-enable "$@"
diff --git a/plugins/domains/subcommands/remove b/plugins/domains/subcommands/remove
index 0eaf71cf1..e9ee9837a 100755
--- a/plugins/domains/subcommands/remove
+++ b/plugins/domains/subcommands/remove
@@ -6,11 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-remove() {
   declare desc="removes domains from app via command line"
-  local cmd="domains:remove"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  [[ -z $3 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 $2 <domain> [<domain> ...]"
+  declare cmd="domains:remove"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" DOMAIN_NAME="$2"
 
-  shift 1
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  [[ -z "$DOMAIN_NAME" ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 $2 <domain> [<domain> ...]"
   domains_remove "$@"
 }
 
diff --git a/plugins/domains/subcommands/remove-global b/plugins/domains/subcommands/remove-global
index 574184392..1c2e4818d 100755
--- a/plugins/domains/subcommands/remove-global
+++ b/plugins/domains/subcommands/remove-global
@@ -6,10 +6,11 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-remove-global() {
   declare desc="remove global domain names via command line"
-  local cmd="domains:remove-global"
-  [[ -z $2 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 <domain> [<domain> ...]"
+  declare cmd="domains:remove-global"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare DOMAIN_NAME="$1"
 
-  shift 1
+  [[ -z "$DOMAIN_NAME" ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 <domain> [<domain> ...]"
   domains_remove_global "$@"
 }
 
diff --git a/plugins/domains/subcommands/set b/plugins/domains/subcommands/set
index 2b8ace952..fdda804fa 100755
--- a/plugins/domains/subcommands/set
+++ b/plugins/domains/subcommands/set
@@ -6,11 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-set() {
   declare desc="set domains for app via command line"
-  local cmd="domains:set"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  [[ -z $3 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 $2 <domain> [<domain> ...]"
+  declare cmd="domains:set"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" DOMAIN_NAME="$2"
 
-  shift 1
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  [[ -z "$DOMAIN_NAME" ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 $2 <domain> [<domain> ...]"
   domains_set "$@"
 }
 
diff --git a/plugins/domains/subcommands/set-global b/plugins/domains/subcommands/set-global
index 88f9a5c99..9e8bd03e2 100755
--- a/plugins/domains/subcommands/set-global
+++ b/plugins/domains/subcommands/set-global
@@ -6,10 +6,11 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-set-global() {
   declare desc="set global domain names via command line"
-  local cmd="domains:set-global"
-  [[ -z $2 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 <domain> [<domain> ...]"
+  declare cmd="domains:set-global"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare DOMAIN_NAME="$1"
 
-  shift 1
+  [[ -z "$DOMAIN_NAME" ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 <domain> [<domain> ...]"
   domains_set_global "$@"
 }
 
diff --git a/plugins/domains/subcommands/setup b/plugins/domains/subcommands/setup
index 57be41235..007ce1ec8 100755
--- a/plugins/domains/subcommands/setup
+++ b/plugins/domains/subcommands/setup
@@ -6,9 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-domains-setup() {
   declare desc="setup domains to default state via command line"
-  local cmd="domains:setup"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  domains_setup "$2"
+  declare cmd="domains:setup"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  domains_setup "$APP"
 }
 
 cmd-domains-setup "$@"
diff --git a/plugins/enter/subcommands/default b/plugins/enter/subcommands/default
index 397457197..efab27c18 100755
--- a/plugins/enter/subcommands/default
+++ b/plugins/enter/subcommands/default
@@ -6,15 +6,16 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 cmd-enter-default() {
   declare desc="enters running app container of specified proc type"
-  local cmd="enter"
-  local APP="$2"
-  local CONTAINER_TYPE="$3"
+  declare cmd="enter"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" CONTAINER_TYPE="$2" CONTAINER_ID_FLAG="$3" CONTAINER_ID="$4"
+
   local IMAGE_TAG=$(get_running_image_tag "$APP")
   local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
   verify_app_name "$APP"
   local AVAILABLE_CONTAINER_TYPES=($(get_app_running_container_types "$APP"))
 
-  if [[ -z "$3" ]]; then
+  if [[ -z "$CONTAINER_TYPE" ]]; then
     if [[ ${#AVAILABLE_CONTAINER_TYPES[@]} -gt 1 ]]; then
       dokku_log_warn "No container type specified."
       dokku_log_fail "Available types for app ($APP): ${AVAILABLE_CONTAINER_TYPES[*]}"
@@ -23,9 +24,9 @@ cmd-enter-default() {
     fi
   fi
 
-  if [[ "$3" == "--container-id" ]]; then
+  if [[ "$CONTAINER_ID_FLAG" == "--container-id" ]]; then
     local DOKKU_APP_CIDS=($(get_app_container_ids "$APP"))
-    if [[ -z "$4" ]]; then
+    if [[ -z "$CONTAINER_ID" ]]; then
       dokku_log_warn "No container id specified."
       dokku_log_fail "Available ids for app ($APP): ${DOKKU_APP_CIDS[*]}"
     fi
@@ -34,7 +35,7 @@ cmd-enter-default() {
       dokku_log_fail "Available ids for app ($APP): ${DOKKU_APP_CIDS[*]}"
     fi
     local ID=$(printf -- '%s\n' "${DOKKU_APP_CIDS[@]}" | grep -e "^$4")
-    shift 4
+    shift 3
   else
     local DOKKU_APP_CIDS=($(get_app_container_ids "$APP" "$CONTAINER_TYPE"))
     local ID=${DOKKU_APP_CIDS[0]}
@@ -42,10 +43,10 @@ cmd-enter-default() {
       dokku_log_warn "No containers found for type '$CONTAINER_TYPE'"
       dokku_log_fail "Available types for app ($APP): ${AVAILABLE_CONTAINER_TYPES[*]}"
     fi
-    if [[ $3 ]]; then
-      shift 3
-    else
+    if [[ "$CONTAINER_ID_FLAG" ]]; then
       shift 2
+    else
+      shift 1
     fi
   fi
 
diff --git a/plugins/git/functions b/plugins/git/functions
index 123b0e6a9..939e5d487 100755
--- a/plugins/git/functions
+++ b/plugins/git/functions
@@ -109,7 +109,7 @@ git_trigger_build() {
 
 git_deploy_branch() {
   declare desc="retrieve the deploy branch for a given application"
-  local cmd="git-hook"
+  declare cmd="git-hook"
   local APP="$1"
 
   local DOKKU_DEPLOY_BRANCH="$(fn-plugin-property-get "git" "$APP" "deploy-branch" "")"
@@ -125,9 +125,11 @@ git_deploy_branch() {
 
 cmd-git-hook() {
   declare desc="kick off receive-app trigger from git prereceive hook"
-  local cmd="git-hook"
-  local APP="$2"
+  declare cmd="git-hook"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
   local DOKKU_DEPLOY_BRANCH
+
   is_valid_app_name "$APP"
 
   DOKKU_DEPLOY_BRANCH="$(git_deploy_branch "$APP")"
@@ -198,7 +200,9 @@ git_receive_app() {
 cmd-git-upload-pack() {
   declare desc="executes git-upload-pack"
   declare cmd="git-upload-pack"
-  declare APP="$2"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
   APP="$(echo "$APP" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')"
   is_valid_app_name "$APP"
   ! apps_exists "$APP" >/dev/null 2>&1 && apps_maybe_create "$APP"
@@ -210,7 +214,7 @@ cmd-git-upload-pack() {
 
 cmd-git-glob() {
   declare desc="catch-all for any other git-* commands"
-  local cmd="git-*"
+  declare cmd="git-*"
   local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')"
   local APP_PATH=$DOKKU_ROOT/$APP
   is_valid_app_name "$APP"
diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions
index b497e2516..d7a88e8ae 100755
--- a/plugins/git/internal-functions
+++ b/plugins/git/internal-functions
@@ -6,9 +6,10 @@ set -eo pipefail
 
 cmd-git-report() {
   declare desc="displays a git report for one or more apps"
-  local cmd="git:report"
+  declare cmd="git:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
diff --git a/plugins/git/subcommands/initialize b/plugins/git/subcommands/initialize
index 37540f07a..e5ed2cfbf 100755
--- a/plugins/git/subcommands/initialize
+++ b/plugins/git/subcommands/initialize
@@ -6,11 +6,11 @@ set -eo pipefail
 
 cmd-git-initialize() {
   declare desc="initialize a git repository for an app"
-  local cmd="git:initialize" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="git:initialize"
+  [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1"
-  is_valid_app_name "$APP"
 
+  is_valid_app_name "$APP"
   dokku_log_info1_quiet "Initializing git repository for $APP"
   fn-git-create-hook "$APP"
 }
diff --git a/plugins/git/subcommands/set b/plugins/git/subcommands/set
index 871b450fe..f80d214fd 100755
--- a/plugins/git/subcommands/set
+++ b/plugins/git/subcommands/set
@@ -6,10 +6,11 @@ set -eo pipefail
 
 cmd-git-set() {
   declare desc="set or clear a git property for an app"
-  local cmd="git:set" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="git:set"
+  [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1" KEY="$2" VALUE="$3"
   local VALID_KEYS=("deploy-branch" "keep-git-dir" "rev-env-var")
+
   [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   [[ -z "$KEY" ]] && dokku_log_fail "No key specified"
 
diff --git a/plugins/logs/subcommands/default b/plugins/logs/subcommands/default
index cdc84dfb5..9cf68f1cc 100755
--- a/plugins/logs/subcommands/default
+++ b/plugins/logs/subcommands/default
@@ -6,14 +6,16 @@ source "$PLUGIN_AVAILABLE_PATH/logs/internal-functions"
 
 cmd-logs-default() {
   declare desc="display recent log output"
-  local cmd="logs"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  local APP="$2"
-  verify_app_name "$2"
+  declare cmd="logs"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
 
   ! (is_deployed "$APP") && dokku_log_fail "App $APP has not been deployed"
 
-  shift 2
+  shift 1
   local TEMP=$(getopt -o htqn:p: --long help,tail,quiet,num:,ps: -n 'dokku logs' -- "$@")
   local EXIT_CODE="$?"
   if [[ "$EXIT_CODE" != 0 ]]; then
diff --git a/plugins/logs/subcommands/failed b/plugins/logs/subcommands/failed
index e668c1b8a..f2c2339b9 100755
--- a/plugins/logs/subcommands/failed
+++ b/plugins/logs/subcommands/failed
@@ -7,8 +7,8 @@ set -eo pipefail
 
 cmd-logs-failed() {
   declare desc="shows the last failed deploy logs"
-  declare cmd="logs:failed" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="logs:failed"
+  [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1"
   local DOKKU_SCHEDULER
 
diff --git a/plugins/nginx-vhosts/internal-functions b/plugins/nginx-vhosts/internal-functions
index a79a69ef8..7fe7401a1 100755
--- a/plugins/nginx-vhosts/internal-functions
+++ b/plugins/nginx-vhosts/internal-functions
@@ -6,9 +6,10 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
 
 cmd-nginx-report() {
   declare desc="displays a nginx report for one or more apps"
-  local cmd="nginx:report"
+  declare cmd="nginx:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
diff --git a/plugins/nginx-vhosts/subcommands/access-logs b/plugins/nginx-vhosts/subcommands/access-logs
index 0425024a2..20413d51f 100755
--- a/plugins/nginx-vhosts/subcommands/access-logs
+++ b/plugins/nginx-vhosts/subcommands/access-logs
@@ -6,7 +6,8 @@ source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
 
 cmd-nginx-logs() {
   declare desc="display app nginx logs from command line"
-  local cmd="$1"
+  declare cmd="$1"
+
   [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
   nginx_logs "$@"
 }
diff --git a/plugins/nginx-vhosts/subcommands/build-config b/plugins/nginx-vhosts/subcommands/build-config
index 9a85a89e1..322e21d13 100755
--- a/plugins/nginx-vhosts/subcommands/build-config
+++ b/plugins/nginx-vhosts/subcommands/build-config
@@ -6,8 +6,10 @@ source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 cmd-nginx-build-config() {
   declare desc="build nginx config to proxy app containers from command line"
-  declare APP="$2"
-  local cmd="nginx:build-config"
+  declare cmd="nginx:build-config"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
   [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   local PROXY_APP_TYPE
   PROXY_APP_TYPE="$(get_app_proxy_type "$APP")"
diff --git a/plugins/nginx-vhosts/subcommands/set b/plugins/nginx-vhosts/subcommands/set
index 300c49811..475d0188a 100755
--- a/plugins/nginx-vhosts/subcommands/set
+++ b/plugins/nginx-vhosts/subcommands/set
@@ -6,10 +6,11 @@ set -eo pipefail
 
 cmd-nginx-set() {
   declare desc="set or clear an nginx property for an app"
-  local cmd="nginx:set" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="nginx:set"
+  [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1" KEY="$2" VALUE="$3"
   local VALID_KEYS=("bind-address-ipv4" "bind-address-ipv6" "hsts" "hsts-include-subdomains" "hsts-preload" "hsts-max-age")
+
   [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   [[ -z "$KEY" ]] && dokku_log_fail "No key specified"
 
diff --git a/plugins/nginx-vhosts/subcommands/show-conf b/plugins/nginx-vhosts/subcommands/show-conf
index 48bb9fdd9..355463078 100755
--- a/plugins/nginx-vhosts/subcommands/show-conf
+++ b/plugins/nginx-vhosts/subcommands/show-conf
@@ -5,11 +5,11 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-nginx-show-conf() {
   declare desc="display app nginx config"
-  declare cmd="nginx:show-conf" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="nginx:show-conf"
+  [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1"
-  verify_app_name "$APP"
 
+  verify_app_name "$APP"
   if [[ ! -f "$DOKKU_ROOT/$APP/nginx.conf" ]]; then
     dokku_log_fail "No nginx.conf exists for $APP"
   fi
diff --git a/plugins/nginx-vhosts/subcommands/validate b/plugins/nginx-vhosts/subcommands/validate
index b4093c954..68fbe0be1 100755
--- a/plugins/nginx-vhosts/subcommands/validate
+++ b/plugins/nginx-vhosts/subcommands/validate
@@ -6,9 +6,11 @@ source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
 
 cmd-nginx-validate() {
   declare desc="validates and optionally cleans up invalid nginx configurations"
-  declare cmd="nginx:validate" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
-  validate_nginx "$@"
+  declare cmd="nginx:validate"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" FLAG="$2"
+
+  validate_nginx "$APP" "$FLAG"
 }
 
 cmd-nginx-validate "$@"
diff --git a/plugins/plugin/internal-functions b/plugins/plugin/internal-functions
index 39ebf7e41..85a0d187c 100755
--- a/plugins/plugin/internal-functions
+++ b/plugins/plugin/internal-functions
@@ -5,7 +5,8 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-plugin-list() {
   declare desc="lists all plugins"
-  local cmd="plugin"
+  declare cmd="plugin"
+  [[ "$1" == "$cmd" ]] && shift 1
 
   plugn version
   plugn list
diff --git a/plugins/plugin/subcommands/disable b/plugins/plugin/subcommands/disable
index 53955fe0d..e420c17b7 100755
--- a/plugins/plugin/subcommands/disable
+++ b/plugins/plugin/subcommands/disable
@@ -7,9 +7,11 @@ source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
 
 cmd-plugin-disable() {
   declare desc="disables plugin via command line"
-  local cmd="plugin:disable"
-  [[ -z $2 ]] && dokku_log_fail "Please specify a plugin to disable"
-  local PLUGIN="$2"
+  declare cmd="plugin:disable"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare PLUGIN="$1"
+
+  [[ -z "$PLUGIN" ]] && dokku_log_fail "Please specify a plugin to disable"
   disable_plugin "$PLUGIN"
   plugin_prime_bash_completion
 }
diff --git a/plugins/plugin/subcommands/enable b/plugins/plugin/subcommands/enable
index b07316e55..e16c88a14 100755
--- a/plugins/plugin/subcommands/enable
+++ b/plugins/plugin/subcommands/enable
@@ -7,9 +7,11 @@ source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
 
 cmd-plugin-enable() {
   declare desc="enables plugin via command line"
-  local cmd="plugin:enable"
-  [[ -z $2 ]] && dokku_log_fail "Please specify a plugin to enable"
-  local PLUGIN="$2"
+  declare cmd="plugin:enable"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare PLUGIN="$1"
+
+  [[ -z "$PLUGIN" ]] && dokku_log_fail "Please specify a plugin to enable"
   enable_plugin "$PLUGIN"
   plugin_prime_bash_completion
 }
diff --git a/plugins/plugin/subcommands/install b/plugins/plugin/subcommands/install
index 1321c72fd..64351ad09 100755
--- a/plugins/plugin/subcommands/install
+++ b/plugins/plugin/subcommands/install
@@ -7,14 +7,16 @@ source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
 
 cmd-plugin-install() {
   declare desc="installs a plugin from URL and calls install plugin trigger via command line"
-  local cmd="plugin:install"
-  case "$2" in
+  declare cmd="plugin:install"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare FLAG="$1"
+
+  case "$FLAG" in
     --core)
-      [[ "$#" -gt 2 ]] && dokku_log_info1_quiet "Cannot install additional core plugins, running core plugin install trigger"
+      [[ "$#" -gt 1 ]] && dokku_log_info1_quiet "Cannot install additional core plugins, running core plugin install trigger"
       PLUGIN_PATH="$PLUGIN_CORE_PATH" plugn trigger install
       ;;
     https:* | git* | ssh:* | file:* | *.tar.gz | *.tgz)
-      shift
       download_and_enable_plugin "$@"
       plugn trigger install
       ;;
diff --git a/plugins/plugin/subcommands/install-dependencies b/plugins/plugin/subcommands/install-dependencies
index 5a7db0221..833df7225 100755
--- a/plugins/plugin/subcommands/install-dependencies
+++ b/plugins/plugin/subcommands/install-dependencies
@@ -4,8 +4,11 @@ set -eo pipefail
 
 cmd-plugin-install-dependencies() {
   declare desc="calls dependencies plugin trigger via command line"
-  local cmd="plugin:install-dependencies"
-  if [[ $2 == "--core" ]]; then
+  declare cmd="plugin:install-dependencies"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare FLAG="$1"
+
+  if [[ "$FLAG" == "--core" ]]; then
     export PLUGIN_PATH="$PLUGIN_CORE_PATH"
   fi
   plugn trigger dependencies
diff --git a/plugins/plugin/subcommands/trigger b/plugins/plugin/subcommands/trigger
index 2c34df93c..4255b874e 100755
--- a/plugins/plugin/subcommands/trigger
+++ b/plugins/plugin/subcommands/trigger
@@ -4,7 +4,7 @@ set -eo pipefail
 
 cmd-plugin-trigger() {
   declare desc="trigger an arbitrary plugin hook"
-  local cmd="plugin:trigger"
+  declare cmd="plugin:trigger"
   [[ "$1" == "$cmd" ]] && shift 1
 
   plugn trigger "$@"
diff --git a/plugins/plugin/subcommands/uninstall b/plugins/plugin/subcommands/uninstall
index ddbcb4449..08d51cc56 100755
--- a/plugins/plugin/subcommands/uninstall
+++ b/plugins/plugin/subcommands/uninstall
@@ -7,9 +7,11 @@ source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
 
 cmd-plugin-uninstall() {
   declare desc="uninstalls plugin via command line"
-  local cmd="plugin:uninstall"
-  [[ -z $2 ]] && dokku_log_fail "Please specify a plugin to uninstall"
-  local PLUGIN="$2"
+  declare cmd="plugin:uninstall"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare PLUGIN="$1"
+
+  [[ -z "$PLUGIN" ]] && dokku_log_fail "Please specify a plugin to uninstall"
   uninstall_plugin "$PLUGIN"
   plugin_prime_bash_completion
 }
diff --git a/plugins/plugin/subcommands/update b/plugins/plugin/subcommands/update
index 57898e823..366b09bb6 100755
--- a/plugins/plugin/subcommands/update
+++ b/plugins/plugin/subcommands/update
@@ -5,10 +5,11 @@ source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
 
 cmd-plugin-update() {
   declare desc="updates plugin to optional committish and calls update plugin trigger via command line"
-  local cmd="plugin:update"
-  if [[ -n "$2" ]]; then
-    local PLUGIN="$2"
-    local PLUGIN_COMMITTISH="$3"
+  declare cmd="plugin:update"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare PLUGIN="$1" PLUGIN_COMMITTISH="$2"
+
+  if [[ -n "$PLUGIN" ]]; then
     plugn update "$PLUGIN" "$PLUGIN_COMMITTISH"
   fi
   plugn trigger update
diff --git a/plugins/proxy/internal-functions b/plugins/proxy/internal-functions
index 0f36aece3..43f8e29b1 100755
--- a/plugins/proxy/internal-functions
+++ b/plugins/proxy/internal-functions
@@ -6,9 +6,10 @@ set -eo pipefail
 
 cmd-proxy-report() {
   declare desc="displays a proxy report for one or more apps"
-  local cmd="proxy:report"
+  declare cmd="proxy:report"
+  [[ "$1" == "$cmd" ]] && shift 1
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
+  local APP="$1" INFO_FLAG="$2"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
diff --git a/plugins/proxy/subcommands/default b/plugins/proxy/subcommands/default
index 20e9e719b..6ea33df3b 100755
--- a/plugins/proxy/subcommands/default
+++ b/plugins/proxy/subcommands/default
@@ -6,11 +6,13 @@ source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 cmd-proxy-default() {
   declare desc="displays app proxy implementation via command line"
-  local cmd="proxy"
+  declare cmd="proxy"
   [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
   local APPS=$(dokku_apps)
-  if [[ -n "$1" ]]; then
-    local APPS="$1"
+  if [[ -n "$APP" ]]; then
+    local APPS="$APP"
   fi
 
   dokku_log_warn "Deprecated: Please use proxy:report"
diff --git a/plugins/proxy/subcommands/disable b/plugins/proxy/subcommands/disable
index b80bb5b84..bf2be158c 100755
--- a/plugins/proxy/subcommands/disable
+++ b/plugins/proxy/subcommands/disable
@@ -7,9 +7,11 @@ source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 cmd-proxy-disable() {
   declare desc="disable proxy for app via command line"
-  local cmd="proxy:disable"
-  [[ -z $1 ]] && dokku_log_fail "Please specify an app to run the command on"
-  local APP="$1"
+  declare cmd="proxy:disable"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   verify_app_name "$APP"
 
   if [[ "$(is_app_proxy_enabled "$APP")" == "true" ]]; then
diff --git a/plugins/proxy/subcommands/enable b/plugins/proxy/subcommands/enable
index 180366f48..bc28e8ae4 100755
--- a/plugins/proxy/subcommands/enable
+++ b/plugins/proxy/subcommands/enable
@@ -7,9 +7,11 @@ source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 cmd-proxy-enable() {
   declare desc="enable proxy for app via command line"
-  local cmd="proxy:enable"
-  [[ -z $1 ]] && dokku_log_fail "Please specify an app to run the command on"
-  local APP="$1"
+  declare cmd="proxy:enable"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   verify_app_name "$APP"
 
   if [[ "$(is_app_proxy_enabled "$APP")" == "false" ]]; then
diff --git a/plugins/proxy/subcommands/ports b/plugins/proxy/subcommands/ports
index c90a499f0..ae7b25e89 100755
--- a/plugins/proxy/subcommands/ports
+++ b/plugins/proxy/subcommands/ports
@@ -7,10 +7,11 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 cmd-proxy-ports() {
   declare desc="cmd wrapper to list proxy port mappings for an app"
-  local cmd="proxy:ports"
-  local APP="$2"
-  verify_app_name "$APP"
+  declare cmd="proxy:ports"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
+  verify_app_name "$APP"
   list_app_proxy_ports "$APP"
 }
 
diff --git a/plugins/proxy/subcommands/ports-add b/plugins/proxy/subcommands/ports-add
index d627adb70..d829e4347 100755
--- a/plugins/proxy/subcommands/ports-add
+++ b/plugins/proxy/subcommands/ports-add
@@ -6,10 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 cmd-proxy-ports-add() {
   declare desc="add proxy port mappings to an app"
-  local cmd="proxy:add"
-  local APP="$2"
+  declare cmd="proxy:add"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
   verify_app_name "$APP"
-  shift 2
+  shift 1
 
   add_proxy_ports "$APP" "$@"
   plugn trigger post-proxy-ports-update "$APP" "add"
diff --git a/plugins/proxy/subcommands/ports-clear b/plugins/proxy/subcommands/ports-clear
index 0454c7b1b..0052e87a1 100755
--- a/plugins/proxy/subcommands/ports-clear
+++ b/plugins/proxy/subcommands/ports-clear
@@ -6,10 +6,11 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 cmd-proxy-ports-clear() {
   declare desc="clear all proxy port mappings for an app"
-  local cmd="proxy:clear"
-  local APP="$2"
-  verify_app_name "$APP"
+  declare cmd="proxy:clear"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
+  verify_app_name "$APP"
   DOKKU_QUIET_OUTPUT=1 config_unset --no-restart "$APP" DOKKU_PROXY_PORT_MAP
   plugn trigger post-proxy-ports-update "$APP" "clear"
 }
diff --git a/plugins/proxy/subcommands/ports-remove b/plugins/proxy/subcommands/ports-remove
index 1e9ec66ba..4514bf7c1 100755
--- a/plugins/proxy/subcommands/ports-remove
+++ b/plugins/proxy/subcommands/ports-remove
@@ -6,10 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 cmd-proxy-ports-remove() {
   declare desc="remove specific proxy port mappings from an app"
-  local cmd="proxy:ports-remove"
-  local APP="$2"
+  declare cmd="proxy:ports-remove"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
   verify_app_name "$APP"
-  shift 2
+  shift 1
 
   local INPUT_PORTS="$*"
   if [[ -z "$INPUT_PORTS" ]]; then
diff --git a/plugins/proxy/subcommands/ports-set b/plugins/proxy/subcommands/ports-set
index b592f41ea..1844e4d02 100755
--- a/plugins/proxy/subcommands/ports-set
+++ b/plugins/proxy/subcommands/ports-set
@@ -6,10 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 cmd-proxy-ports-set() {
   declare desc="set proxy port mappings for an app"
-  local cmd="proxy:set"
-  local APP="$2"
+  declare cmd="proxy:set"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
   verify_app_name "$APP"
-  shift 2
+  shift 1
 
   set_proxy_ports "$APP" "$@"
   plugn trigger post-proxy-ports-update "$APP" "set"
diff --git a/plugins/proxy/subcommands/set b/plugins/proxy/subcommands/set
index e6f71f763..9ee1a779e 100755
--- a/plugins/proxy/subcommands/set
+++ b/plugins/proxy/subcommands/set
@@ -6,12 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 cmd-proxy-set() {
   declare desc="enable proxy for app via command line"
-  local cmd="proxy:set"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
+  declare cmd="proxy:set"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" PROXY_TYPE="$2"
 
-  local APP="$2"
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   verify_app_name "$APP"
-  local PROXY_TYPE="$3"
 
   if [[ -n "$PROXY_TYPE" ]]; then
     DOKKU_QUIET_OUTPUT=1 config_set --no-restart "$APP" DOKKU_APP_PROXY_TYPE="$PROXY_TYPE"
diff --git a/plugins/ps/internal-functions b/plugins/ps/internal-functions
index ca775b8f9..8d863a87e 100755
--- a/plugins/ps/internal-functions
+++ b/plugins/ps/internal-functions
@@ -8,8 +8,9 @@ set -eo pipefail
 
 cmd-ps-inspect() {
   declare desc="displays a sanitized version of docker inspect for an app"
-  local cmd="ps:inspect"
-  local APP="$2"
+  declare cmd="ps:inspect"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
   verify_app_name "$APP"
   local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
@@ -18,9 +19,10 @@ cmd-ps-inspect() {
 
 cmd-ps-report() {
   declare desc="displays a ps report for one or more apps"
-  local cmd="ps:report"
+  declare cmd="ps:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
diff --git a/plugins/ps/subcommands/default b/plugins/ps/subcommands/default
index e1302da2f..1df0fb262 100755
--- a/plugins/ps/subcommands/default
+++ b/plugins/ps/subcommands/default
@@ -5,12 +5,13 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-ps-default() {
   declare desc="shows running processes in all running app containers"
-  local cmd="ps"
+  declare cmd="ps"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
   dokku_log_warn "Deprecated: Please use ps:report"
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
 
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-
-  local APP="$2"
   verify_app_name "$APP"
   ! (is_deployed "$APP") && dokku_log_warn "App $APP has not been deployed" && exit 0
 
diff --git a/plugins/ps/subcommands/rebuild b/plugins/ps/subcommands/rebuild
index e03e6fb97..22d1ba2dd 100755
--- a/plugins/ps/subcommands/rebuild
+++ b/plugins/ps/subcommands/rebuild
@@ -6,8 +6,10 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 cmd-ps-rebuild() {
   declare desc="rebuilds an app from source"
-  local cmd="ps:rebuild"
-  local APP="$2"
+  declare cmd="ps:rebuild"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
   [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
 
   if (is_deployed "$APP"); then
diff --git a/plugins/ps/subcommands/rebuildall b/plugins/ps/subcommands/rebuildall
index e76163752..98fe32095 100755
--- a/plugins/ps/subcommands/rebuildall
+++ b/plugins/ps/subcommands/rebuildall
@@ -6,7 +6,8 @@ source "$PLUGIN_AVAILABLE_PATH/ps/internal-functions"
 
 cmd-ps-rebuildall() {
   declare desc="rebuilds all apps from source"
-  local cmd="ps:rebuildall"
+  declare cmd="ps:rebuildall"
+  [[ "$1" == "$cmd" ]] && shift 1
 
   fn-ps-parallel-cmd "rebuild"
 }
diff --git a/plugins/ps/subcommands/restart b/plugins/ps/subcommands/restart
index 8483266d5..cccb9ab1e 100755
--- a/plugins/ps/subcommands/restart
+++ b/plugins/ps/subcommands/restart
@@ -6,9 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 cmd-ps-restart() {
   declare desc="restarts app via command line"
-  local cmd="ps:restart"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  ps_restart "$2"
+  declare cmd="ps:restart"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  ps_restart "$APP"
 }
 
 cmd-ps-restart "$@"
diff --git a/plugins/ps/subcommands/restart-policy b/plugins/ps/subcommands/restart-policy
index 2378998a6..fe30684c5 100755
--- a/plugins/ps/subcommands/restart-policy
+++ b/plugins/ps/subcommands/restart-policy
@@ -7,10 +7,13 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 cmd-ps-restart-policy() {
   declare desc="shows the restart-policy for an app"
-  local cmd="ps:restart-policy"
+  declare cmd="ps:restart-policy"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
   local passed_phases="deploy"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2" && local APP="$2"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
 
   dokku_log_info2_quiet "$APP restart-policy:"
   get_restart_policies "$(get_phase_file_path "$passed_phases")"
diff --git a/plugins/ps/subcommands/restartall b/plugins/ps/subcommands/restartall
index 6ebe3f4aa..cb9200e10 100755
--- a/plugins/ps/subcommands/restartall
+++ b/plugins/ps/subcommands/restartall
@@ -6,7 +6,8 @@ source "$PLUGIN_AVAILABLE_PATH/ps/internal-functions"
 
 cmd-ps-restartall() {
   declare desc="restarts all apps via command line"
-  local cmd="ps:restartall"
+  declare cmd="ps:restartall"
+  [[ "$1" == "$cmd" ]] && shift 1
 
   fn-ps-parallel-cmd "restart"
 }
diff --git a/plugins/ps/subcommands/restore b/plugins/ps/subcommands/restore
index 039cb60d0..7d23c1148 100755
--- a/plugins/ps/subcommands/restore
+++ b/plugins/ps/subcommands/restore
@@ -8,8 +8,9 @@ source "$PLUGIN_AVAILABLE_PATH/ps/internal-functions"
 
 cmd-ps-restore() {
   declare desc="starts all apps with DOKKU_APP_RESTORE not set to 0 via command line"
-  local cmd="ps:restore"
-  local APP="$2"
+  declare cmd="ps:restore"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
   local DOKKU_SCHEDULER
 
   DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
diff --git a/plugins/ps/subcommands/retire b/plugins/ps/subcommands/retire
index 74c1ec2fd..d32e6b8af 100755
--- a/plugins/ps/subcommands/retire
+++ b/plugins/ps/subcommands/retire
@@ -6,7 +6,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-ps-retire() {
   declare desc="ensures old containers are retired"
-  local cmd="ps:retire"
+  declare cmd="ps:retire"
+  [[ "$1" == "$cmd" ]] && shift 1
+
   local LOCK_FILE="${DOKKU_LIB_ROOT}/data/ps/retire"
   local DOKKU_SCHEDULER=$(config_get "--global" DOKKU_SCHEDULER || echo "docker-local")
 
diff --git a/plugins/ps/subcommands/scale b/plugins/ps/subcommands/scale
index 95d2bd4e3..5a5a6e4bc 100755
--- a/plugins/ps/subcommands/scale
+++ b/plugins/ps/subcommands/scale
@@ -6,9 +6,11 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 cmd-ps-scale() {
   declare desc="sets app scaling config via command line"
-  local cmd="ps:scale"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  shift 1
+  declare cmd="ps:scale"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   ps_scale "$@"
 }
 
diff --git a/plugins/ps/subcommands/set-restart-policy b/plugins/ps/subcommands/set-restart-policy
index b58a7e20b..b18495e2e 100755
--- a/plugins/ps/subcommands/set-restart-policy
+++ b/plugins/ps/subcommands/set-restart-policy
@@ -7,10 +7,12 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 cmd-ps-set-restart-policy() {
   declare desc="sets app restart-policy"
-  local cmd="ps:set-restart-policy"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2" && local APP="$2"
-  local RESTART_POLICY="$3"
+  declare cmd="ps:set-restart-policy"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" RESTART_POLICY="$2"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
   local RE_RESTART_POLICY="^(no|unless-stopped|always|on-failure(:[1-9][0-9]*)?)$"
 
   if [[ ! "$RESTART_POLICY" =~ $RE_RESTART_POLICY ]]; then
diff --git a/plugins/ps/subcommands/start b/plugins/ps/subcommands/start
index c2ef579d4..8be6cae51 100755
--- a/plugins/ps/subcommands/start
+++ b/plugins/ps/subcommands/start
@@ -6,9 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 cmd-ps-start() {
   declare desc="starts app via command line"
-  local cmd="ps:start"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  ps_start "$2"
+  declare cmd="ps:start"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  ps_start "$APP"
 }
 
 cmd-ps-start "$@"
diff --git a/plugins/ps/subcommands/startall b/plugins/ps/subcommands/startall
index 8a29a2e2a..69726033c 100755
--- a/plugins/ps/subcommands/startall
+++ b/plugins/ps/subcommands/startall
@@ -6,7 +6,8 @@ source "$PLUGIN_AVAILABLE_PATH/ps/internal-functions"
 
 cmd-ps-startall() {
   declare desc="starts all apps via command line"
-  local cmd="ps:startall"
+  declare cmd="ps:startall"
+  [[ "$1" == "$cmd" ]] && shift 1
 
   fn-ps-parallel-cmd "start"
 }
diff --git a/plugins/ps/subcommands/stop b/plugins/ps/subcommands/stop
index 3feaf4b6f..37c0fec66 100755
--- a/plugins/ps/subcommands/stop
+++ b/plugins/ps/subcommands/stop
@@ -6,9 +6,12 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 cmd-ps-stop() {
   declare desc="stops app via command line"
-  local cmd="ps:stop"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  ps_stop "$2"
+  declare cmd="ps:stop"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  ps_stop "$APP"
 }
 
 cmd-ps-stop "$@"
diff --git a/plugins/ps/subcommands/stopall b/plugins/ps/subcommands/stopall
index 2ceb25288..f05be6a45 100755
--- a/plugins/ps/subcommands/stopall
+++ b/plugins/ps/subcommands/stopall
@@ -6,7 +6,8 @@ source "$PLUGIN_AVAILABLE_PATH/ps/internal-functions"
 
 cmd-ps-stopall() {
   declare desc="stops all apps via command line"
-  local cmd="ps:stopall"
+  declare cmd="ps:stopall"
+  [[ "$1" == "$cmd" ]] && shift 1
 
   fn-ps-parallel-cmd "stop"
 }
diff --git a/plugins/scheduler-docker-local/internal-functions b/plugins/scheduler-docker-local/internal-functions
index 0e2dc161b..5635742a3 100755
--- a/plugins/scheduler-docker-local/internal-functions
+++ b/plugins/scheduler-docker-local/internal-functions
@@ -7,9 +7,10 @@ set -eo pipefail
 
 cmd-scheduler-docker-local-report() {
   declare desc="displays a scheduler-docker-local report for one or more apps"
-  local cmd="scheduler-docker-local:report"
+  declare cmd="scheduler-docker-local:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
diff --git a/plugins/scheduler-docker-local/subcommands/set b/plugins/scheduler-docker-local/subcommands/set
index 9aec9269f..522162a6a 100755
--- a/plugins/scheduler-docker-local/subcommands/set
+++ b/plugins/scheduler-docker-local/subcommands/set
@@ -6,10 +6,11 @@ set -eo pipefail
 
 cmd-scheduler-docker-local-set() {
   declare desc="set or clear a scheduler-docker-local property for an app"
-  local cmd="scheduler-docker-local:set" argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="scheduler-docker-local:set"
+  [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1" KEY="$2" VALUE="$3"
   local VALID_KEYS=("disable-chown")
+
   [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   [[ -z "$KEY" ]] && dokku_log_fail "No key specified"
 
diff --git a/plugins/shell/subcommands/default b/plugins/shell/subcommands/default
index b00f8d435..2a8b13abf 100755
--- a/plugins/shell/subcommands/default
+++ b/plugins/shell/subcommands/default
@@ -4,7 +4,7 @@ set -eo pipefail
 
 cmd-shell-default() {
   declare desc="dokku shell interpreter via command line"
-  local cmd="shell"
+  declare cmd="shell"
   local INPUTRC="$PLUGIN_ROOT/inputrc"
   local HISTFILE=~/.dokku_history
 
diff --git a/plugins/ssh-keys/internal-functions b/plugins/ssh-keys/internal-functions
index 09793be6f..4d1c01249 100755
--- a/plugins/ssh-keys/internal-functions
+++ b/plugins/ssh-keys/internal-functions
@@ -4,7 +4,9 @@ set -eo pipefail
 
 cmd-list-ssh-keys() {
   declare desc="List ssh key hashes"
-  local cmd="ssh-keys:list"
+  declare cmd="ssh-keys:list"
+  [[ "$1" == "$cmd" ]] && shift 1
+
   verify_ssh_key_file
   sshcommand list dokku
 }
diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add
index a0b36f934..d710aef06 100755
--- a/plugins/ssh-keys/subcommands/add
+++ b/plugins/ssh-keys/subcommands/add
@@ -6,10 +6,11 @@ source "$PLUGIN_AVAILABLE_PATH/ssh-keys/functions"
 
 cmd-ssh-keys-add() {
   declare desc="add a new key via sshcommand"
-  local cmd="ssh-keys:add"
+  declare cmd="ssh-keys:add"
   [[ "$1" == "$cmd" ]] && shift 1
   declare NAME="$1" KEY_FILE="$2"
   local TMP_KEY_FILE
+
   TMP_KEY_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
   trap "rm -rf '$TMP_KEY_FILE' >/dev/null" RETURN INT TERM EXIT
 
diff --git a/plugins/ssh-keys/subcommands/remove b/plugins/ssh-keys/subcommands/remove
index 4e2167eb0..b8587bf52 100755
--- a/plugins/ssh-keys/subcommands/remove
+++ b/plugins/ssh-keys/subcommands/remove
@@ -6,12 +6,13 @@ source "$PLUGIN_AVAILABLE_PATH/ssh-keys/functions"
 
 cmd-ssh-keys-remove() {
   declare desc="Removes key from authorized_keys"
-  local cmd="ssh-keys:remove"
-  shift
-  local name="$1"
+  declare cmd="ssh-keys:remove"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare NAME="$1"
+
   verify_ssh_key_file
-  [[ -z $1 ]] && dokku_log_fail "A name is required to remove a key, ie: dokku ssh-keys:remove <name>"
-  sshcommand acl-remove dokku "$name" || dokku_log_fail "sshcommand returned an error $?"
+  [[ -z "$NAME" ]] && dokku_log_fail "A name is required to remove a key, ie: dokku ssh-keys:remove <name>"
+  sshcommand acl-remove dokku "$NAME" || dokku_log_fail "sshcommand returned an error $?"
 }
 
 cmd-ssh-keys-remove "$@"
diff --git a/plugins/storage/internal-functions b/plugins/storage/internal-functions
index efa35d4b7..31c292790 100755
--- a/plugins/storage/internal-functions
+++ b/plugins/storage/internal-functions
@@ -7,9 +7,10 @@ set -eo pipefail
 
 cmd-storage-report() {
   declare desc="displays a storage report for one or more apps"
-  local cmd="storage:report"
+  declare cmd="storage:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
@@ -77,10 +78,13 @@ fn-storage-bind-mounts() {
 
 cmd-storage-list() {
   declare desc="List all bound mounts"
-  local cmd="storage:list"
+  declare cmd="storage:list"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
   local passed_phases="deploy"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2" && local APP="$2"
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
   dokku_log_quiet "$APP volume bind-mounts:"
   get_bind_mounts "$(get_phase_file_path "$passed_phases")"
 }
diff --git a/plugins/storage/subcommands/mount b/plugins/storage/subcommands/mount
index 1887c1af6..57db21a75 100755
--- a/plugins/storage/subcommands/mount
+++ b/plugins/storage/subcommands/mount
@@ -7,11 +7,14 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
 
 cmd-storage-mount() {
   declare desc="Add bind-mount, redeploy app if running"
-  local cmd="storage:mount"
+  declare cmd="storage:mount"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" MOUNT_PATH="$2"
   local passed_phases=(deploy run)
-  [[ -z $3 || $4 ]] && dokku_log_fail "storage:mount requires an app and a two paths divided by colon."
-  verify_app_name "$2" && local APP="$2"
-  verify_paths "$3" && local MOUNT_PATH="$3"
+
+  [[ -z "$APP" || "$MOUNT_PATH" ]] && dokku_log_fail "storage:mount requires an app and a two paths divided by colon."
+  verify_app_name "$APP"
+  verify_paths "$MOUNT_PATH"
   check_if_path_exists "$MOUNT_PATH" "$(get_phase_file_path "${passed_phases[@]}")" && dokku_log_fail "Mount path already exists."
   add_passed_docker_option passed_phases[@] "-v $MOUNT_PATH"
 }
diff --git a/plugins/storage/subcommands/unmount b/plugins/storage/subcommands/unmount
index 9ba3a8067..f5d77c06c 100755
--- a/plugins/storage/subcommands/unmount
+++ b/plugins/storage/subcommands/unmount
@@ -7,11 +7,14 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
 
 cmd-storage-unmount() {
   declare desc="Remove bind-mount, restart app if running"
-  local cmd="storage:unmount"
+  declare cmd="storage:unmount"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" MOUNT_PATH="$2"
   local passed_phases=(deploy run)
-  [[ -z $3 || $4 ]] && dokku_log_fail "storage:unmount requires an app and a two paths divided by colon."
-  verify_app_name "$2" && local APP="$2"
-  verify_paths "$3" && local MOUNT_PATH="$3"
+
+  [[ -z "$APP" || "$MOUNT_PATH" ]] && dokku_log_fail "storage:unmount requires an app and a two paths divided by colon."
+  verify_app_name "$APP"
+  verify_paths "$MOUNT_PATH"
   check_if_path_exists "$MOUNT_PATH" "$(get_phase_file_path "${passed_phases[@]}")" || dokku_log_fail "Mount path does not exist."
   remove_passed_docker_option passed_phases[@] "-v $MOUNT_PATH"
 }
diff --git a/plugins/tags/subcommands/create b/plugins/tags/subcommands/create
index 02bfc3f39..ea49d1506 100755
--- a/plugins/tags/subcommands/create
+++ b/plugins/tags/subcommands/create
@@ -6,13 +6,14 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 cmd-tags-create() {
   declare desc="creates an images tag for app via command line"
-  local cmd="tags:create"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  local APP="$2"
-  local IMAGE_TAG="$3"
-  local IMAGE_REPO=$(get_app_image_repo "$APP")
+  declare cmd="tags:create"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" IMAGE_TAG="$2"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   verify_app_name "$APP"
 
+  local IMAGE_REPO=$(get_app_image_repo "$APP")
   local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   plugn trigger scheduler-tags-create "$DOKKU_SCHEDULER" "$APP" "$IMAGE_REPO:latest" "$IMAGE_REPO:$IMAGE_TAG"
 
diff --git a/plugins/tags/subcommands/default b/plugins/tags/subcommands/default
index 4710cbf26..e740f5983 100755
--- a/plugins/tags/subcommands/default
+++ b/plugins/tags/subcommands/default
@@ -5,12 +5,14 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-tags-default() {
   declare desc="shows docker images tags for app via command line"
-  local cmd="tags"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  local APP="$2"
-  local IMAGE_REPO=$(get_app_image_repo "$APP")
+  declare cmd="tags"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   verify_app_name "$APP"
 
+  local IMAGE_REPO=$(get_app_image_repo "$APP")
   dokku_log_info2_quiet "Image tags for $IMAGE_REPO"
   "$DOCKER_BIN" image list "$IMAGE_REPO"
 }
diff --git a/plugins/tags/subcommands/deploy b/plugins/tags/subcommands/deploy
index 41461ce8c..227b0f30a 100755
--- a/plugins/tags/subcommands/deploy
+++ b/plugins/tags/subcommands/deploy
@@ -5,13 +5,14 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-tags-deploy() {
   declare desc="deploys an app with a given tagged image via command line"
-  local cmd="tags:deploy"
-  declare APP="$2" IMAGE_TAG="$3"
-  local IMAGE
+  declare cmd="tags:deploy"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" IMAGE_TAG="$2"
+
   [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   verify_app_name "$APP"
 
-  IMAGE="$(get_app_image_name "$APP" "$IMAGE_TAG")"
+  local IMAGE="$(get_app_image_name "$APP" "$IMAGE_TAG")"
   verify_image "$IMAGE" || return 1
   release_and_deploy "$APP" "$IMAGE_TAG"
 
diff --git a/plugins/tags/subcommands/destroy b/plugins/tags/subcommands/destroy
index d60dd6a57..7a935948e 100755
--- a/plugins/tags/subcommands/destroy
+++ b/plugins/tags/subcommands/destroy
@@ -6,13 +6,14 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 cmd-tags-destroy() {
   declare desc="destroys an app image tag via command line"
-  local cmd="tags:destroy"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  local APP="$2"
-  local IMAGE_TAG="$3"
-  local IMAGE_REPO=$(get_app_image_repo "$APP")
-  verify_app_name "$2"
+  declare cmd="tags:destroy"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" IMAGE_TAG="$2"
 
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
+
+  local IMAGE_REPO=$(get_app_image_repo "$APP")
   case "$IMAGE_TAG" in
     latest)
       dokku_log_fail "You can't remove internal dokku tag ($IMAGE_TAG) for $IMAGE_REPO"
diff --git a/plugins/tar/functions b/plugins/tar/functions
index 82887d14b..a5b703d19 100755
--- a/plugins/tar/functions
+++ b/plugins/tar/functions
@@ -58,21 +58,23 @@ tar_trigger_build() {
 
 cmd-tar-in() {
   declare desc="deploys app from tarball on STDIN via command line"
-  local cmd="tar:in"
-  local APP="$2"
+  declare cmd="tar:in"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
-  verify_app_name "$2"
+  verify_app_name "$APP"
   tee "$DOKKU_ROOT/$APP/src.tar" | wc -c
   tar_receive_app "$APP"
 }
 
 cmd-tar-from() {
   declare desc="deploys app from tarball at URL via command line"
-  local cmd="tar:from"
-  verify_app_name "$2"
-  local APP=$2
-  local URL=$3
-  shift 3
+  declare cmd="tar:from"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" URL="$2"
+
+  verify_app_name "$APP"
+  shift 2
   curl -# --insecure -L "$URL" | tar_in_cmd "tar:in" "$APP" "$@"
 }
 
diff --git a/plugins/trace/subcommands/default b/plugins/trace/subcommands/default
index a38c81bd6..577c44312 100755
--- a/plugins/trace/subcommands/default
+++ b/plugins/trace/subcommands/default
@@ -5,20 +5,23 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-trace-default() {
   declare desc="enables/disables trace mode"
-  local cmd="trace"
+  declare cmd="trace"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare ARGUMENT="$1"
+
   [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
-  [[ "$2" == "on" ]] || [[ "$2" == "off" ]] || {
+  [[ "$ARGUMENT" == "on" ]] || [[ "$ARGUMENT" == "off" ]] || {
     dokku_log_fail "Valid trace options are [on/off]"
   }
 
   dokku_log_warn "Deprecated: Please use trace:on or trace:off"
 
-  if [[ "$2" == "on" ]]; then
+  if [[ "$ARGUMENT" == "on" ]]; then
     dokku_log_info1 "Enabling trace mode"
     echo "export DOKKU_TRACE=1" >"$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
   fi
 
-  if [[ "$2" == "off" ]]; then
+  if [[ "$ARGUMENT" == "off" ]]; then
     dokku_log_info1 "Disabling trace mode"
     rm -f "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
   fi
diff --git a/plugins/trace/subcommands/off b/plugins/trace/subcommands/off
index 54c4bc718..51b480582 100755
--- a/plugins/trace/subcommands/off
+++ b/plugins/trace/subcommands/off
@@ -5,10 +5,11 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-trace-off() {
   declare desc="disables trace mode"
-  local cmd="trace"
-  [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
+  declare cmd="trace"
+  [[ "$1" == "$cmd" ]] && shift 1
 
   dokku_log_info1 "Disabling trace mode"
+  [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
   rm -f "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
 }
 
diff --git a/plugins/trace/subcommands/on b/plugins/trace/subcommands/on
index 568b2dfba..aff884cff 100755
--- a/plugins/trace/subcommands/on
+++ b/plugins/trace/subcommands/on
@@ -5,10 +5,11 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-trace-on() {
   declare desc="enables trace mode"
-  local cmd="trace"
-  [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
+  declare cmd="trace"
+  [[ "$1" == "$cmd" ]] && shift 1
 
   dokku_log_info1 "Enabling trace mode"
+  [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
   echo "export DOKKU_TRACE=1" >"$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
 }