Indeed. As elsewhere I've worked to accommodate the existing oddities of the Iris rules files. But I've nothing against tidying up afterwards. Especially things like the inconsistent names for Unit.