Committing changes to option parsing.