I'm a bit torn on this one, since it's not commonly used and requires passing the workflow back to the workflow mixin. I think I'd rather tackle this one in a separate refactor when we move away from mixins.