This also fixes a bug related to self-destructing references (introduced during the cell handling improvements)