improved cluster replacement: make sure we do the right thing when we replace with clusters already in assigned to the row