More changes to the scanner.