Some minor cleaning up of our common CMake file.