Fix reassociate to use a worklist instead of recursing when new