Update to use MutableVector::sort_by as extra::sort no longer exists