Slightly improved Promises.js and Streams.js