Maintenance: cleaned out some TODO notes.