More fixes to syntax highlighting.  Patterns finally highlight correctly.