Adapt for changes in parent branch, and test churn.