Minor formatting upgrades.