move TODOs to source files && safer macros