Not needed is a bold statement :) We just need to replace *all* the calls to `concreteIndex(index)` with `concreteIndices(IndicesOptions.strictSingleIndexNoExpand(), index)`, but that was the whole point of this refactoring. Or do we want to leave a shortcut that doesn't require the indices options in this single index case? I tend not to like shortcuts....