Adapting bs_tools to new stream module.

OK