Cosmetic code fixes.