Minor cleaning up of our main CMake file.