Additional CMake fixes/cleanup.