Forward port JSON list changes.
Clean JSON output.