Style changes 2.  Plus some fixes to some isSame methods.  We need to deal with null nodes better