Reverts debugging code, simplifies primitive type JSON representation