Some minor cleaning up of our CMake files [ci skip].