vim: Bring over some changes from master.