Refactor out vim-covered