Fix typing of the JSON stuff here, too
Fix typing of the JSON stuff here, too

TODO: generalize this into a helper subroutine, so we don't have to keep
doing everything twice.

yoe/sreview,yoe/sreview,yoe/sreview,yoe/sreview