tightened some dataflow code as part of preparing a talk