Simplify Index.addToIndex more.