Minor clean up of IRI expansion.