Make the library more library-like.