Improved round-trip saving API.