Moving 'extensible-search' wrappers across to extensions.