Improving command-line handling.