Some comment as above -- if anybody is using the JSON output, we need to check that they're ok with the contents changing.