More jsonifyer cleanup