WIP: improve digest/watcher tracking

So that it does not crash WTF in some corner cases.