Switch to tpope/vim-endwise