Fix a dependency on an as-yet-unmerged change.

Decompose _getIt's retriever construction a bit.
Re-pre-resolve conflicts.