A couple more format tweaks.