Tuned up a JSON interface some more.