Resolved circular imports in Iris.