This is the other main bit changed by this patch, and the actual focus of the ticket. Using $tracklist_changes, as I do here, means that the numbers of the recordings are kept in sync with the tracklist changes shown above, which means that the matchings between the old and new tracklists will be consistent (and in the example case, also substantially more correct).