Fix command line option parsing.

This was broken by 4fddba945aff70b5ba79d1c8fb64753a81e6e9b3.