Cleaning up advanced CMake variables