Minor refactoring of our CMake files.