A few syntax improvements suggested by shellcheck.net