More changes to Composable/Promise/Stream APIs