Implement -w/--which flag
Refactor main() a little
Overhaul the organization of command line options for better --help
Make usage string more concrete
Drop few TODOs
Add some tests for command line handling code
Fix linter issues
More tests for argument handling