[Dist] Make padding more canonical