CMake cleanups, baby steps