Post-merge tidy-up.