Refactoring to arrive at one nice EntityIndex interface instead of two awkward ones.