Comment 11 for bug 1703411

I've got a typo there... Force-pushed a branch fixing that, but I'm going to push an update that attempts to shift completely to a subelement rather than duplicating attributes for backward compatibility with older clients. That will cause a complete break in compatibility with older clients, but may well be necessary.

Please feel free to test with and without the very top commit!