Remove search verb test.
Fix a dependency on an as-yet-unmerged change, and decompose _getIt's retriever construction a bit.