Switch to use vim-commentary