Clean up after the latest merge.