imap: Small tidy up of function arguments