Minor cleanup of ToggleNumbering() and ToggleMenu() mappings.