Fix a pair of issues that caused an infinite loop in reassociate.