CMS-4394 Simplify our Json usage in Core.