Add "TODOs" for refactoring.