Merge pull request #2632 from alex/quoting

Quote a few things that shellcheck suggests