More cleanup of CMakeLists.txt from Pali's comments