ok, thanks for the heads up.  I just talked to him though and he said that he was intending to take out this TODO because this thing in particular wasn't going to be changed.  I'll keep this in mind while looking at the rest of the PR.