reordered custom indexing calcs in context of appropriate dependents, prior to p4/p5 generation