Miscellaneous clean-up

Random stuff not conflicting with the CMake changes.