Cleaning up mess while trying to build librarian. Added librarian to MSVC build.