Fix latest neovim clipboard and surround issues.

See neovim issue #1321.