More stream interface cleanup