Create entities when iterating through the NIF

This seems to have inadvertently fixed bugs 606 and 609 (meaning the problem wasn't what I thought it was), though some verification would be nice before closing the reports.