Allow short flags to share the same dash.
Massage previous commit a bit.