Reconciled the pickle and boot-pickle formats.