Add TODOs based on @Kyle-B's review.