Fixed a bunch of TODOs for runs w/ point a/b overlap.