Improved syntax highlighting matches.