tidy up a few INotify bits