Add TODO comments about exceptions that maybe should not be caught so soon.

Though these are mostly in commented-out code.