* Fixed identifier and keyword overlap via word boundaries.
* Added semicolon to ensure keyword boundary works correctly.