Tweak order of tags.

This is not *supposed* to matter for this message type, but some
clients seem to be picky about this one.
Fix parse error.

Missing the linting...