Cleanup command line args, usage, and versioning. (KK)