More "improvements" to syntax coloring.