Fix all other word lexer matches to ensure not matched partially in variables. Fixes gh-330