Precursor to refactor of SimplePubSub, should have been done a while ago.