[PATCH 0/6] json helper cleanups