Finishing the index rework.