Final polishing after rebase.