Once upon the time the plan was to have things here sorted by objects the ops work on. So patch is fine (the total order will get any needed cleanup after this commit, not scope of this)