Fix up options parsing for all cases.