XEP-0198: Apply another minor fix

Apply another small fix, and a cosmetic change.

THIS COMMIT IS MEANT TO BE SQUASHED INTO A PREVIOUS ONE WHEN THE HISTORY
OF THIS FEATURE BRANCH IS REWRITTEN.