Better option parsing.