Minor, mostly cosmetic, changes.