Slight change to #1946: Always sort, because the overhead is minimal.

Thanks, @versh23