Various formatting tweaks.