Split logging between WhitelistWatcher and its subscriber.
Use generalised WhitelistWatcher instead of the master-only one.