Simplify the input eof char scan.  Update some comments.