Some minor improvements to some of our CMake files.