More tweaks to syntax highlighting