This makes the rest of the engine a lot simpler.

This patch doesn't fully integrate the new logic but runs it in
parallel with the old one with plenty of checks to see that they are
equivalent.  And it seems that they are.