json generator fixes

JSON being generated at this point appears to have inappropriately
encoded characters in it.