Post-merge cleanup stuff.