More cosmetic code changes.