More watcher input cleanup