Post-merge clean-up.  Untested.