Begin refactoring of Jabber message handlers.