Refactor watch in terms of path observer polyfil.