Further progress with unification of Json/JsonBuffer