Fix processing of watchers for renamed directories