Cosmetic changes.

No real performance change.