More work on JSON library.