Further cosmetic fixes.