Remove obscolete nocommit.
Downgrade remaining 'nocommit's to 'TODO'.