More JSONCodec clean up