Add static libraries to CMake, minor housekeeping.