A few more cosmetic improvements.