* Gratuitous style cleanup of some of the imap code