Reorder options in alphabetical order

Fix the options order, using the short option as key first (if any) in
all cases for consistency.