Some cosmetic improvements.