vim: Cleanup word matching code

**Don't merge it yet!** It requires review from people that actually know the Vim syntax :)
I see.
I would prefer to skip the initial word in the caller side, like you suggested.