These types of breaks are ultimately unavoidable, but we can avoid making the diffs hard to track down