Refactor watch throttling

Should fix issues with missed change events observed on win32