Improved C++ syntax highlighting