This also better matches the package order in downstream, so it makes
it easier to compare upstream and downstream. Also wrap-and-sort.