Make scale_for_display less likely to leave confusing gaps (#2589).