Streams Library Cleanup and Fixes

I see the one that handles the # variable, but nothing that imports the variables of the caller. But it seems to work anyway. ¯\_(ツ)_/¯