Fix remaining issue with autoassigned Block and Item IDs overlapping.