Fixed passing streams as arguments (at least some of the time).