Refactor [Pull|Feature]VersionFinder types