[2.2] TODO fixes

This PR resolves all the remaining TODO 2.2 comments.
This TODO and the one above need to be reevaluated instead of pushed back for our future selves to handle.