Also, remove some redundant error-checking code that never runs
because we're running these scripts with `set -e`.