Fix possible quoting issues found by shellcheck
Clean up purq subcommands