Additional merge cleanup.