CMake: Remove unsused variable, and revert a small change.