diff --git a/headstart-core.bash b/headstart-core.bash
index 5d7c2efee88b08ba02942f98d09298894687b94c..1e45501745abe4b3fa4450b653422423bc60b495 100644
--- a/headstart-core.bash
+++ b/headstart-core.bash
@@ -96,7 +96,6 @@ function headstart() {
       complete | env)
         # <<-CODE_NOTE: This is matched when autocompletion occurs or when using
         #               `eval "$(./headstart env -)"`
-        go_early=true
         rest+=("$1")
         ;;
       *)
@@ -121,21 +120,18 @@ function headstart() {
 
   . "$_GO_USE_MODULES" 'installation' 'aliases'
 
-  if [[ "$go_early" == 'true' ]]; then
-    case "${rest[0]}" in
-      'env')
+  case "${rest[0]}" in
+    'env')
+      @go "${rest[@]}"
+      return
+      ;;
+    'complete')
+      if [[ "$(get_installation_status)" == 'bootstrapped' ]]; then
         @go "${rest[@]}"
-        return
-        ;;
-      'complete')
-        if [[ "$(get_installation_status)" == 'bootstrapped' ]]; then
-          @go "${rest[@]}"
-        fi
-        return
-        ;;
-    esac
-  fi
-  unset go_early
+      fi
+      return
+      ;;
+  esac
 
   . "$_GO_USE_MODULES" 'system'