Fix up some of the TODOs at the top of the paper.