diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
index 1286430dbd..90b4cfe203 100755
--- a/scripts/exregional_run_fcst.sh
+++ b/scripts/exregional_run_fcst.sh
@@ -416,7 +416,7 @@ if [ "${USE_CCPP}" = "TRUE" ]; then
   elif [ "${CCPP_PHYS_SUITE}" = "GSD" ]; then
     cp_vrfy ${TEMPLATE_DIR}/${DIAG_TABLE_CCPP_GSD_FN} ${CYCLE_DIR}/${DIAG_TABLE_FN}
   fi
-elif [ "${USE_CCPP}" = "false" ]; then
+else
   cp_vrfy ${TEMPLATE_DIR}/${DIAG_TABLE_FN} ${CYCLE_DIR}
 fi
 #
diff --git a/ush/generate_FV3SAR_wflow.sh b/ush/generate_FV3SAR_wflow.sh
index 1c9efead09..b2efdafc24 100755
--- a/ush/generate_FV3SAR_wflow.sh
+++ b/ush/generate_FV3SAR_wflow.sh
@@ -591,7 +591,7 @@ GSD suite) to the experiment directory..."
 #
 #-----------------------------------------------------------------------
 #
-elif [ "${USE_CCPP}" = "FALSE" ]; then
+else
 
   cp_vrfy ${TEMPLATE_DIR}/${FV3_NML_FN} $EXPTDIR
   cp_vrfy ${TEMPLATE_DIR}/${FIELD_TABLE_FN} $EXPTDIR
diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh
index eeb7d4d58c..a0883e28aa 100755
--- a/ush/load_modules_run_task.sh
+++ b/ush/load_modules_run_task.sh
@@ -195,6 +195,12 @@ machine=${MACHINE,,}
 modules_dir="$HOMErrfs/modulefiles/$machine"
 modulefile_name="${task_name}"
 
+# Dom says that a correct modules.fv3 file is generated by the NEMSfv3gfs
+# build regardless of whether building with or without CCPP.  Thus, we
+# can have a symlink named "run_fcst" that points to that file regardless
+# of the setting of USE_CCPP.  But this requires that we then test the 
+# non-CCPP-enabled version, which we've never done.  Leave this for ano-
+# ther time...
 if [ "${task_name}" = "run_fcst" ]; then
   if [ "${USE_CCPP}" = "TRUE" ]; then
     modulefile_name=${modulefile_name}_ccpp