Make library synchronous while simplifying it.