cleanup of index references; esp in __setitem__.