Cleanup, plus, this is a candidate, possibly-correct, cycle detection strategy