Apply vgetorpeek-disect (PR neovim#6370) as one commit

Easier to work on top of, and if that's not taken on board then the
likelyhood of this being taken on board is pretty low.

Author: hardenedapple