siffiejoe Better handle to-be-closed values