Rename.
Simplify&correct the scanner peek algorithm.
Typo in comments.