Tweak JSON output to be more flexible.