Simplify PromiseMonitor internals a bit