Further work on optimizing :delete in sink context