Format tweaks in core.