Split finalize_package into separate methods per malleability