Make the library a bit more flexible internally.