Update to support forcing JSON, other tweaks.