Cleaned up TiffReader logic.