iris: cleanups from !7668

This is a subset of !7668 (merged) that's reviewed and ready to merge. The rest will need fixes and take longer.