Another round of tweaking labels for nicer sorting.