Clean up upgrade guards in pt/maybe-unpack-on-delete. Add tests