improve evil-matchit