New submission which put long options in alphabetical order, which seems more logical.
This is for reference to the next commitfest.
-- Fabien.