More tweaks to the timing of indexing.