Improve command line option handling.