Merge "Fix typo in option parsing."