Make the librarian a bit simpler.