And some neovim patches are merged upstream.