Cleaning up how streams are accessed in decorators