Refactor watched dir tracking

Eliminating a lot of `indexOf` and array `splice` operations