Round-tripping of both examples work now.