I'm fine w/ either leaving this w/o the TODO, or fixing the TODO now. What did you decide?