More work on index add/del/update.