Bring the promise stuff in line with the promises spec.