Use updated 'evil-surround' package