Minor: Tweaks to menu sorting.