Style tweaks & fixes.