mojo: Make the warning counter from master also work here.
The code is mostly already here (merged earlier from master) but the
warning incrementer was on the wrong side of the test against progress
measurement so it never incremented.
Everything else seems to already work but I hope to organize it better
later.