Yet more changes to match sort function type change.