Remove the unnecessary this.buf in CCITTFaxStream.
Remove some unnecessary local variables.
Merge pull request #4331 from nnethercote/cleanups

Minor clean-ups