Finish replacing the old stream macros