Simplifying the CMakeLists.txt files a bit