Promises tweaks

Tweaks to follow up on a2968bf64e13cf15ccd33b8d395947a305fbd461. The second commit is a bit speculative so feel free to not accept it.