Some minor work on our common.cmake file.