Use CollectionUtils.sort() in a few places.