Fix little JSON bugs.

I just ran `make json-check` repeatedly until nothing got reported
anymore.