Minor cleaning up of our main and common CMake files [ci skip].