Continue converting swift binary to use the new library