Iris refactoring seems to be done.