Seems like a good idea to me.  Nothing in that handler is really email-specific so would probably be a lot better to rename it and only work at the contact_info level.