Fix case where parser would think -- at end but in quotes is intended for it (as a option marker)
Fix corner case of empty quoted string