diff --git a/bin/backup b/bin/backup
index a051c36..0a71fbe 100755
--- a/bin/backup
+++ b/bin/backup
@@ -86,6 +86,8 @@ expire_date=
 archive_prefix=
 quiet=()
 
+# @formatter:off
+# TEMP: remove when https://github.com/lovesegfault/beautysh/issues/265 is fixed
 while :; do
     case "${1:-}" in
         -s | --source)
@@ -170,6 +172,7 @@ while :; do
     esac
     shift
 done
+# @formatter:on
 
 check-root
 
diff --git a/bin/benchmark b/bin/benchmark
index 1219989..52ebb40 100755
--- a/bin/benchmark
+++ b/bin/benchmark
@@ -18,7 +18,7 @@
 ############
 
 # Version
-version=1.2.4
+version=1.2.5
 # Individual benchmark time limit (seconds)
 # Quick benchmark
 test_run_time_quick=6
@@ -168,7 +168,7 @@ _cpu-app-test() {
 ## @param    $@  Params for benchmark
 #####################################
 _run-benchmark() {
-    local type="${1?:Benchmark type missing}"
+    local type="${1:?Benchmark type missing}"
     local params=("--time=${test_run_time}")
 
     # Compile params
@@ -200,8 +200,8 @@ _run-benchmark() {
 ## @param    $2  Raw results
 #######################################
 _filter-results() {
-    local type="${1?:Benchmark type missing}"
-    local raw="${2?:Raw results missing}"
+    local type="${1:?Benchmark type missing}"
+    local raw="${2:?Raw results missing}"
     local filter
 
     case "${type}" in
@@ -362,6 +362,8 @@ report_file_prefix=
 sys_check=
 benchmark_depth=
 params_file=
+# @formatter:off
+# TEMP: remove when https://github.com/lovesegfault/beautysh/issues/265 is fixed
 while :; do
     case "${1:-}" in
         -r | --report) create_report=1 ;;
@@ -399,6 +401,7 @@ while :; do
     esac
     shift
 done
+# @formatter:on
 
 if [[ -z "${sys_check}" && -z "${benchmark_depth}" ]]; then
     echo "Benchmark depth missing (quick or full)" >&2
diff --git a/bin/clean b/bin/clean
index 4b3162c..25aabe5 100755
--- a/bin/clean
+++ b/bin/clean
@@ -64,6 +64,8 @@ journal_retention=2w
 quiet=()
 redirection=/dev/stdout
 
+# @formatter:off
+# TEMP: remove when https://github.com/lovesegfault/beautysh/issues/265 is fixed
 while :; do
     case "${1:-}" in
         -j | --journal)
@@ -92,6 +94,7 @@ while :; do
     esac
     shift
 done
+# @formatter:on
 
 uid=$(id -u)
 if [[ "${uid}" -ne 0 ]]; then
diff --git a/bin/generate-moduli b/bin/generate-moduli
index 4ba4bc0..bf651fe 100755
--- a/bin/generate-moduli
+++ b/bin/generate-moduli
@@ -16,8 +16,8 @@
 ## @param    $2  Output file path
 #########################################
 _generate-DH-primes() {
-    local bit="${1?:Bit missing}"
-    local output_file="${2?:Output file name missing}"
+    local bit="${1:?Bit missing}"
+    local output_file="${2:?Output file name missing}"
     local candidates
     candidates=$(mktemp --tmpdir DH_candidates.XXXXXXXX)
 
diff --git a/bin/pass-man b/bin/pass-man
index 5a30894..f73159c 100755
--- a/bin/pass-man
+++ b/bin/pass-man
@@ -15,7 +15,7 @@
 _usage() {
     cat <<HELP
 
-pass-man v1.4.0
+pass-man v1.4.1
 Written by Sandor Semsey, Copyright (C) 2020, License MIT
 
 Usage: pass-man ACTION [TARGET] [EXTRA]...
@@ -75,7 +75,7 @@ _vault-generate() {
 ## @param    $@  Extra arguments to 'pass'
 ##########################################
 _vault-retrieve() {
-    local path="${1?:Path to password missing}"
+    local path="${1:?Path to password missing}"
     shift
     _vault-open
     pass "${@}" "${path}"
@@ -97,6 +97,8 @@ action="${1:-}"
 [[ -n "${action}" ]] && shift
 
 # Switch action
+# @formatter:off
+# TEMP: remove when https://github.com/lovesegfault/beautysh/issues/265 is fixed
 case "${action}" in
     open) _vault-open "${@}" ;;
     close) _vault-close "${@}" ;;
@@ -114,5 +116,6 @@ case "${action}" in
     "") print-error Action missing && _usage ;;
     *) print-error Invalid action && _usage ;;
 esac
+# @formatter:on
 
 exit 0
diff --git a/bin/sign-kernel-modules b/bin/sign-kernel-modules
index fbb5ff2..d023d14 100755
--- a/bin/sign-kernel-modules
+++ b/bin/sign-kernel-modules
@@ -18,9 +18,9 @@ IFS=$'\n\t'
 source "${ES_SHELL_LOADER}"
 check-root
 
-module="${1?:Kernel module missing}"
-key="${2?:MOK private key missing}"
-cert="${3?:MOK certificate missing}"
+module="${1:?Kernel module missing}"
+key="${2:?MOK private key missing}"
+cert="${3:?MOK certificate missing}"
 
 module_file=$(modinfo -n "${module}")
 module_dir=$(dirname "${module_file}")
diff --git a/bin/test-dd-write b/bin/test-dd-write
index 5a8b0db..7d8f363 100755
--- a/bin/test-dd-write
+++ b/bin/test-dd-write
@@ -35,8 +35,8 @@ _clean-up() {
 ## @param    $2  Number of blocks to write
 ##########################################
 _test-block-size() {
-    local bs="${1?:Block size missing}"
-    local count="${2?:Number of blocks missing}"
+    local bs="${1:?Block size missing}"
+    local count="${2:?Number of blocks missing}"
 
     echo Testing block size  = "${bs}"
     dd if=/dev/urandom of="${test_file_name}" bs="${bs}" count="${count}" iflag=fullblock
diff --git a/lib/certificate.sh b/lib/certificate.sh
index 58cf455..50506d3 100644
--- a/lib/certificate.sh
+++ b/lib/certificate.sh
@@ -13,9 +13,9 @@
 ## @param    $3  CSR subject
 ###########################################
 csr-create() {
-    local priv_key="${1?:Private key path missing}"
-    local csr="${2?:CSR path missing}"
-    local subject="${3?:CSR subject missing}"
+    local priv_key="${1:?Private key path missing}"
+    local csr="${2:?CSR path missing}"
+    local subject="${3:?CSR subject missing}"
     shift 3
     openssl req \
         -new \
@@ -36,11 +36,11 @@ csr-create() {
 ## @param    $5  Validity in days
 ###########################################
 csr-sign() {
-    local ca_priv_key="${1?:CA private key path missing}"
-    local ca_cert="${2?:CA cert path missing}"
-    local csr="${3?:CSR path missing}"
-    local cert="${4?:Certificate path missing}"
-    local validity="${5?:Valid days missing}"
+    local ca_priv_key="${1:?CA private key path missing}"
+    local ca_cert="${2:?CA cert path missing}"
+    local csr="${3:?CSR path missing}"
+    local cert="${4:?Certificate path missing}"
+    local validity="${5:?Valid days missing}"
     local subject site tmp_config
     shift 5
 
@@ -74,7 +74,7 @@ EOF
 ## @param    $1  CSR path
 #########################
 csr-view() {
-    local csr="${1?:CSR path missing}"
+    local csr="${1:?CSR path missing}"
     shift
     openssl req \
         -noout \
@@ -87,7 +87,7 @@ csr-view() {
 ## @param    $1  Key path
 #########################
 cert-key() {
-    local key="${1?:Key path missing}"
+    local key="${1:?Key path missing}"
     shift
     openssl genpkey \
         -aes-256-cbc \
@@ -104,10 +104,10 @@ cert-key() {
 ## @param    $4  Certificate subject
 ####################################
 cert-selfsigned() {
-    local priv_key="${1?:Private key path missing}"
-    local cert="${2?:Certificate path missing}"
-    local validity="${3?:Valid days missing}"
-    local subject="${4?:Certificate subject missing}"
+    local priv_key="${1:?Private key path missing}"
+    local cert="${2:?Certificate path missing}"
+    local validity="${3:?Valid days missing}"
+    local subject="${4:?Certificate subject missing}"
     shift 4
     openssl req \
         -new \
@@ -134,12 +134,12 @@ cert-selfsigned() {
 ##               default: RSA,rsa_keygen_bits:4096
 ####################################################################
 cert-create() {
-    local priv_key="${1?:Private key path missing}"
-    local subject="${2?:CSR subject missing}"
-    local ca_priv_key="${3?:CA private key path missing}"
-    local ca_cert="${4?:CA cert path missing}"
-    local cert="${5?:Certificate path missing}"
-    local validity="${6?:Valid days missing}"
+    local priv_key="${1:?Private key path missing}"
+    local subject="${2:?CSR subject missing}"
+    local ca_priv_key="${3:?CA private key path missing}"
+    local ca_cert="${4:?CA cert path missing}"
+    local cert="${5:?Certificate path missing}"
+    local validity="${6:?Valid days missing}"
     local priv_key_type="${7:-RSA,rsa_keygen_bits:4096}"
     local csr key_opts option
     local priv_key_options=()
@@ -162,7 +162,7 @@ cert-create() {
 ## @param    $1  Cert path
 ##########################
 cert-view() {
-    local cert="${1?:Certificate path missing}"
+    local cert="${1:?Certificate path missing}"
     shift
     openssl x509 \
         -noout \
diff --git a/lib/dev.sh b/lib/dev.sh
index e6393f7..4b6851e 100644
--- a/lib/dev.sh
+++ b/lib/dev.sh
@@ -10,7 +10,7 @@
 ## @param    $1  Remote host
 ###################################
 debug-tunnel-open() {
-    local remote="${1?:Remote missing}"
+    local remote="${1:?Remote missing}"
     ssh-tunnel-open -fqN -R 9003:localhost:9003 "${remote}"
 }
 
@@ -19,7 +19,7 @@ debug-tunnel-open() {
 ## @param    $1  Remote host
 ####################################
 debug-tunnel-close() {
-    local remote="${1?:Remote missing}"
+    local remote="${1:?Remote missing}"
     ssh-tunnel-close -fqN -R 9003:localhost:9003 "${remote}"
 }
 
@@ -30,8 +30,8 @@ debug-tunnel-close() {
 ## @param    $@  Extra args to mkdocs build
 ###########################################
 build-mkdocs() {
-    local config_file="${1?:mkdocs config file missing}"
-    local destination="${2?:Build destination missing}"
+    local config_file="${1:?mkdocs config file missing}"
+    local destination="${2:?Build destination missing}"
     shift 2
 
     mkdocs build -f "${config_file}" -d "${destination}" "${@}"
@@ -75,8 +75,8 @@ ppretty-json() {
 ## @param   $2  Which part to bump (major, minor, patch)
 ########################################################
 bump-version() {
-    local version="${1?:Version missing}"
-    local part="${2?:Version part missing}"
+    local version="${1:?Version missing}"
+    local part="${2:?Version part missing}"
     local major minor patch
 
     IFS=. read -r major minor patch <<< "${version}"
diff --git a/lib/git.sh b/lib/git.sh
index 3c6132b..b4c14c4 100644
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -52,7 +52,7 @@ ggit-report() {
 ## @param    $1  How many commits from HEAD
 ###########################################
 ggit-fix() {
-    local commits="${1?:Commits missing}"
+    local commits="${1:?Commits missing}"
     git rebase -i "HEAD~${commits}"
 }
 
@@ -103,8 +103,8 @@ ggit-update() {
 ## @param    $2  Branch B
 #########################
 ggit-diff() {
-    local branch_a="${1?:Branch A missing}"
-    local branch_b="${2?:Branch B missing}"
+    local branch_a="${1:?Branch A missing}"
+    local branch_b="${2:?Branch B missing}"
     git diff --stat "${branch_a}" "${branch_b}"
 }
 
@@ -156,7 +156,7 @@ ggit-base() {
 ## @default      origin
 #################################
 ggit-tag() {
-    local name="${1?:Tag name missing}"
+    local name="${1:?Tag name missing}"
     local commit="${2:-HEAD}"
     local message="${3:-${name}}"
     local remote="${4:-origin}"
@@ -174,7 +174,7 @@ ggit-tag() {
 ## @default      origin
 #########################################################
 ggit-version() {
-    local part="${1?:Version part missing}"
+    local part="${1:?Version part missing}"
     local commit="${2:-HEAD}"
     local remote="${3:-origin}"
     local version
diff --git a/lib/github.sh b/lib/github.sh
index c04e51b..38f69c3 100644
--- a/lib/github.sh
+++ b/lib/github.sh
@@ -11,7 +11,7 @@
 ## @param    $@  Extra args to gh
 #################################
 ghub-list() {
-    local owner="${1?:Owner missing}"
+    local owner="${1:?Owner missing}"
     shift
     gh repo list "${owner}" --limit 100 "${@}"
 }
@@ -22,7 +22,7 @@ ghub-list() {
 ## @param    $@  Extra args to gh
 #################################
 ghub-list-license() {
-    local owner="${1?:Owner missing}"
+    local owner="${1:?Owner missing}"
     shift
     # shellcheck disable=SC2016
     ghub-list "${owner}" "${@}" \
@@ -36,7 +36,7 @@ ghub-list-license() {
 ## @param    $@  Extra args to gh
 #################################
 ghub-get() {
-    local owner="${1?:Owner missing}"
+    local owner="${1:?Owner missing}"
     shift
     # shellcheck disable=SC2312
     ghub-list "${owner}" "${@}" \
@@ -80,7 +80,7 @@ ghub-settings() {
 ## @param    $@  Extra args to gh
 #################################
 ghub-repo-clone() {
-    local repo="${1?:Repo missing}"
+    local repo="${1:?Repo missing}"
     shift
     gh repo clone "${repo}" "${@}"
 }
@@ -91,7 +91,7 @@ ghub-repo-clone() {
 ## @param    $@  Extra args to gh
 #################################
 ghub-repo-new() {
-    local repo="${1?:Repo missing}"
+    local repo="${1:?Repo missing}"
     shift
     gh repo create "${repo}" "${@}"
 }
@@ -102,7 +102,7 @@ ghub-repo-new() {
 ## @param    $@  Extra args to gh
 #################################
 ghub-sync-config() {
-    local repo="${1?:Repo missing}"
+    local repo="${1:?Repo missing}"
     shift
     gh repo edit "${repo}" \
         --delete-branch-on-merge \
@@ -119,8 +119,8 @@ ghub-sync-config() {
 ## @param    $2  Master repo
 ############################
 ghub-sync-labels() {
-    local repo="${1?:Repo missing}"
-    local template="${2?:Template missing}"
+    local repo="${1:?Repo missing}"
+    local template="${2:?Template missing}"
     local label labels_current labels_template exist_in_template
 
     # Sync labels
@@ -141,7 +141,7 @@ ghub-sync-labels() {
 ## @param    $@  Topics
 #######################
 ghub-topic() {
-    local repo="${1?:Repo missing}"
+    local repo="${1:?Repo missing}"
     local topics=()
     shift
 
@@ -161,8 +161,8 @@ ghub-topic() {
 ## @param    $@  Topics
 ################################
 ghub-repo-template() {
-    local repo="${1?:Repo missing}"
-    local template="${2?:Template missing}"
+    local repo="${1:?Repo missing}"
+    local template="${2:?Template missing}"
     shift 2
 
     ghub-repo-new "${repo}" --private --template "${template}"
@@ -179,8 +179,8 @@ ghub-repo-template() {
 ## @param    $@  Extra args to command
 ######################################
 ghub-foreach-owner() {
-    local owner="${1?:Owner missing}"
-    local command="${2?:Command missing}"
+    local owner="${1:?Owner missing}"
+    local command="${2:?Command missing}"
     local repo
     shift 2
 
@@ -198,9 +198,9 @@ ghub-foreach-owner() {
 ## @param    $@  Extra args to command
 ######################################
 ghub-foreach-topic() {
-    local owner="${1?:Owner missing}"
-    local topic="${2?:Topic missing}"
-    local command="${3?:Command missing}"
+    local owner="${1:?Owner missing}"
+    local topic="${2:?Topic missing}"
+    local command="${3:?Command missing}"
     local repo
     shift 3
 
@@ -232,9 +232,9 @@ ghub-issue() {
 ## @param    $@  Extra args to gh
 ####################################
 ghub-secret-set() {
-    local repo="${1?:Repo missing}"
-    local name="${2?:Secret name missing}"
-    local value="${3?:Secret value missing}"
+    local repo="${1:?Repo missing}"
+    local name="${2:?Secret name missing}"
+    local value="${3:?Secret value missing}"
     shift 3
     gh secret set "${name}" --body "${value}" --app actions --repo "${repo}" "${@}"
 }
@@ -246,8 +246,8 @@ ghub-secret-set() {
 ## @param    $@  Extra args to gh
 ################################################
 ghub-pr() {
-    local title="${1?:Title missing}"
-    local body="${2?:PR body missing}"
+    local title="${1:?Title missing}"
+    local body="${2:?PR body missing}"
     shift 2
 
     if [[ -r "${body}" ]]; then
diff --git a/lib/network.sh b/lib/network.sh
index 3429846..9399ce6 100644
--- a/lib/network.sh
+++ b/lib/network.sh
@@ -11,8 +11,8 @@
 ## @param    $2  DKIM selector
 #####################################
 dns-mail() {
-    local domain="${1?:Domain missing}"
-    local selector="${2?:DKIM selector missing}"
+    local domain="${1:?Domain missing}"
+    local selector="${2:?DKIM selector missing}"
 
     print-header MX
     dig MX "${domain}"
diff --git a/lib/process.sh b/lib/process.sh
index ae62644..e57c074 100644
--- a/lib/process.sh
+++ b/lib/process.sh
@@ -50,8 +50,8 @@ foreach-subdir() {
 ## @param    $2  Command to pipe to
 ####################################
 foreach-subdir-pipe() {
-    local command="${1?:Command missing}"
-    local pipe="${2?:Pipe command missing}"
+    local command="${1:?Command missing}"
+    local pipe="${2:?Pipe command missing}"
     # shellcheck disable=SC2312
     while IFS= read -r -d '' dir; do
         print-section "${dir}"
@@ -68,7 +68,7 @@ foreach-subdir-pipe() {
 ## @param    $1  Command name
 ################################
 proc-is-running() {
-    local command="${1?:Command missing}"
+    local command="${1:?Command missing}"
     shift
     pgrep -f "${@}" "${command}" >/dev/null 2>&1
 }
diff --git a/lib/ssh.sh b/lib/ssh.sh
index 2295c39..ee6f883 100644
--- a/lib/ssh.sh
+++ b/lib/ssh.sh
@@ -13,8 +13,8 @@
 ## @default      12 hours
 #################################
 unlock-key() {
-    local key="${1?:Path to SSH key missing}"
-    local pass_path="${2?:Path to password missing}"
+    local key="${1:?Path to SSH key missing}"
+    local pass_path="${2:?Path to password missing}"
     local cache_time="${3:-12h}"
     local password public_key current_identities
 
@@ -74,8 +74,8 @@ ssh-tunnel-close() {
 ## @param    $2  Local port
 ############################
 socks5-tunnel-open() {
-    local remote="${1?:Remote missing}"
-    local port="${2?:Local port missing}"
+    local remote="${1:?Remote missing}"
+    local port="${2:?Local port missing}"
     ssh-tunnel-open -fqN -D "${port}" "${remote}"
 }
 
@@ -85,8 +85,8 @@ socks5-tunnel-open() {
 ## @param    $2  Local port
 ############################
 socks5-tunnel-close() {
-    local remote="${1?:Remote missing}"
-    local port="${2?:Local port missing}"
+    local remote="${1:?Remote missing}"
+    local port="${2:?Local port missing}"
     ssh-tunnel-close -fqN -D "${port}" "${remote}"
 }
 
@@ -96,8 +96,8 @@ socks5-tunnel-close() {
 ## @param    $2  Comment for key
 ################################
 ssh-create-key() {
-    local key_name="${1?:Key name missing}"
-    local comment="${2?:Key comment missing}"
+    local key_name="${1:?Key name missing}"
+    local comment="${2:?Key comment missing}"
     shift 2
     ssh-keygen \
         -t ed25519 \
@@ -117,12 +117,12 @@ ssh-create-key() {
 ## @param    $6  Path to user public key - this will be signed
 ##############################################################
 ssh-sign-user() {
-    local validity="${1?:Validity interval missing}"
-    local ca_key_path="${2?:Path to CA key missing}"
-    local identity="${3?:Key identity missing}"
-    local principals="${4?:Principals missing}"
-    local serial="${5?:Serial number missing}"
-    local pubkey_path="${6?:User public key path missing}"
+    local validity="${1:?Validity interval missing}"
+    local ca_key_path="${2:?Path to CA key missing}"
+    local identity="${3:?Key identity missing}"
+    local principals="${4:?Principals missing}"
+    local serial="${5:?Serial number missing}"
+    local pubkey_path="${6:?User public key path missing}"
     shift 6
     ssh-keygen \
         -V "${validity}" \
@@ -138,7 +138,7 @@ ssh-sign-user() {
 ## @param    $1  Path to certificate
 ####################################
 ssh-view-cert() {
-    local cert="${1?:Certificate path missing}"
+    local cert="${1:?Certificate path missing}"
     shift
     ssh-keygen -L -f "${cert}" "${@}"
 }
diff --git a/lib/text.sh b/lib/text.sh
index c12854f..5c0e11e 100644
--- a/lib/text.sh
+++ b/lib/text.sh
@@ -63,7 +63,7 @@ urlencode() {
 ## @param   $1  String to decode
 ################################
 urldecode() {
-    local encoded="${1:?"URL-encoded string missing"}"
+    local encoded="${1:?URL-encoded string missing}"
 
     # Change + to space
     encoded="${encoded//+/ }"