Small, incomplete refactoring for plugin search