Yet more spacing tweaks for #81