Simplifying CMakeLists.txt a bit