Make exported XML closer to the State Decoded format

Per #477.