Minor improvements to json schema code.