diff --git a/tools/cts1-env.sh b/tools/cts1-env.sh
index 0b8f51e89..ab9d0bbf4 100755
--- a/tools/cts1-env.sh
+++ b/tools/cts1-env.sh
@@ -76,7 +76,6 @@ esac
 for env in ${environments}; do
   if [[ $(fn_exists "$env") -gt 0 ]]; then
     if [[ "${verbose:-false}" != false ]]; then echo "export -f $env"; fi
-
     export -f "${env?}"
   else
     die "Requested environment $env is not defined."
diff --git a/tools/darwin-arm-env.sh b/tools/darwin-arm-env.sh
index bc66d8af5..686e3c6f8 100644
--- a/tools/darwin-arm-env.sh
+++ b/tools/darwin-arm-env.sh
@@ -61,8 +61,8 @@ esac
 
 for env in $environments; do
   if [[ $(fn_exists $env) -gt 0 ]]; then
-    ! [[ -v "$verbose" ]] && [[ "${verbose}" != "false" ]] && echo "export -f $env"
-    export -f ${env?}
+    if [[ "${verbose:-false}" != "false" ]]; then "export -f $env"; fi
+    export -f "${env?}"
   else
     die "Requested environment $env is not defined."
   fi
diff --git a/tools/darwin-power9-env.sh b/tools/darwin-power9-env.sh
index d32762650..27fdffed7 100644
--- a/tools/darwin-power9-env.sh
+++ b/tools/darwin-power9-env.sh
@@ -86,10 +86,10 @@ esac
 # Sanity check
 #--------------------------------------------------------------------------------------------------#
 
-for env in $environments; do
-  if [[ $(fn_exists $env) -gt 0 ]]; then
-    ! [[ -v "$verbose" ]] && [[ "${verbose}" != "false" ]] && echo "export -f $env"
-    export -f ${env?}
+for env in ${environments}; do
+  if [[ $(fn_exists "$env") -gt 0 ]]; then
+    if [[ "${verbose:-false}" != false ]]; then echo "export -f $env"; fi
+    export -f "${env?}"
   else
     die "Requested environment $env is not defined."
   fi
diff --git a/tools/darwin-x86_64-env.sh b/tools/darwin-x86_64-env.sh
index 1c0e62b49..72538a498 100644
--- a/tools/darwin-x86_64-env.sh
+++ b/tools/darwin-x86_64-env.sh
@@ -15,7 +15,7 @@ environments="x86gcc930env x86intel1905env"
 # Special setup for CTS-1: replace the 'draco-latest' symlink
 pushd "/usr/projects/${package:-notset}" || exit
 if [[ -L draco-latest ]]; then rm draco-latest; fi
-if [[ -d "${source_prefix:=notset}" ]]; then ln -s "${source_prefix} draco-latest"; fi
+if [[ -d "${source_prefix:=notset}" ]]; then ln -s "${source_prefix}" draco-latest; fi
 popd || exit
 
 #--------------------------------------------------------------------------------------------------#