Reorganized ConfigWatcher's signal-listening functionality