iris: Misc batch tidying
Some cleanup patches I had while trying to refactor this area of the code.
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.
Some cleanup patches I had while trying to refactor this area of the code.