Canonical hash computation fixes.  Not complete yet.
Add node-set TODO comments.