[PATCH 4/6] Vim: Fix Vint warnings