Arrange JSON instances more like the rest of our code.