Improve unified output (especially to PDF).