Downgrade to TODOs or fix remaining nocommits.