Better topo-discovery

Module is stateful. I touched up consistent updates, which uses it.