Trying another round of XMPP rewiring to see if I can get the tests more protocol-compliant and generally working better.