PR-555: drop keyword tokenizer to simplify semantics, add in tests for reset