Fix some json deserializer state helpers

Another rip from #260 

This removes the outdated helpers, as functionality was brought up
in several PRs which makes them obsolete.

It also fixes some minor things on the internal datastructure.