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.
Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.
This is a subset of !7668 (merged) that's reviewed and ready to merge. The rest will need fixes and take longer.