Abolish Hub._waiters, but still needs refactoring [#1310]