Make deletion much more flexible.