This is a good idea. Still, it will be great to have in-place one-line TODOs too. Something like:
 //TODO: Figure out if we need this