Started a refactoring for simpler graph indexes.