=str #16028 Cleaned up ducplicate implementations of FlowOps

Fixes #16028