Some other small cosmetic fixes.