[countermeasure]

You're welcome! I used to have a pretty lukewarm relationship with TODOs too, but since I settled on this approach things got a lot better. Now I can't imagine using them any other way.