sorry, should have checked for the existing TODO. that's totally fine then, i say leave it as is and do it after this PR. (as opposed to the other TODOs, which i'm happy to punt much longer.)

and seriously! other code review tools definitely don't seem as hard to navigate. i must be using this wrong.