Code review: 164710043:  Small changes to source scanner.