Fix CMake CXX_STANDARD handling, part 2