Addressed code-review feedback for JSON support.