Update another chunk of stuff to use JID objects