Straightens out some pubsub ugliness.