Vim C++ syntax highlighting improvements