First attempt to merge iterator changes back into scandir