More stray TODOs glued up