Avoid possible flattening in Promise::When#map