Make encode_sort_controls() more idiomatic...
#327
Merged
encode_sort_controls() more idiomatic...
#327