Different fix for 'null' showing up in token classes

Issue #1214
Format match-highlighter to follow conventions