#self-surgery clear

Half-migration bug: watcher updated for multi-dir scan, but downstream lookup function missed