Better treatment of stream buckets at end of stream.