Two miscellaneous improvements for Vim

Given this is just for highlighting, is it actually a problem?