These TODOs are handy.
(And I prefer to read code like this that leaves TODOs vs. one giant review that does everything all at once)