Some simplifications to CMakeLists.txt