Finish up outstanding issues for JSON. [Fixes #70287828].
Fix breaking tests.