Better IRI shortform handling