Some improvements to syntax highlighting