Yet more minor tweaks.