Further work on JSON serialization.

[#53261073]