Correct comment; should have been part of previous commit.
Perform the pack optimization on branches; it is already done on leaves. Beef up the pack optimization unit test.