Various Grammar changes to fix inconsistent highlighting

* Prior to cf9a9e7, JSON/object literal keys only highlighted if they were function references
* Prior to 58d6bf3, variables associated with functions highlighted differently than other variables