Start migrating the parser to use tokens