Tweak jsonb.h header once more
Move more support functions in private modules