diff --git a/archive_build.sh b/archive_build.sh
index 3ce4608335..5b3fb869cc 100755
--- a/archive_build.sh
+++ b/archive_build.sh
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Script must be run outside the chroot
diff --git a/archive_hwqual b/archive_hwqual
index 4129133013..27d1b38046 100755
--- a/archive_hwqual
+++ b/archive_hwqual
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Flags
diff --git a/build_gpt.sh b/build_gpt.sh
index eed4df1df7..d8a1f98cca 100755
--- a/build_gpt.sh
+++ b/build_gpt.sh
@@ -22,7 +22,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Load functions and constants for chromeos-install
diff --git a/build_kernel_image.sh b/build_kernel_image.sh
index 073649540a..c1402242de 100755
--- a/build_kernel_image.sh
+++ b/build_kernel_image.sh
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 get_default_board
diff --git a/check_control_files.sh b/check_control_files.sh
index 1fffcbe8a0..40a46408f0 100755
--- a/check_control_files.sh
+++ b/check_control_files.sh
@@ -27,7 +27,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 AUTOTEST_ROOT=${SRC_ROOT}/third_party/autotest/files
diff --git a/clean_loopback_devices b/clean_loopback_devices
index acfe18919f..088f51d284 100755
--- a/clean_loopback_devices
+++ b/clean_loopback_devices
@@ -26,7 +26,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1;}
 # --- END COMMON.SH BOILERPLATE ---
 
 # Script must be run inside the chroot.
diff --git a/create_esp.sh b/create_esp.sh
index 26f4b2ed91..9d6a677443 100755
--- a/create_esp.sh
+++ b/create_esp.sh
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 get_default_board
diff --git a/create_legacy_bootloader_templates.sh b/create_legacy_bootloader_templates.sh
index 359fb0becc..da2af2b29f 100755
--- a/create_legacy_bootloader_templates.sh
+++ b/create_legacy_bootloader_templates.sh
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 get_default_board
diff --git a/cros_download_latest_image b/cros_download_latest_image
index 1ef56caad2..ccd1b0e29d 100755
--- a/cros_download_latest_image
+++ b/cros_download_latest_image
@@ -25,7 +25,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 get_default_board
diff --git a/cros_generate_breakpad_symbols b/cros_generate_breakpad_symbols
index 0e10cbc6e7..9a2f44006a 100755
--- a/cros_generate_breakpad_symbols
+++ b/cros_generate_breakpad_symbols
@@ -27,7 +27,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Script must be run inside the chroot
diff --git a/cros_show_stacks b/cros_show_stacks
index be2eb25e89..b54a92963d 100755
--- a/cros_show_stacks
+++ b/cros_show_stacks
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 . "${SCRIPT_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh"
diff --git a/emit_gpt_scripts.sh b/emit_gpt_scripts.sh
index f57899ce67..d7590d7cd3 100755
--- a/emit_gpt_scripts.sh
+++ b/emit_gpt_scripts.sh
@@ -23,7 +23,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Need to be inside the chroot to load chromeos-common.sh
diff --git a/enter_chroot.sh b/enter_chroot.sh
index 79e2f49627..832b5e9925 100755
--- a/enter_chroot.sh
+++ b/enter_chroot.sh
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Script must be run outside the chroot and as a regular user.
diff --git a/get_latest_image.sh b/get_latest_image.sh
index 82e7569e4d..6038fc88d5 100755
--- a/get_latest_image.sh
+++ b/get_latest_image.sh
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 get_default_board
diff --git a/get_package_list b/get_package_list
index 82b27d2ede..0408b46588 100755
--- a/get_package_list
+++ b/get_package_list
@@ -25,7 +25,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Script must be run inside the chroot.
diff --git a/image_to_usb.sh b/image_to_usb.sh
index 7a203be6b1..a2fb466221 100755
--- a/image_to_usb.sh
+++ b/image_to_usb.sh
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Load functions and constants for chromeos-install
diff --git a/image_to_vm.sh b/image_to_vm.sh
index d4ee0a2434..89af92f6f1 100755
--- a/image_to_vm.sh
+++ b/image_to_vm.sh
@@ -25,7 +25,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Need to be inside the chroot to load chromeos-common.sh
diff --git a/make_developer_script_runner.sh b/make_developer_script_runner.sh
index 134bf080e4..c6d5bf1735 100755
--- a/make_developer_script_runner.sh
+++ b/make_developer_script_runner.sh
@@ -27,7 +27,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Need to be inside the chroot to load chromeos-common.sh
diff --git a/make_factory_package.sh b/make_factory_package.sh
index 3e6db0ed40..0ddbaeb02d 100755
--- a/make_factory_package.sh
+++ b/make_factory_package.sh
@@ -29,7 +29,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Load functions and constants for chromeos-install
diff --git a/make_netboot.sh b/make_netboot.sh
index b51d761e71..b512d73185 100755
--- a/make_netboot.sh
+++ b/make_netboot.sh
@@ -33,7 +33,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 # Script must be run inside the chroot.
 restart_in_chroot_if_needed "$@"
diff --git a/mk_memento_images.sh b/mk_memento_images.sh
index 9e8b609e0a..f7774a0eb1 100755
--- a/mk_memento_images.sh
+++ b/mk_memento_images.sh
@@ -28,11 +28,9 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
-
 # Load functions designed for image processing
 if ! . "${SCRIPT_ROOT}/lib/cros_image_common.sh"; then
   echo "ERROR: Cannot load required library: lib/cros_image_common.sh; Abort."
diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh
index e223719658..281f0894d4 100755
--- a/mod_image_for_recovery.sh
+++ b/mod_image_for_recovery.sh
@@ -27,7 +27,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Need to be inside the chroot to load chromeos-common.sh
diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh
index cfc8cf0e5b..8ba2e3f1ee 100755
--- a/mod_image_for_test.sh
+++ b/mod_image_for_test.sh
@@ -37,7 +37,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Need to be inside the chroot to load chromeos-common.sh
diff --git a/mount_gpt_image.sh b/mount_gpt_image.sh
index dc0491a5d1..fd9eda7a88 100755
--- a/mount_gpt_image.sh
+++ b/mount_gpt_image.sh
@@ -25,7 +25,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 if [ $INSIDE_CHROOT -ne 1 ]; then
diff --git a/resize_stateful_partition.sh b/resize_stateful_partition.sh
index 00392592d3..02dd1ad055 100755
--- a/resize_stateful_partition.sh
+++ b/resize_stateful_partition.sh
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Need to be inside the chroot to load chromeos-common.sh
diff --git a/run_chroot_version_hooks b/run_chroot_version_hooks
index becd7fe036..aaffcb40ce 100755
--- a/run_chroot_version_hooks
+++ b/run_chroot_version_hooks
@@ -7,7 +7,7 @@
 # Load common CrOS utilities.  Inside the chroot this file is installed in
 # /usr/lib/crosutils.  Outside the chroot we find it relative to the script's
 # location.
-. "$(dirname "$0")/common.sh" || ! echo "Unable to load common.sh" || exit 1
+. "$(dirname "$0")/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 
 # Script must run inside the chroot.
 assert_inside_chroot
diff --git a/ssh_test.sh b/ssh_test.sh
index ef5eb57491..e23254a50d 100755
--- a/ssh_test.sh
+++ b/ssh_test.sh
@@ -26,7 +26,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 . "${SCRIPT_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh"
diff --git a/start_devserver b/start_devserver
index 24f2a8739a..1bbbe88be1 100755
--- a/start_devserver
+++ b/start_devserver
@@ -23,7 +23,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Script must be run inside the chroot if not in 'always serve' mode.
diff --git a/test_build_root b/test_build_root
index 2965b4cba7..17d1549f5a 100755
--- a/test_build_root
+++ b/test_build_root
@@ -22,7 +22,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Flags
diff --git a/test_image b/test_image
index f4b079a9d4..3adc675628 100755
--- a/test_image
+++ b/test_image
@@ -22,7 +22,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Flags
diff --git a/update_bootloaders.sh b/update_bootloaders.sh
index 12b67906cb..298085041e 100755
--- a/update_bootloaders.sh
+++ b/update_bootloaders.sh
@@ -25,7 +25,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Need to be inside the chroot to load chromeos-common.sh
diff --git a/update_chroot b/update_chroot
index 0c80defb2c..23d6b536b3 100755
--- a/update_chroot
+++ b/update_chroot
@@ -9,7 +9,7 @@
 # Load common CrOS utilities.  Inside the chroot this file is installed in
 # /usr/lib/crosutils.  Outside the chroot we find it relative to the script's
 # location.
-. "$(dirname $0)/common.sh" || ! echo "Unable to load common.sh" || exit 1
+. "$(dirname $0)/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 
 # Script must run inside the chroot
 assert_inside_chroot "$@"
diff --git a/update_kernel.sh b/update_kernel.sh
index d6d5c8471d..ca3561354b 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 . "${SCRIPT_ROOT}/remote_access.sh"
diff --git a/upload_symbols b/upload_symbols
index d6f6c2561f..de9244eb2c 100755
--- a/upload_symbols
+++ b/upload_symbols
@@ -26,7 +26,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Script must be run inside the chroot
diff --git a/verify_rootfs_chksum.sh b/verify_rootfs_chksum.sh
index 4963b47e7d..df20a2623c 100755
--- a/verify_rootfs_chksum.sh
+++ b/verify_rootfs_chksum.sh
@@ -24,7 +24,7 @@ find_common_sh() {
 }
 
 find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
 # --- END COMMON.SH BOILERPLATE ---
 
 # Load functions and constants for chromeos-install