Refactor evil-comment operations