Assorted merge cleanup.