Cleanup and adjustments to syntax highlighting.