Consolidate index updater implementations & handle row level indexes properly