Ongoing refactoring of the scored tree system.

All code compiles, one unit test fails.
Fix combo tree hashing function