Make the handling of "Delete" work better.