Fix value-keyword-case end positions and refactor to use fix callback instead of context.fix

Fix value-keyword-case end positions and refactor to use fix callback instead of context.fix #6634