Fix up fs.watch functionality

~~Not ready for commit yet.   Doc improvements to follow in a subsequent commit.~~