Fix up rebase failures.