Clean up CMake files

Supersedes #158
Please restore my nice comment :)