Last couple spots where we mostly just need to swap out type names.
NOTE: CI is expected to fail. I got to a point in my local environment where all flow issues were resolved, but based on earlier fedback in the stack I'm breaking them down so things are easier to review.. even if that means that intermediate steps fail.
[skip-ci]
Depends on D10274