REVIEW-3765: Spec update for review
Garbage collected a bunch of todos that I'm not going to do anytime soon.
More TODO cleanup