Chris, I agree, this is a better choice.
I'd stick with what we have in this PR.
Piotr, please make changes to use the smart pointers in the 71X PR with new DT features.