Improve option parser.