Small cleanup in the stream feeding