Refactor: recognise Filter and Sink both consume data