Round-tripping now seems to work correctly.