Merge in additions to the scanner.