More changes to the parser and scanner.