Breaking cyclic dependency in IndexManager wrt AutoIndexers

+ small cleanups