Minor pre-merge cleanup.