Update of entry fails to cleanup when previous entry is using a different index

Different value types could be put in the slot/key being used by a different indexed type which is configured to use a different index. In such a case the put operation correctly updates the new index but fails to remove eventual entries stored in the index used by the previous stored type.