Various updates related to Collection sorting.