Fix commented "wait for this code to be merged"

We have a few TODO or comments which show some code we wrote in a way we don't love because of some downstream dependency limitations. We should go through and check on those things to see if they're still accurate.