A few more formatting tweaks.