Improving option parsing.