Use more idiomatic way of sorting associated choices