*Really* fixed recursive enumeration and watching of sub-directories