Assorted ujson Cleanups
I think it would be great if we could move the block iteration out of JSON as it has generic functionality that we could use down in C. This isn't it, but a small set of cleanups I noticed while looking at that