Restructured TODOs.