vim: syntax improvements