diff --git a/common/predictive-text/.build-builder b/common/predictive-text/.build-builder
index 2792189301..4e15741a62 100644
--- a/common/predictive-text/.build-builder
+++ b/common/predictive-text/.build-builder
@@ -1,4 +1 @@
-The presence of this file tells CI to use the new builder_ style parameters for build.sh.
-
-Once all branches for 16.0+ are updated to merge the chore/web/more-script-updates branch, then we
-can remove this file and the corresponding bash test branches in CI.
\ No newline at end of file
+The presence of this file tells CI to use the new builder_ style parameters for build.sh and unit_tests/test.sh.
\ No newline at end of file
diff --git a/common/predictive-text/build.sh b/common/predictive-text/build.sh
index b2e48269e7..2433ab8481 100755
--- a/common/predictive-text/build.sh
+++ b/common/predictive-text/build.sh
@@ -81,9 +81,7 @@ fi
 
 # A nice, extensible method for -clean operations.  Add to this as necessary.
 do_clean() {
-  if [ -d $LMLAYER_OUTPUT ]; then
-    rm -rf "$LMLAYER_OUTPUT"
-  fi
+  rm -rf "$LMLAYER_OUTPUT"
 }
 
 CLEANED=
diff --git a/common/predictive-text/unit_tests/test.sh b/common/predictive-text/unit_tests/test.sh
index d5990464ab..c6fc13bb4e 100755
--- a/common/predictive-text/unit_tests/test.sh
+++ b/common/predictive-text/unit_tests/test.sh
@@ -7,10 +7,9 @@ THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BA
 
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-SCRIPT_ROOT="$(dirname "$THIS_SCRIPT")"
 
 # This script runs from its own folder
-cd "$SCRIPT_ROOT"
+cd "$THIS_SCRIPT_PATH"
 
 ################################ Main script ################################
 
diff --git a/resources/builder.inc.sh b/resources/builder.inc.sh
index d526b60c9a..b6137ec3b0 100755
--- a/resources/builder.inc.sh
+++ b/resources/builder.inc.sh
@@ -189,7 +189,9 @@ _builder_failure_trap() {
 
     builder_finish_action failure $action $target
 
-    # Ensure that the exit code propagates fully.
+    # Make 100% sure that the exit code chains fully.
+    # Without this, nested scripts have failed to chain errors from npm calls past the script
+    # that directly executed the failed npm command.
     exit $trappedExitCode
   fi
 }