Use a safer histogram rebuild algorithm.

Our old algorithm could, on some inputs, exhaust RAM. That's not great, since we try to be robust againt corruption to the state file.

This resolves an XXXX.