Tweak order of tags (again).

Even though these are not in a <xs:sequence> node, it seems some
clients expect these in the order they are listed in the protocol
docs (even though those same clients send them up to the server in
a completely different order).