Sometimes just splitting stuff into more types that are appropriate to specific portion of pipeline is a win.