Simplify DeleteCells to not require 2 out parameters for the same thing.

One can easily get constructed from the other after returning from the method.

Change-Id: Iafc52efa7714b7cf4d284effda8034cb6f36bf91