Further work on choice streams.