Changes while refactoring to lazy lexing