update watcher after timeout like nsGeolocation expects; excise cruft; update naming