Better ensureWatcher, removing items from queue