CMakeLists.txt: Remove duplicate expat build..

And a few other changes