Added methods and changed internals for flag watchers.