More closure ref-loop untangling