Being a bit more defensive about `--go` and `--decrypt` flags

plus removing a bogus `shift`.