Factored isearch-switch into it's own package