Fix the problem with BiP normalization.  Now the remaining problem is with tree normalization itself.