More format tweaks.