Yes, I agree with this now after reviewing the code.  The `unify_body` branch also looks like a good thing to promote, since we'll always share strings and empty values across all backends.  I've adapted your patch to also use Body for the client code (partially) in 5941b2141909c3ca701f862d77718b0b5a57489d