Ah, in that case I would rather not add the comment at all, as a) you've indicated that's already being addressed in Kyle's work and b) it seems odd to introduce a comment on this code when it's not in the scope of the branch.