Made 2.8.8 cmake explicit dependency, reindented file, and moved things to where they logically belong (more or less).