Quoting: Changes suggested by shellcheck