Hopefully clearer help for --skip-current
Hopefully clearer help for --configuration
Clean up code branch for --no-key vs. --key