JSON parse improvements.