Cleaned up some of our CMake files.