Reduce allocations by reusing IndexDefinition in RemoveIndexedData. Tweak test method name. See #2882 Original pull request: #2895