simplify Promise.when a bit more, add some more inline docs