Modernize command-line handling.