Slight improvements to our common CMake file.