Command-line parsing rework per suggestions.