Fix typos. Prevent double-dashes from being reduced to single dash.