Removing the weight field from branch nodes.

We can derive this information instead.
Minor tweaks.
Minor tweak.