Post-rebase clean-up.