Indexing tweaks for recent changes.