Sortable: Final few changes per review.