#87 Tidy up FileIterator constructor.