Added stateful check on more places for typed json.