Improvements in the roundtrip script.