Tweak classification so it does not classify things as keywords that cou...

...ld not actually be keywords according to the grammar.