Fix recursive assumption gathering algorithm.

With this, the port to the new data format is complete.