More work on bstream shutdown

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>