Better way to determing child leafiness fixes the removal problem.  Next up
is multiple changes in one writeback scenario