Refactoring progress, lexer tests pass but changes incomplete