Get the pseudo ordering by optionnames back.

A proper way to order option items would still be nice but this at least gets it back pre unordered_map looks.