Downgrade some nocommits to TODOs.