Numerous fixes to highlighting.

Addition of proper string highlighting, keyword handling, and generally making
this work.