Minor cleanup for JsonTokenId, adding comments