Trim down the SecondaryWatcher's universe