More work on data flow steps.