More changes for this parser.