Small change to syntax highlighting.
Small fixes and simplifications.