Consistently use :stream keyword instead of :str