Move all the new code into LibrarySearcher.