upgraded evil-matchit